diff --git a/ci/pinned.json b/ci/pinned.json index d161a3d78e1c..0e8f2b8ff61c 100644 --- a/ci/pinned.json +++ b/ci/pinned.json @@ -9,9 +9,9 @@ }, "branch": "nixpkgs-unstable", "submodules": false, - "revision": "cbb5cf358f50aa6acc9efd6113b7bcfbc352cd73", - "url": "https://github.com/NixOS/nixpkgs/archive/cbb5cf358f50aa6acc9efd6113b7bcfbc352cd73.tar.gz", - "hash": "sha256-IX7G1dlKrOqPOImfbo7ADDfV5yU1+j+MRChI3TL4tAA=" + "revision": "8c91a71d13451abc40eb9dae8910f972f979852f", + "url": "https://github.com/NixOS/nixpkgs/archive/8c91a71d13451abc40eb9dae8910f972f979852f.tar.gz", + "hash": "sha256-fnzKKPvS+oieI/pTzotA5tkoM47EB1NpaBcgk4R97hE=" }, "treefmt-nix": { "type": "Git", diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index 64e2c427da94..939b86f7d236 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -24,6 +24,8 @@ - Support for the legacy U‐Boot image format has been removed from the initrd generators, as it is deprecated upstream and no longer used by any platform in Nixpkgs. +- Rustical migrates from `settings.http.host` and `settings.http.port` to `settings.http.bind` to support UNIX domain sockets as well as TCP sockets in one setting. + - `services.llama-cpp` is now configured using structured `services.llama-cpp.settings` attribute. - Python 2 has been removed from the top-level package set, as it is long past end-of-life. The `python2`, `python27`, `python2Full`, `python27Full`, `python2Packages`, and `python27Packages` attributes, along with the legacy `python`, `pythonFull`, and `pythonPackages` aliases, now throw an error directing you to `python3`. The `isPy2` and `isPy27` package flags have been removed accordingly. The only remaining Python 2 interpreter is vendored inside the `resholve` package for its `oil` dependency and is not exposed for general use. diff --git a/nixos/modules/services/web-apps/rustical.nix b/nixos/modules/services/web-apps/rustical.nix index 0764f384ab0d..a92daf8c07b4 100644 --- a/nixos/modules/services/web-apps/rustical.nix +++ b/nixos/modules/services/web-apps/rustical.nix @@ -55,12 +55,12 @@ in }; http = { - host = mkOption { + bind = mkOption { type = types.str; - default = "[::1]"; - example = "[::]"; + default = "unix:/run/rustical/sock"; + example = "[::]:4000"; description = '' - Host address to bind the HTTP service to. + Address and port or UNIX socket path to bind the HTTP service to. :::{.note} Rustical expects to be hosted behind a reverse proxy that @@ -69,14 +69,6 @@ in ::: ''; }; - - port = mkOption { - type = types.port; - default = 4000; - description = '' - Port to bind the HTTP service to. - ''; - }; }; dav_push.enabled = mkOption { @@ -126,6 +118,19 @@ in }; config = mkIf cfg.enable { + warnings = lib.optionals (cfg.settings.http ? host || cfg.settings.http ? port) [ + '' + Rustical 0.13 deprecations + + The following options are now deprecated and will be removed in a + future release: + - `services.rustical.settings.http.host` + - `services.rustical.settings.http.port` + + Migrate to `services.rustical.settings.http.bind` instead. + '' + ]; + # install the config at a path where the cli will find it environment.etc."rustical/config.toml".source = configFile; diff --git a/nixos/tests/web-apps/rustical.nix b/nixos/tests/web-apps/rustical.nix index 86b0e95afa20..15a718e87702 100644 --- a/nixos/tests/web-apps/rustical.nix +++ b/nixos/tests/web-apps/rustical.nix @@ -3,28 +3,35 @@ lib, ... }: + +let + port = "4000"; +in + { name = "rustical"; meta.maintainers = pkgs.rustical.meta.maintainers; - nodes.machine = + containers.machine = { pkgs, ... }: { - services.rustical.enable = true; + services.rustical = { + enable = true; + settings.http.bind = "[::]:${port}"; + }; environment.systemPackages = with pkgs; [ calendar-cli ]; }; testScript = { - nodes, + containers, ... }: let - port = toString nodes.machine.services.rustical.settings.http.port; url = "http://localhost:${toString port}"; createPrincipalScript = pkgs.writeScript "rustical-create-principal" '' diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 8391b4428825..f3cecb980d19 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -26,9 +26,9 @@ let url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.7/android-studio-quail1-rc2-linux.tar.gz"; }; latestVersion = { - version = "2026.1.2.4"; # "Android Studio Quail 2 | 2026.1.2 Canary 4" - sha256Hash = "sha256-fnJYHZPy9bOZJ2leG2+Mr5JGH5HMc2HeMeYGHBUxJXo="; - url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.4/android-studio-quail2-canary4-linux.tar.gz"; + version = "2026.1.2.7"; # "Android Studio Quail 2 | 2026.1.2 Canary 7" + sha256Hash = "sha256-LHszfAtM5ZLNbTZG0isb+aUW3uwp+zav/igHT4HDeEM="; + url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.7/android-studio-quail2-canary7-linux.tar.gz"; }; in { diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index d5e75c2183e3..3acd29d4b269 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-R3ab2IeY9QnDhZFk52/05pIv4A+sZU3kJ9Jn5uLRa4Y="; + hash = "sha256-XA4xSd/sg9vhOGqcCNliHzloBxPZsgXW/dSkKp/RzM0="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-AE6zS8bJ4vec+P36NkxWYQ1tmcJG2WsFkv75+gRlrxA="; + hash = "sha256-l2NjDHBOMBzJT9Pis7sqSuFuG07eZPALximND+hVqDU="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-n1qV1Lrl65HSDthMc5/7hLppeNBO6067Z+Rf5+kxfnA="; + hash = "sha256-hE/1N28f9uAzg2fG3Hrc4z1kW21rdhtCRmF9SphqiFc="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-g+lkUYym43o8cEFseWCrcSUUTx296u8DS9JvnU1dBLU="; + hash = "sha256-68CmDax385o0juoQWNX/NLx+tjIt9YytTHjRZkqAR98="; }; }; in { name = "claude-code"; publisher = "anthropic"; - version = "2.1.172"; + version = "2.1.175"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2a0c79a11eb0..c7a78d5e9ffb 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3587,8 +3587,8 @@ let mktplcRef = { name = "vscode-just-syntax"; publisher = "nefrob"; - version = "0.10.1"; - hash = "sha256-s/JxIALrYb/dew1CdvvM1UmnewyRcJPB/ETJ/Ai2QJA="; + version = "0.10.2"; + hash = "sha256-F7H9f24TjB3JtWLVICYwRTjxa+GTOpYN7IzSlU1audo="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/nefrob.vscode-just-syntax/changelog"; @@ -4222,8 +4222,8 @@ let mktplcRef = { publisher = "shd101wyy"; name = "markdown-preview-enhanced"; - version = "0.8.27"; - hash = "sha256-v4CZul1uuNlMrIgfml9EjUy0I626GkBArNH7F+5Z/dA="; + version = "0.8.30"; + hash = "sha256-wtI+W+ZNxXv8WonGDmSt1NxeF8WN8fqPCuMougERxDE="; }; meta = { description = "Provides a live preview of markdown using either markdown-it or pandoc"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix index aec06a3bb8e2..36392353acac 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix @@ -84,8 +84,8 @@ buildVscodeMarketplaceExtension { mktplcRef = { name = "remote-ssh"; publisher = "ms-vscode-remote"; - version = "0.123.0"; - hash = "sha256-/9NyRSNUCx65FOA6w86e2DvrynAHRleIULzDpneV25E="; + version = "0.124.0"; + hash = "sha256-GokSJOEpHomkBbkPUBhVXWZCrGbi5oZTlw5PFV12ZBY="; }; postPatch = '' diff --git a/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix b/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix index ab922608e4bc..4e311914bc7a 100644 --- a/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix +++ b/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix @@ -11,22 +11,22 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-vm12qVJ6+KbyHdzB/Q4SrEZDUKVsKJufjbVn9OBGbns="; + hash = "sha256-cP/oFn19CZ/G3kjdHNZGqXvoDE1qUtg6xrg/2MO14Lo="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-1dunJX+7oL2RqsK2pCScKAe/O0b3ypfgsuHXoDvvChM="; + hash = "sha256-wtk8SasxXEQ3pCJpVTWR8wcY/bNaIZmImbAtrFWYWOo="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-5IG0H3QIY6ll77aZ6/8uFeIpgjupjBx0GfFJaX7Wep4="; + hash = "sha256-XYdwVoDqK+88ZYUm6APyamFNx6XlYjy0R4CIhSMuRmU="; }; }; in { publisher = "redhat"; name = "vscode-xml"; - version = "0.29.2"; + version = "0.29.3"; } // sources.${stdenvNoCC.hostPlatform.system} or { }; diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index c99945c49b50..c4b9eee45455 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.86.2"; - hash = "sha256-Peoja4AQUPlwAKeJMOziGjd/WU4wz5B8cplCTh20yTA="; + version = "3.89.2"; + hash = "sha256-lDt/xn1PFs0UDg0rOOun8Bl/FTXSjvQ//ETkoHFypAM="; }; meta = { diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 686a3f7aa05e..3b348ec2911a 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,10 +1,10 @@ { "chromium": { - "version": "149.0.7827.102", + "version": "149.0.7827.114", "chromedriver": { - "version": "149.0.7827.103", - "hash_darwin": "sha256-3ws6RyF5SwjRcdo4IY+MzqcaZ6214dCVV3YB4YL+h6k=", - "hash_darwin_aarch64": "sha256-S8/dGAlipcYXzZIEJEGAnvsu3ilqjnBb8IdXUxGrp2o=" + "version": "149.0.7827.115", + "hash_darwin": "sha256-DOhM1knKphvLNyrkf0uvb9NZ3kBwSuVN5hkQLqAZR1Y=", + "hash_darwin_aarch64": "sha256-HXWvAjMdMMbeF8DsgFKNM+S0ZEYr2M8Wj0uUZC7tmxY=" }, "deps": { "depot_tools": { @@ -21,8 +21,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "112f665d98a2fe84b156c74fbea2aed742f16c15", - "hash": "sha256-75PYsss5Qob493WCc28XHncjFIlvUr2HQx79w5UmK/k=", + "rev": "5be7af702aa73ed64f47858cecc86290e42f2a20", + "hash": "sha256-R2vnW3Wa+REar23OhyFWzOo44F8NN9IqH7GjWJ1g1lo=", "recompress": true }, "src/third_party/clang-format/script": { @@ -823,7 +823,7 @@ } }, "ungoogled-chromium": { - "version": "149.0.7827.102", + "version": "149.0.7827.114", "deps": { "depot_tools": { "rev": "45dedc4c3b87c982fd846b3dc599b233ed3aff90", @@ -835,16 +835,16 @@ "hash": "sha256-oFs7fZAZEs/gQ7X1A4uigo9+Y+iEN9sMMQYwAjEuD04=" }, "ungoogled-patches": { - "rev": "149.0.7827.102-1", - "hash": "sha256-I2yrFav9r+vfkKfCpa71F8amzApGViVT8Enlmukwe7s=" + "rev": "149.0.7827.114-1", + "hash": "sha256-F0pIlZM/EBPLIZxD8jyLX7HWe0vFn2HXs2vkM5+Xplg=" }, "npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "112f665d98a2fe84b156c74fbea2aed742f16c15", - "hash": "sha256-75PYsss5Qob493WCc28XHncjFIlvUr2HQx79w5UmK/k=", + "rev": "5be7af702aa73ed64f47858cecc86290e42f2a20", + "hash": "sha256-R2vnW3Wa+REar23OhyFWzOo44F8NN9IqH7GjWJ1g1lo=", "recompress": true }, "src/third_party/clang-format/script": { diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 75880b33f528..183c2c52ef41 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -111,6 +111,7 @@ gpgmepp, libwebp, abseil-cpp, + libfreehand, libepubgen, libetonyek, libpng, @@ -518,6 +519,7 @@ stdenv.mkDerivation (finalAttrs: { libatomic_ops libcdr libcmis + libfreehand libe-book libepoxy libepubgen @@ -662,6 +664,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-system-headers" "--with-system-libabw" "--with-system-libcmis" + "--with-system-libfreehand" "--with-system-libepubgen" "--with-system-libetonyek" "--with-system-liblangtag" @@ -679,7 +682,6 @@ stdenv.mkDerivation (finalAttrs: { # TODO: package these as system libraries "--without-system-altlinuxhyph" "--without-system-libeot" - "--without-system-libfreehand" "--without-system-libmspub" "--without-system-libnumbertext" "--without-system-libpagemaker" diff --git a/pkgs/by-name/at/attyx/package.nix b/pkgs/by-name/at/attyx/package.nix index db515a54731e..81fe0f14851d 100644 --- a/pkgs/by-name/at/attyx/package.nix +++ b/pkgs/by-name/at/attyx/package.nix @@ -18,13 +18,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "attyx"; - version = "0.4.3"; + version = "0.4.5"; src = fetchFromGitHub { owner = "semos-labs"; repo = "attyx"; tag = "v${finalAttrs.version}"; - hash = "sha256-DJe1HreijOwFaqDY+Ai1utiK4u66pUbBkEY6TOat27A="; + hash = "sha256-9/Zl6IrgrT8vHYllCKb977Ar5QRYQiXDmK/g+4YWcqM="; }; deps = callPackage ./build.zig.zon.nix { }; diff --git a/pkgs/by-name/au/autoprefixer/package.nix b/pkgs/by-name/au/autoprefixer/package.nix index 25ea91c261c6..35ea1a5adc2c 100644 --- a/pkgs/by-name/au/autoprefixer/package.nix +++ b/pkgs/by-name/au/autoprefixer/package.nix @@ -2,7 +2,7 @@ lib, stdenv, nodejs, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, fetchFromGitHub, @@ -11,26 +11,26 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "autoprefixer"; - version = "10.4.24"; + version = "10.5.0"; src = fetchFromGitHub { owner = "postcss"; repo = "autoprefixer"; - rev = finalAttrs.version; - hash = "sha256-9XZWkBDqkaBbIHq3wIbo4neToPM+NCxi9c1AyVqmnvc="; + tag = finalAttrs.version; + hash = "sha256-s152v9sIuQLvhfPsZvQa+O9UhoASgm/e8dnz0t4pP3A="; }; nativeBuildInputs = [ nodejs pnpmConfigHook - pnpm_9 + pnpm_10 ]; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_9; - fetcherVersion = 3; - hash = "sha256-PPYyEsc0o5ufBexUdiX9EJLEsQZ0wX7saBzxJGsnseU="; + pnpm = pnpm_10; + fetcherVersion = 4; + hash = "sha256-Sxt4vtdlMdXxXqt22hfZJskj8mkB5t85IZ5BsbCoDF4="; }; installPhase = '' @@ -60,9 +60,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Parse CSS and add vendor prefixes to CSS rules using values from the Can I Use website"; homepage = "https://github.com/postcss/autoprefixer"; - changelog = "https://github.com/postcss/autoprefixer/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/postcss/autoprefixer/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; mainProgram = "autoprefixer"; - maintainers = [ ]; + maintainers = [ lib.maintainers.skohtv ]; }; }) diff --git a/pkgs/by-name/bu/buildbox/package.nix b/pkgs/by-name/bu/buildbox/package.nix index 0a319fca91e7..2a45605a0fcf 100644 --- a/pkgs/by-name/bu/buildbox/package.nix +++ b/pkgs/by-name/bu/buildbox/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "buildbox"; - version = "1.4.7"; + version = "1.4.8"; src = fetchFromGitLab { owner = "BuildGrid"; repo = "buildbox/buildbox"; tag = finalAttrs.version; - hash = "sha256-+OK9rmAGGLq/rJIHs++dbdyvh6WFu+Xhcp48TpnYV0w="; + hash = "sha256-P7CFgK5CkHAf5gddmm0SBGIkC/AAdCO5pkya/XNuby0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json index 5521b16d66fc..5f2e80c7f9ce 100644 --- a/pkgs/by-name/cl/claude-code/manifest.json +++ b/pkgs/by-name/cl/claude-code/manifest.json @@ -1,47 +1,47 @@ { - "version": "2.1.172", - "commit": "1b719ca2781a2dccc4a769b66bc35b4a60509ad7", - "buildDate": "2026-06-10T16:38:17Z", + "version": "2.1.175", + "commit": "0b9163019454512fd2b2ed8e6bef5470f9259f35", + "buildDate": "2026-06-12T01:33:39Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "3c31f345575bf6f261c7e19981f6491bb93eeb0ffb499e95033610a7184831ce", - "size": 223390752 + "checksum": "6b75bf132c866ed409bf913c318ca32011e73ffb12d3cd67ecc37bc4ee9ec65d", + "size": 224216352 }, "darwin-x64": { "binary": "claude", - "checksum": "c507f98750c5230e4247f7eadff38e4db04c006904f85379e31c5d5e82e1c384", - "size": 225892528 + "checksum": "3770f2cb42d3f776e62a59aa16230843dc7b8422b36be9b1532e02a6e92e7fa8", + "size": 226734640 }, "linux-arm64": { "binary": "claude", - "checksum": "4ef0d735bd4180c3bffc381f6dc38df979229a8637d294be751c6043d93d12e1", - "size": 248624776 + "checksum": "360f1f6f43ec26d9bb6e20e487bf44b753d9b8407e89e74bfeeb79707399f435", + "size": 249476744 }, "linux-x64": { "binary": "claude", - "checksum": "c0915dd1691d569aeebc7978b12e029718323685ec0dd4b5c6a453108d6be1f7", - "size": 248743632 + "checksum": "4fc72fa6090c9a03f1850e1b1ccb3d6806bf802b67e3cb9dc5f2ced4b7ed5ca1", + "size": 249566928 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "6b10aad4270348175206bd2475f82ef3c56007dfb55d7b90f1950dfa8fb9eb40", - "size": 241479512 + "checksum": "27234d99851b2e343184466924d8f5c9318d1cfc4156fc4198c99e26c8a8ab86", + "size": 242331480 }, "linux-x64-musl": { "binary": "claude", - "checksum": "58f2c60711f95e51d86d1af5b915cbdd0458710f1830b7c26d59b78f1ad1f861", - "size": 243153968 + "checksum": "f40f977d2555f349e4d94f6efdc7deece3596c2cffa9d1a6a66b14ee30cfca54", + "size": 243977264 }, "win32-x64": { "binary": "claude.exe", - "checksum": "07132ca4bbef551c92c1ae6ca0220a5e523092c9fa9cf402f65f428450687455", - "size": 244181152 + "checksum": "c1b5b0ae1b607c1f8623d222c9eb6005a35dd6873aa834910a6fb3e00450e096", + "size": 244979872 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "1e3e165c03de2af83c1e3516b73890b56e9785a2382338adcc28f41918bf4d2f", - "size": 240146080 + "checksum": "f01eea49c920e990a7c3d2c1071abbc7e79ab54a099380982c11a6f462ca7c4a", + "size": 240943776 } } } diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 1fded730bd27..5887d13fb28a 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Agentic coding tool that lives in your terminal, understands your codebase, and helps you code faster"; homepage = "https://github.com/anthropics/claude-code"; downloadPage = "https://claude.com/product/claude-code"; - changelog = "https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md"; + changelog = "https://github.com/anthropics/claude-code/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ diff --git a/pkgs/by-name/fi/filius/package.nix b/pkgs/by-name/fi/filius/package.nix index 63f8ce377928..3bf63e93e17c 100644 --- a/pkgs/by-name/fi/filius/package.nix +++ b/pkgs/by-name/fi/filius/package.nix @@ -10,16 +10,16 @@ maven.buildMavenPackage rec { pname = "filius"; - version = "2.11.0"; + version = "2.12.1"; src = fetchFromGitLab { owner = "filius1"; repo = "filius"; tag = "v${version}"; - hash = "sha256-l90KnHfndGsEzgJpTNabW0ADJhTYr7z3243TZUJbxNw="; + hash = "sha256-sIcYjbWONg8Cq+dHpoBYj07cyHV7oX06Xh1zK0CHn64="; }; - mvnHash = "sha256-R14EtImJJEC/DhKm7MKWzq9XEOqDGNPtLIaK3OKbyiQ="; + mvnHash = "sha256-/gA49V1Kjh4zJTzDCzFNwZF30ERwPk2lG6lw/jxM2Qo="; mvnParameters = "-Plinux"; # tests want to create an X11 window which isn't often feasible diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix index b4a416120895..fee8f4adcadf 100644 --- a/pkgs/by-name/fl/flare-signal/package.nix +++ b/pkgs/by-name/fl/flare-signal/package.nix @@ -24,18 +24,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "flare"; - version = "0.20.5"; + version = "0.20.6"; src = fetchFromGitLab { owner = "schmiddi-on-mobile"; repo = "flare"; tag = finalAttrs.version; - hash = "sha256-ZxUIqfEQe7tv6HBwOMLKruYDNJLlRie3nztwVER6sAE="; + hash = "sha256-X+3fwIDqRC9S0SYkN3knjQ5wFSptxuM0iggu4pgZ89Q="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-dNcHPLoKbHFj73Xtb4Ud42xKmmLy9eADUnsqPj9+l8Y="; + hash = "sha256-EEIZjK8bVPg1AFkmOvckkVMCRHXLoiBz5CITwpolJ4k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix index 2aae752c96e6..d74d1e036524 100644 --- a/pkgs/by-name/fr/fractal/package.nix +++ b/pkgs/by-name/fr/fractal/package.nix @@ -26,26 +26,26 @@ sqlite, xdg-desktop-portal, libseccomp, - libglycin, + libglycin-gtk4, glycin-loaders, libwebp, }: stdenv.mkDerivation (finalAttrs: { pname = "fractal"; - version = "13"; + version = "14"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "fractal"; tag = finalAttrs.version; - hash = "sha256-zIB04OIhMSm6OWHalnLO9Ng87dsvsmYurrro3hKwoYU="; + hash = "sha256-pgu+O9fRyZiRYkxRTlPgnd5jaGPL1nN0agMR+x6+oGg="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-5wI74sKytewbRs0T/IQZFEaRTgJcF6HyDEK0mpjy0LU="; + hash = "sha256-Fsw0hIAYiF+31PNuC5a9SatRatY7A8OwABhlyHIl1Lc="; }; patches = [ @@ -58,13 +58,14 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/meson.build --replace-fail \ "target_dir / rust_target / meson.project_name()" \ "target_dir / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()" + + patchShebangs ./build-aux/compile-blueprints.sh ''; nativeBuildInputs = [ glib grass-sass gtk4 - libglycin.patchVendorHook meson ninja pkg-config @@ -80,12 +81,12 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glib - libglycin.setupHook glycin-loaders gtk4 gtksourceview5 lcms2 libadwaita + libglycin-gtk4 openssl pipewire libshumate diff --git a/pkgs/by-name/op/opentrack/package.nix b/pkgs/by-name/op/opentrack/package.nix index d3198e72627e..806e08afb4d3 100644 --- a/pkgs/by-name/op/opentrack/package.nix +++ b/pkgs/by-name/op/opentrack/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "opentrack"; - version = "2026.1.0-unstable-2026-05-23"; + version = "2026.1.0-unstable-2026-06-08"; src = fetchFromGitHub { owner = "opentrack"; repo = "opentrack"; - rev = "5c4b8f13617b69e4c315a86c0adafdccc01223cd"; - hash = "sha256-ppUtkudwXAaFipKY554ZgLF/Nqi+hLMy8BMhNc8q8UQ="; + rev = "2a6f10fec50940125d2409b151cf05eeb58cebfe"; + hash = "sha256-p3Sy/JVa8LFNyF/SUVLrUsPebaOMZe0cSC8Lo6R/kMQ="; }; aruco = callPackage ./aruco.nix { }; diff --git a/pkgs/by-name/pl/plocate/package.nix b/pkgs/by-name/pl/plocate/package.nix index 9748a7ebb6ad..f90fcec7f5f1 100644 --- a/pkgs/by-name/pl/plocate/package.nix +++ b/pkgs/by-name/pl/plocate/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Much faster locate"; homepage = "https://plocate.sesse.net/"; - license = lib.licenses.mit; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ peterhoeg SuperSandro2000 diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index 1068cf819afb..b5262ca64293 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qownnotes"; appname = "QOwnNotes"; - version = "26.6.2"; + version = "26.6.5"; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; - hash = "sha256-+tyOP+nx28gM/IYkwQ9jaM0PNbvJIX95RGO1kOAw4zY="; + hash = "sha256-M1Yqiyl0aUodvEva4y3fQiTthslDo2/54NNDEdcPsJY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix index 69d06b695139..fbfb4fc87bfc 100644 --- a/pkgs/by-name/ri/ripgrep/package.nix +++ b/pkgs/by-name/ri/ripgrep/package.nix @@ -19,10 +19,12 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ripgrep"; version = "15.1.0"; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-0gjwYMUlXYnmIWQS1SVzF1yQw1lpveRLw5qp049lc3I="; }; diff --git a/pkgs/by-name/ru/rustical/package.nix b/pkgs/by-name/ru/rustical/package.nix index 07f244b5b22e..8e58c6e13df2 100644 --- a/pkgs/by-name/ru/rustical/package.nix +++ b/pkgs/by-name/ru/rustical/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rustical"; - version = "0.12.15"; + version = "0.13.1"; src = fetchFromGitHub { owner = "lennart-k"; repo = "rustical"; tag = "v${finalAttrs.version}"; - hash = "sha256-ll7CFxYpzseYstBLe60VhYgvCYtobWeZ9/trBPTCSMg="; + hash = "sha256-DNwxQq2QKPQ6gzIxBJUhdMNbmHNYnt+MSFJ28PLzunQ="; }; - cargoHash = "sha256-eqY5xzlPOlGSqqegTWTHeLR+YJb9l52Ku2yGVfflQkk="; + cargoHash = "sha256-bIbDohCkSlV7uBi+lyylLE/gSqjzlp+xwxQRS9zBiio="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix index 9c9de873ec41..3c0c8465b21c 100644 --- a/pkgs/by-name/sc/scalingo/package.nix +++ b/pkgs/by-name/sc/scalingo/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "scalingo"; - version = "1.44.1"; + version = "1.45.0"; src = fetchFromGitHub { owner = "scalingo"; repo = "cli"; rev = version; - hash = "sha256-fLP7t1cgLOgU+xHLPFqDH+KbNuVxupuit5FBZ5iuQBE="; + hash = "sha256-UVXHhJEUqkVs/sMXl1wfYTIJkbZca5oJyoQ4byPw18s="; }; vendorHash = null; diff --git a/pkgs/by-name/ta/tabby-agent/package.nix b/pkgs/by-name/ta/tabby-agent/package.nix index 380e93f36c17..f53f6d877d11 100644 --- a/pkgs/by-name/ta/tabby-agent/package.nix +++ b/pkgs/by-name/ta/tabby-agent/package.nix @@ -4,25 +4,25 @@ fetchFromGitHub, nix-update-script, nodejs, - pnpm_9, + pnpm_11, fetchPnpmDeps, pnpmConfigHook, wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { pname = "tabby-agent"; - version = "0.31.2"; + version = "0.32.0"; src = fetchFromGitHub { owner = "TabbyML"; repo = "tabby"; tag = "v${finalAttrs.version}"; - hash = "sha256-dVQ/OLJnXgkzWfX3p6Cplw9hti2jXoMKCvKhm6YNzAI="; + hash = "sha256-OeHRJOg7UEOVBG7jTUGCpiuKZI0Jj7Gl7QDKpsjX5Bc="; }; nativeBuildInputs = [ pnpmConfigHook - pnpm_9 + pnpm_11 wrapGAppsHook3 ]; @@ -51,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_9; - fetcherVersion = 3; - hash = "sha256-xx45vudeW6OnUgyH0N+gQI5GPT8k5B4x0HdCvHF+f9A="; + pnpm = pnpm_11; + fetcherVersion = 4; + hash = "sha256-idEByCnQmqpnvni0RahZ7qEa0C/0zVPRFv0jaj3BcnM="; }; passthru.updateScript = nix-update-script { @@ -65,10 +65,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/TabbyML/tabby"; - changelog = "https://github.com/TabbyML/tabby/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/TabbyML/tabby/releases/tag/v${finalAttrs.src.tag}"; description = "Language server used to communicate with Tabby server"; mainProgram = "tabby-agent"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = [ lib.maintainers.skohtv ]; }; }) diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix index 7b38c18ffb3e..524e16a030f6 100644 --- a/pkgs/by-name/ta/taler-wallet-core/package.nix +++ b/pkgs/by-name/ta/taler-wallet-core/package.nix @@ -17,9 +17,7 @@ zip, }: let - nodeSources = (srcOnly nodejs-slim_24).overrideAttrs { - outputChecks = { }; - }; + nodeSources = srcOnly nodejs-slim_24; pnpm' = pnpm_11.override { nodejs-slim = nodejs-slim_24; }; esbuild' = esbuild.override { buildGoModule = diff --git a/pkgs/by-name/to/torrserver/package.nix b/pkgs/by-name/to/torrserver/package.nix index d5863bdd746d..e1d4572eb289 100644 --- a/pkgs/by-name/to/torrserver/package.nix +++ b/pkgs/by-name/to/torrserver/package.nix @@ -7,15 +7,15 @@ }: buildGo126Module rec { pname = "torrserver"; - version = "141.4"; + version = "141.5"; src = fetchFromGitHub { owner = "YouROK"; repo = "TorrServer"; tag = "MatriX.${version}"; - sha256 = "sha256-wTcHBD4rfcuZWSZjwqAXwlAp6qFQWacjqvXl9L7CnnQ="; + sha256 = "sha256-f1D6ZeIa5Uw6I/dG4OCN2ZbRudftaMlgQx+NuQVTWIA="; }; - vendorHash = "sha256-IPVaGgjcQp6+jw2nbzZZ4ZiQYzqw7zs5RM07J5ON4Bw="; + vendorHash = "sha256-AHkSemWYa4w20YKUyfhD1Liw9AwbgCxq+UmqVW0G70g="; modRoot = "server"; subPackages = [ "cmd" ]; diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index f1a058129fb1..e56f5a9bfe32 100644 --- a/pkgs/by-name/we/wealthfolio/package.nix +++ b/pkgs/by-name/we/wealthfolio/package.nix @@ -9,7 +9,7 @@ nodejs, openssl, pkg-config, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, rustPlatform, @@ -19,20 +19,20 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wealthfolio"; - version = "3.4.0"; + version = "3.5.2"; src = fetchFromGitHub { owner = "afadil"; repo = "wealthfolio"; rev = "v${finalAttrs.version}"; - hash = "sha256-SYI0LosdR82rUubxl0pNi1huEDcR6bxcaHbjCVT/T/0="; + hash = "sha256-WU87VmnbzUno1CmIVwBLYjmTZybM4qSuRmBH/2n/Tfo="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) src pname version; - pnpm = pnpm_9; - fetcherVersion = 3; - hash = "sha256-LXPQpQFXwPEHxktLoRiWTi8NbtzrS5ItUmoKJki3zcs"; + pnpm = pnpm_10; + fetcherVersion = 4; + hash = "sha256-EDnHlaW3Ad32N8wl38ryo6pYvKU2T1OH6IkOuTLI7Vs="; }; cargoRoot = "."; @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { src cargoRoot ; - hash = "sha256-cCaZ5X57WAaO9F2lP2/wdilXc0Al0Vr3ntyV1/Q5sj8="; + hash = "sha256-KoS2EouZ0Uf3cijUUOpwYBYEjEB5VxIArU1CuCji2+I="; }; nativeBuildInputs = [ @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { nodejs pkg-config pnpmConfigHook - pnpm_9 + pnpm_10 rustPlatform.cargoSetupHook wrapGAppsHook3 ]; diff --git a/pkgs/by-name/wo/worktrunk/package.nix b/pkgs/by-name/wo/worktrunk/package.nix index 1e2fca36c949..1ba94bcf30db 100644 --- a/pkgs/by-name/wo/worktrunk/package.nix +++ b/pkgs/by-name/wo/worktrunk/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "worktrunk"; - version = "0.53.0"; + version = "0.56.0"; src = fetchFromGitHub { owner = "max-sixty"; repo = "worktrunk"; tag = "v${finalAttrs.version}"; - hash = "sha256-1qWVELd9+XINjnzNNKeeCR9CxX/0DJVV6TS2cI0KhP4="; + hash = "sha256-6Soz41fyieWczJBNiv50UGUVMsvVej/1pMX3iPnvXg8="; }; - cargoHash = "sha256-sT9zOGhvsV3QKfRA2wtP4OnWitjxhL0B4guMBdkciE8="; + cargoHash = "sha256-NKjbn8RVtHWv/DqcQ/HqvvhKr9jAyisElD0OYyYbVAg="; cargoBuildFlags = [ "--package=worktrunk" ]; diff --git a/pkgs/by-name/ze/zerofs/package.nix b/pkgs/by-name/ze/zerofs/package.nix index 807258e08238..927deb891416 100644 --- a/pkgs/by-name/ze/zerofs/package.nix +++ b/pkgs/by-name/ze/zerofs/package.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zerofs"; - version = "1.1.15"; + version = "1.2.5"; src = fetchFromGitHub { owner = "Barre"; repo = "ZeroFS"; tag = "v${finalAttrs.version}"; - hash = "sha256-FfIiGULAxwnU/TOUxlnGj1IPC71TxBW9HZ57qbs0qZY="; + hash = "sha256-Nyv+GAy+SeWbYrEfHLilgWGUqnVS0cUoOd4+4Ah8GeQ="; }; sourceRoot = "${finalAttrs.src.name}/zerofs"; - cargoHash = "sha256-01yKdVuWR16ckmwyjpk4FMjLQl+b1VvcyGP2r1KMRCc="; + cargoHash = "sha256-Jsv/LDugP2Xp1zcCUvVmDHVkQNBoNlapMF3BRcWA3Q4="; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 2fbcfdb340c6..96d30a5223c3 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -5,7 +5,7 @@ }: let - version = "3.5.1"; + version = "3.5.3"; in buildPecl { inherit version; @@ -16,7 +16,7 @@ buildPecl { owner = "xdebug"; repo = "xdebug"; rev = version; - hash = "sha256-GOlWCKDLwptsHV9SvOOlR4uScvcw8V/DjwXIpfWjSkM="; + hash = "sha256-UrRQqnWEE0y8I4DTDWn21yGScG42+XaFFl6UjcJXbtM="; }; doCheck = true; diff --git a/pkgs/development/python-modules/classify-imports/default.nix b/pkgs/development/python-modules/classify-imports/default.nix index daac93e4e8f1..35a5d8663db1 100644 --- a/pkgs/development/python-modules/classify-imports/default.nix +++ b/pkgs/development/python-modules/classify-imports/default.nix @@ -2,21 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pytestCheckHook, }: buildPythonPackage (finalAttrs: { pname = "classify-imports"; version = "4.2.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "asottile"; repo = "classify-imports"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-f5wZfisKz9WGdq6u0rd/zg2CfMwWvQeR8xZQNbD7KfU="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "classify_imports" ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix index ca3392a22637..bd91ae04f67e 100644 --- a/pkgs/development/python-modules/disposable-email-domains/default.nix +++ b/pkgs/development/python-modules/disposable-email-domains/default.nix @@ -8,7 +8,7 @@ buildPythonPackage (finalAttrs: { pname = "disposable-email-domains"; - version = "0.0.193"; + version = "0.0.201"; pyproject = true; __structuredAttrs = true; @@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: { src = fetchPypi { pname = "disposable_email_domains"; inherit (finalAttrs) version; - hash = "sha256-5XT3UtSwPM2xQM44QgezX0YitUXR4xS/2tICH/O6BB4="; + hash = "sha256-8YA/GzaB3wo67/lrK+tM4wCuu9BIDGdB1ZzIP8bQIAA="; }; build-system = [ diff --git a/pkgs/development/python-modules/litestar/default.nix b/pkgs/development/python-modules/litestar/default.nix index 53e189ef577b..e0d0c0f0224b 100644 --- a/pkgs/development/python-modules/litestar/default.nix +++ b/pkgs/development/python-modules/litestar/default.nix @@ -60,14 +60,14 @@ buildPythonPackage (finalAttrs: { pname = "litestar"; - version = "2.23.0"; + version = "2.21.1"; pyproject = true; src = fetchFromGitHub { owner = "litestar-org"; repo = "litestar"; tag = "v${finalAttrs.version}"; - hash = "sha256-EKCQQElL4pq5Li52RUP68UKJQ+NyuCdEh7zz15ugP2s="; + hash = "sha256-dH51GecYwVTnOO+F1FJnFR2VO3IvLbpKWbxK7jssak8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/mplhep-data/default.nix b/pkgs/development/python-modules/mplhep-data/default.nix index 6f8d0f42716b..0a6ea1f76c7f 100644 --- a/pkgs/development/python-modules/mplhep-data/default.nix +++ b/pkgs/development/python-modules/mplhep-data/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mplhep-data"; - version = "0.0.5"; + version = "0.1.0"; pyproject = true; src = fetchPypi { pname = "mplhep_data"; inherit version; - hash = "sha256-TlxOrj5CN2LrPUrVQgYPG+fxIsGKFxZPf8/tz5Q/rH0="; + hash = "sha256-v5zcxlw6nOfY8OMHj/ZZ7z/P3hGeYloPcfIbBu2rxMk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/serialx/default.nix b/pkgs/development/python-modules/serialx/default.nix index 4de8088ec6a6..51eb4c20331c 100644 --- a/pkgs/development/python-modules/serialx/default.nix +++ b/pkgs/development/python-modules/serialx/default.nix @@ -20,14 +20,14 @@ buildPythonPackage (finalAttrs: { pname = "serialx"; - version = "1.8.0"; + version = "1.8.1"; pyproject = true; src = fetchFromGitHub { owner = "puddly"; repo = "serialx"; tag = "v${finalAttrs.version}"; - hash = "sha256-JNaS7nRzqNr6y+Qj8bG4U0vwtvfNmllr9vpS4IcSjV4="; + hash = "sha256-89lRB96lit4XxPhACnZ3Lv01G0IcddlwyPTttrWwsLQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/development/python-modules/slothy/default.nix b/pkgs/development/python-modules/slothy/default.nix index fa35bc5d3ec0..15b740b22fd5 100644 --- a/pkgs/development/python-modules/slothy/default.nix +++ b/pkgs/development/python-modules/slothy/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "slothy"; - version = "0.2.1"; + version = "0.2.2"; pyproject = true; src = fetchFromGitHub { owner = "slothy-optimizer"; repo = "slothy"; tag = version; - hash = "sha256-/xjOhf/Z4IQjrI05IfLWurZ0x0zTH97pr9F8dtEEsbA="; + hash = "sha256-pyES6ithBVAFSVdjsM61kp6eeEUxNsLs7jdekpX+YuA="; }; build-system = [ setuptools ]; diff --git a/pkgs/os-specific/linux/zfs/2_3.nix b/pkgs/os-specific/linux/zfs/2_3.nix index bf6701cc0ff8..34e173e12d78 100644 --- a/pkgs/os-specific/linux/zfs/2_3.nix +++ b/pkgs/os-specific/linux/zfs/2_3.nix @@ -16,7 +16,7 @@ callPackage ./generic.nix args { kernelMaxSupportedMajorMinor = "7.0"; # this package should point to the latest release. - version = "2.3.7"; + version = "2.3.8"; tests = { inherit (nixosTests.zfs) series_2_3; @@ -30,5 +30,5 @@ callPackage ./generic.nix args { amarshall ]; - hash = "sha256-67Yo5bAJP3dXC94xybrC4xhwz7pGtrp0MUT9P6OInog="; + hash = "sha256-qNBInNRpWrmImcermSHC0emYmnnjNvxWj3QnGtA6SUg="; } diff --git a/pkgs/os-specific/linux/zfs/2_4.nix b/pkgs/os-specific/linux/zfs/2_4.nix index 5752d198e755..6f4cbc6861d4 100644 --- a/pkgs/os-specific/linux/zfs/2_4.nix +++ b/pkgs/os-specific/linux/zfs/2_4.nix @@ -16,7 +16,7 @@ callPackage ./generic.nix args { kernelMaxSupportedMajorMinor = "7.0"; # this package should point to the latest release. - version = "2.4.2"; + version = "2.4.3"; tests = { inherit (nixosTests.zfs) series_2_4; @@ -30,5 +30,5 @@ callPackage ./generic.nix args { amarshall ]; - hash = "sha256-OqsKHzyFjjyX8CoajDGydY4TbuQqMA37PIaEOL+vDug="; + hash = "sha256-I1wLbstr0cFiGsyynP9kJ9ATRp/2b+fnnsdz0up+IzM="; } diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 1dc98829da38..ea017985f78e 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -4,7 +4,6 @@ let lib, stdenv, fetchFromGitHub, - fetchpatch2, autoreconfHook269, util-linux, nukeReferences, @@ -100,12 +99,7 @@ let inherit rev hash; }; - patches = - extraPatches - ++ lib.optional (kernel != null && lib.versionOlder kernel.version "5.14") (fetchpatch2 { - url = "https://github.com/openzfs/zfs/commit/58c8dc5f6926eb96903a3f38b141e8998ef9261b.patch?full_index=1"; - hash = "sha256-eYkMhHsHBA9MKXnB/GuHpuv44g1SCGV5Or0InPBeNkU="; - }); + patches = extraPatches; postPatch = optionalString buildKernel '' diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index f72e792a16c0..dfc43de1c33e 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -16,14 +16,14 @@ callPackage ./generic.nix args { # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.4.2"; + version = "2.4.3"; # rev = ""; tests = { inherit (nixosTests.zfs) unstable; }; - hash = "sha256-OqsKHzyFjjyX8CoajDGydY4TbuQqMA37PIaEOL+vDug="; + hash = "sha256-I1wLbstr0cFiGsyynP9kJ9ATRp/2b+fnnsdz0up+IzM="; extraLongDescription = '' This is "unstable" ZFS, and will usually be a pre-release version of ZFS.