diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 4aae5b8b46da..ba6553157706 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -53,6 +53,8 @@ - `fetchtorrent`, when using the "rqbit" backend, erroneously started fetching files into a subdirectory in Nixpkgs 24.11. The original behaviour – which matches the behaviour using the "transmission" backend – has now been restored. Users reliant on the erroneous behaviour can temporarily maintain it by adding `flatten = false` to the `fetchtorrent` arguments; Nix will produce an evaluation warning for anyone using `backend = "rqbit"` without `flatten = true`. +- `linux` and all other Linux kernel packages have moved all in-tree kernel modules into a new `modules` output. + - `webfontkitgenerator` has been renamed to `webfont-bundler`, following the rename of the upstream project. The binary name remains `webfontkitgenerator`. The `webfontkitgenerator` package is an alias to `webfont-bundler`. diff --git a/doc/stdenv/platform-notes.chapter.md b/doc/stdenv/platform-notes.chapter.md index ac98ec0e105e..f7e9b4fcc351 100644 --- a/doc/stdenv/platform-notes.chapter.md +++ b/doc/stdenv/platform-notes.chapter.md @@ -236,8 +236,8 @@ If your package is a compiler or language, and you’re not sure, ask @NixOS/dar You may see references to `darwin.apple_sdk.frameworks`. This is the legacy SDK pattern, and it is being phased out. -All packages in `darwin.apple_sdk`, `darwin.apple_sdk_11_0`, and `darwin.apple_sdk_12_3` are stubs that do nothing. -If your derivation references them, you can delete them. The default SDK should be enough to build your package. +All packages in `darwin.apple_sdk`, `darwin.apple_sdk_11_0`, and `darwin.apple_sdk_12_3` have been removed. +If your derivation references them, you should delete those references, as the default SDK should be enough to build your package. Note: the new SDK pattern uses the name `apple-sdk` to better align with Nixpkgs naming conventions. The legacy SDK pattern uses `apple_sdk`. @@ -254,15 +254,14 @@ Some of them (such as Zig or `bindgen` for Rust) depend on it. #### Updating legacy SDK overrides {#sec-darwin-legacy-frameworks-overrides} The legacy SDK provided two ways of overriding the default SDK. -These are both being phased out along with the legacy SDKs. -They have been updated to set up the new SDK for you, but you should replace them with doing that directly. +They have been removed along with the legacy SDKs. - `pkgs.darwin.apple_sdk_11_0.callPackage` - this pattern was used to provide frameworks from the macOS 11 SDK. It is now the same as `callPackage`. - `overrideSDK` - this stdenv adapter would try to replace the frameworks used by your derivation and its transitive dependencies. - It now adds the `apple-sdk_12` package for `12.3` and does nothing for `11.0`. - If `darwinMinVersion` is specified, it will add `darwinMinVersionHook` with the specified minimum version. - No other SDK versions are supported. + It added the `apple-sdk_12` package for `12.3` and did nothing for `11.0`. + If `darwinMinVersion` is specified, it would add `darwinMinVersionHook` with the specified minimum version. + No other SDK versions were supported. ### Darwin Cross-Compilation {#sec-darwin-legacy-cross-compilation} diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index b19e3ac5c787..b0f703f122b2 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -387,7 +387,7 @@ in (mkIf config.boot.kernel.enable { system.build = { inherit kernel; }; - system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages; + system.modulesTree = [ (lib.getOutput "modules" kernel) ] ++ config.boot.extraModulePackages; # Not required for, e.g., containers as they don't have their own kernel or initrd. # They boot directly into stage 2. diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d640188120fd..7f994a285576 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -117,11 +117,11 @@ "vendorHash": "sha256-2NSP0jGFchh3roqSKxCRbkQ+8lNiGRo4JivvBj6wqdg=" }, "aviatrix": { - "hash": "sha256-sk0AU0Gqynpl1z+AXRqW1/F56pV4uTrO332622NrzX0=", + "hash": "sha256-uE2E/NWL/ITCIMvq90ul0463/rG9PJHmzw2wMi0imHI=", "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix", "owner": "AviatrixSystems", "repo": "terraform-provider-aviatrix", - "rev": "v8.0.0", + "rev": "v8.1.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -705,13 +705,13 @@ "vendorHash": "sha256-ctd9V5EXL0c9b4aJ47nfjhqCMTewL55IkjkQ39ShoUk=" }, "kafka": { - "hash": "sha256-Z+WRuLumEjN6fGa91pKrFzc4I/5XwNFLh3rJ9Dob3x8=", + "hash": "sha256-5pHYJ7VIWmg8XCfdT9Uq5iNKUdIFsqzuf/j1WGrOcNE=", "homepage": "https://registry.terraform.io/providers/Mongey/kafka", "owner": "Mongey", "repo": "terraform-provider-kafka", - "rev": "v0.12.1", + "rev": "v0.13.0", "spdx": "MIT", - "vendorHash": "sha256-kkaNv+c6IGAW+amSSycjBmUCFXBeQrcF5Jmvtl8bXAE=" + "vendorHash": "sha256-td8utsV5CBd4BcUg3DQx+EqVkUMieWr1Oa/H+qY+P/Q=" }, "kafka-connect": { "hash": "sha256-XMGpK22Ww8swvfrnbClxjErVmkBKX3dxdlkjgNJHlCE=", @@ -1102,11 +1102,11 @@ "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI=" }, "rancher2": { - "hash": "sha256-vRZdNxtuXAoCbc7QFL1IAPokug8perRRk/PfRpZJDUQ=", + "hash": "sha256-DIYIfBjNBt+GKflmgHeAEC3uqD/JZ7FhT77lV4J9w+0=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v7.3.2", + "rev": "v8.0.0", "spdx": "MPL-2.0", "vendorHash": "sha256-M2lJKmIR66lQKFkInjizn68ax2Gq4sim5Y3vZKyDhZ8=" }, @@ -1120,13 +1120,13 @@ "vendorHash": "sha256-jyfzk3vbgZwHlyiFFw1mhD+us/7WNatUQTGN4WsrfgE=" }, "remote": { - "hash": "sha256-3wzvhGLYAIlDSqNg4K/j8KHOsXKZv8u4ssrm+aC0dus=", + "hash": "sha256-9Q67XRZwJkTrOQZ0IXiMWKLCJgJ/woDL9U+3yBHGZG0=", "homepage": "https://registry.terraform.io/providers/tenstad/remote", "owner": "tenstad", "repo": "terraform-provider-remote", - "rev": "v0.2.0", + "rev": "v0.2.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-xo0alLK3fccbKRG5bN1G7orDsP47I3ySAzpZ9O0f2Fg=" + "vendorHash": "sha256-vsnihN98O5RzMZk5YNycCnjpvxklQoLbZolCJXbJRMU=" }, "rootly": { "hash": "sha256-8ktCllrqpv0woEPfMkaZ0Ns+1JU9KRGANSgTfqsavgU=", diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix index c601366e683e..c8cf97449ff9 100644 --- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix +++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix @@ -8,13 +8,13 @@ let drv = stdenv.mkDerivation rec { pname = "controller-topology-project"; - version = "1.0.5"; + version = "1.0.7"; src = fetchFromGitHub { owner = "kodi-game"; repo = "controller-topology-project"; rev = "v${version}"; - sha256 = "sha256-9NqupL/LAshME7GlzKAT6i3kx2MPEBU7Jw2nPele1W8="; + sha256 = "sha256-LzwMKsoip+ajmmk4qUJynOmhhf3Auivn8Af8VRGWkTA="; }; postPatch = '' diff --git a/pkgs/by-name/al/alot/package.nix b/pkgs/by-name/al/alot/package.nix index 753ef96c167e..da68107498d6 100644 --- a/pkgs/by-name/al/alot/package.nix +++ b/pkgs/by-name/al/alot/package.nix @@ -23,13 +23,11 @@ buildPythonApplication rec { "man" ]; - disabled = !isPy3k; - src = fetchFromGitHub { owner = "pazz"; repo = "alot"; tag = version; - sha256 = "sha256-mXaRzl7260uxio/BQ36BCBxgKhl1r0Rc6PwFZA8qNqc="; + hash = "sha256-mXaRzl7260uxio/BQ36BCBxgKhl1r0Rc6PwFZA8qNqc="; }; postPatch = '' @@ -37,12 +35,12 @@ buildPythonApplication rec { --replace-fail /usr/share "$out/share" ''; - nativeBuildInputs = [ + build-system = [ setuptools-scm ] ++ lib.optional withManpage sphinx; - propagatedBuildInputs = [ + dependencies = [ configobj file gpgme @@ -95,12 +93,13 @@ buildPythonApplication rec { sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop ''; - meta = with lib; { + meta = { homepage = "https://github.com/pazz/alot"; description = "Terminal MUA using notmuch mail"; + changelog = "https://github.com/pazz/alot/releases/tag/${src.tag}"; mainProgram = "alot"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ milibopp ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ milibopp ]; }; } diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 7108d39dfef7..dbcfe49a8401 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2025-08-06"; + version = "0-unstable-2025-08-09"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "80576999c92af3eb88ea2008d4a18d29393ed579"; - hash = "sha256-SdxOgm7purRxIU16RFuSgUzKIgi+7gJ2hJuCDVCjd54="; + rev = "d929c14e7a15f69085bce6bca84af05a0fb3ff45"; + hash = "sha256-nM/6+IzeZpiUKBTWc2kZUxp9vuhMtzHc9A/xYaMkmVQ="; }; dontConfigure = true; diff --git a/pkgs/by-name/av/avbroot/package.nix b/pkgs/by-name/av/avbroot/package.nix index 9c21bd46e526..accbd1c8c02d 100644 --- a/pkgs/by-name/av/avbroot/package.nix +++ b/pkgs/by-name/av/avbroot/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "avbroot"; - version = "3.18.1"; + version = "3.20.0"; src = fetchFromGitHub { owner = "chenxiaolong"; repo = "avbroot"; tag = "v${version}"; - hash = "sha256-+Syx8Hhpn6803SEIvB3ppa6mEVgU6SqSr1o6xy+OZsQ="; + hash = "sha256-O5Mmu/b2Sl9UZTNHnDkqu6nWF79m480n03vJ7Ve3khQ="; }; - cargoHash = "sha256-Wjwi/zvaS1fuAOx/OeclGSbyyPaqkIxQ3jfUPdLMMQQ="; + cargoHash = "sha256-K7xnk0SR6x0VrGFxWQC6B+KxhNpbfvlkRhJ4oALkXco="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/br/brush/package.nix b/pkgs/by-name/br/brush/package.nix index acc964849d55..99386af7bfe1 100644 --- a/pkgs/by-name/br/brush/package.nix +++ b/pkgs/by-name/br/brush/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "brush"; - version = "0.2.20"; + version = "0.2.21"; src = fetchFromGitHub { owner = "reubeno"; repo = "brush"; tag = "brush-shell-v${version}"; - hash = "sha256-yPd/dU/GOnx+R8tqkvWs+WsN0Zb6AHFITaE+N4m2rco="; + hash = "sha256-CAQkbesP0wqyt7yA53BQlW/tkCoCPKEBoDLTVJBnR6o="; }; - cargoHash = "sha256-IrjBd+RswBjk/2QW0syU4Hkj2rLfOn/W+czvdEw86RE="; + cargoHash = "sha256-x/OyO96XKABf1hqSg0GMzWw6aeLOu7z2yu9rQQSM4Lc="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/dn/dnscrypt-proxy/package.nix b/pkgs/by-name/dn/dnscrypt-proxy/package.nix index 2f9fe584de00..d6ec537b4cbf 100644 --- a/pkgs/by-name/dn/dnscrypt-proxy/package.nix +++ b/pkgs/by-name/dn/dnscrypt-proxy/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "dnscrypt-proxy"; - version = "2.1.12"; + version = "2.1.13"; vendorHash = null; @@ -17,7 +17,7 @@ buildGoModule rec { owner = "DNSCrypt"; repo = "dnscrypt-proxy"; rev = version; - hash = "sha256-HgpcZccx3gaR3dTJJRKPICvNxZj9KdeC0+2ll8TWgeM="; + hash = "sha256-IFfhcirUGbp/pKFN/5aEpuIuhSR3ZS4K7TatBtaX5zg="; }; passthru.tests = { inherit (nixosTests) dnscrypt-proxy2; }; diff --git a/pkgs/by-name/fc/fcast-receiver/package.nix b/pkgs/by-name/fc/fcast-receiver/package.nix index 8225fc2cfce4..49fcdd4c522d 100644 --- a/pkgs/by-name/fc/fcast-receiver/package.nix +++ b/pkgs/by-name/fc/fcast-receiver/package.nix @@ -11,21 +11,21 @@ buildNpmPackage rec { pname = "fcast-receiver"; - version = "2.0.0"; + version = "2.2.1"; src = fetchFromGitLab { domain = "gitlab.futo.org"; owner = "videostreaming"; repo = "fcast"; - rev = "4af2a537ef431918a5cf53b3ba18abe6b2d18c1e"; - hash = "sha256-Y3IyxYLGRi/fLh5A3ap+5x3Wny9WRplaYtBM3R3I8+U="; + rev = "520907fbb8e3103d7eab9d925e572a966f4e74f3"; + hash = "sha256-5ERnlX4Jw6kv0BSNNA2mnJCYoIQJDuUrZVoKIYuWBYA="; }; sourceRoot = "${src.name}/receivers/electron"; makeCacheWritable = true; - npmDepsHash = "sha256-GXlqOukGWtt3KP+xsAiDsUG2Naej0v2RL7Vq3hqcavE="; + npmDepsHash = "sha256-EgNpKOjpv7QMsmcVGEpU81UIi/z4vA1S8xXmespx6Ew="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; diff --git a/pkgs/by-name/fl/flatter/package.nix b/pkgs/by-name/fl/flatter/package.nix index 216dc3138cbd..b9d95d63924f 100644 --- a/pkgs/by-name/fl/flatter/package.nix +++ b/pkgs/by-name/fl/flatter/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation { pname = "flatter"; - version = "0-unstable-2025-03-28"; + version = "0-unstable-2025-08-12"; src = fetchFromGitHub { owner = "keeganryan"; repo = "flatter"; - rev = "13c4ef0f0abe7ad5db88b19a9196c00aa5cf067c"; - hash = "sha256-k0FcIJARaXi602eqMSum+q1IaCs30Xi0hB/ZNNkXruw="; + rev = "7757f6c1166ce5feda1cb829736976b8d20741fc"; + hash = "sha256-n/JtSdX8kZIEXcxj344APRo7fuRIR8+ZeUnk7QX8f3Q="; }; strictDeps = true; diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index e49fd9044f34..5e6ee18ae3c7 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -35,13 +35,13 @@ let in buildGoModule rec { pname = "gitea"; - version = "1.24.3"; + version = "1.24.5"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; tag = "v${gitea.version}"; - hash = "sha256-z9GaUkBh/hfDKkygi/1U0tK725mj39eBR906QKn3MWU="; + hash = "sha256-GLFQVFLltT9u2ep2Z2YZn022NcKdEbWSOYVYE79yaJ8="; }; proxyVendor = true; diff --git a/pkgs/by-name/go/go-xmlstruct/package.nix b/pkgs/by-name/go/go-xmlstruct/package.nix index 09de3b1f3b93..4b2b0a9ef29a 100644 --- a/pkgs/by-name/go/go-xmlstruct/package.nix +++ b/pkgs/by-name/go/go-xmlstruct/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "go-xmlstruct"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "go-xmlstruct"; tag = "v${finalAttrs.version}"; - hash = "sha256-YTVPxC3HoSuWgNkFkhNr4ytYbL+AiIkzjLBfkGNmv+M="; + hash = "sha256-FS3rFiYpaw6DlttyvJUcPc4ZDQRj5kBYwGxTWb+AAho="; }; vendorHash = "sha256-myt5JjEDnLfkYkB+yb/oaH4dgIOB9qFcqcEb6KO5vBk="; diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix index 55571fd3c7fc..a85dc8fdf190 100644 --- a/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/pkgs/by-name/ha/handheld-daemon/package.nix @@ -16,14 +16,14 @@ }: python3Packages.buildPythonApplication rec { pname = "handheld-daemon"; - version = "3.18.2"; + version = "3.18.5"; pyproject = true; src = fetchFromGitHub { owner = "hhd-dev"; repo = "hhd"; tag = "v${version}"; - hash = "sha256-tU5xDwqmeYFT+2byq2Qo/k29TncPfTQgYZF0JZUe/Iw="; + hash = "sha256-T/0qKHF/BmVtVO19pd4/iqIZP1/G7iayDzHdhjRIA7U="; }; # Handheld-daemon runs some selinux-related utils which are not in nixpkgs. diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix index eff278517169..65524316c8d2 100644 --- a/pkgs/by-name/lu/lux-cli/package.nix +++ b/pkgs/by-name/lu/lux-cli/package.nix @@ -17,18 +17,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lux-cli"; - version = "0.13.0"; + version = "0.13.3"; src = fetchFromGitHub { owner = "nvim-neorocks"; repo = "lux"; tag = "v${finalAttrs.version}"; - hash = "sha256-tx4sgh8G5R3odpBBVl0qLFWnTcmk1YYfGYkAJtHL9wE="; + hash = "sha256-RmdxqpmqOs/1a9KmakWAHJUkiQ6I2t4VROiSocRnx84="; }; buildAndTestSubdir = "lux-cli"; - cargoHash = "sha256-dLhfDDoz2jFShk3ksxmQ8FEKc9JE/NPF4zSUV5kvgj8="; + cargoHash = "sha256-vin86rAmUbHJJuhChZi3ndj57wTCv945sVF6+by6Dlc="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix index c03d8286d37f..2856348749d0 100644 --- a/pkgs/by-name/qr/qrtool/package.nix +++ b/pkgs/by-name/qr/qrtool/package.nix @@ -26,8 +26,8 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; postInstall = '' - # Built by ./build.rs using `asciidoctor` - installManPage ./target/*/release/build/qrtool*/out/*.? + asciidoctor -b manpage docs/man/man1/*.1.adoc + installManPage docs/man/man1/*.1 '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd qrtool \ diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index 53078e3fdf0d..c3fe10b152e2 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.9.69"; + version = "0.9.71"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-dbGGxkv3Fcabu7nsEEgYVstgoMfUEVnucmawKWgCVUw="; + hash = "sha256-Pk2R4t0le+F8Q1km/eTFcwyyMxMVgcAI+19cT53xGFs="; fetchSubmodules = true; }; @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-0wcmtCMTVmJU8yxpdi2decnFmKdbCl2grNlZ/FyKx8I="; + hash = "sha256-EF7HCSxgL/6a45yaKboe812LxCtnvTF2XGVD1AfmoUc="; }; pnpmRoot = "../.."; diff --git a/pkgs/by-name/st/starkiller/package.nix b/pkgs/by-name/st/starkiller/package.nix new file mode 100644 index 000000000000..9fa96aab6211 --- /dev/null +++ b/pkgs/by-name/st/starkiller/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + nodejs_24, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "starkiller"; + version = "3.0.1"; + + src = fetchFromGitHub { + owner = "bc-security"; + repo = "starkiller"; + rev = "v${finalAttrs.version}"; + hash = "sha256-+q+toH5AvIdFPOY0Q06lWDlPrhIpEnukV+8JlwDZVPE="; + }; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = finalAttrs.src + "/yarn.lock"; + hash = "sha256-fkpYRnBEM/nUtdqnWMb7Trqa5SnCrdX7RUYgd73RGFE="; + }; + + buildPhase = '' + runHook preBuild + + # Copying the workaround from + # https://github.com/NixOS/nixpkgs/pull/386706 + pushd node_modules/vue-demi + yarn run postinstall + popd + + yarn --offline build + + runHook postBuild + ''; + + postInstall = '' + mkdir $out + cp -r dist/** $out + ''; + + nativeBuildInputs = [ + yarnConfigHook + # Needed for executing package.json scripts + nodejs_24 + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + homepage = "https://github.com/BC-SECURITY/Starkiller"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + description = "Web UI for Empire"; + maintainers = with lib.maintainers; [ + fzakaria + vrose + ]; + }; +}) diff --git a/pkgs/by-name/st/starpls/package.nix b/pkgs/by-name/st/starpls/package.nix index 1fc220fdb04c..190132b18cc1 100644 --- a/pkgs/by-name/st/starpls/package.nix +++ b/pkgs/by-name/st/starpls/package.nix @@ -7,17 +7,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "starpls"; - version = "0.1.21"; + version = "0.1.22-unstable-2025-12-30"; src = fetchFromGitHub { owner = "withered-magic"; repo = "starpls"; - # https://github.com/withered-magic/starpls/commit/96ef5d0548748745756c421960e0ebb5cfbef963 - rev = "96ef5d0548748745756c421960e0ebb5cfbef963"; - hash = "sha256-PymdSITGeSxKwcLnsJPKc73E8VDS8SSRBRRNQSKvnbU="; + rev = "db21acd3cb24893315dd601484c7d40689589e9a"; + hash = "sha256-t9kdpBKyGM61CKhtfO5urVVzyKpL0bX0pZuf0djDdCw="; }; - cargoHash = "sha256-yovv8ox7TtSOxGW+YKYr/ED4cq7P7T7vSqoXBFhFGb4="; + cargoHash = "sha256-5xYfQRm7U7sEQiJEfjaLznoXUxHsxnLmIEA/OxTkjFg="; nativeBuildInputs = [ protobuf @@ -31,7 +30,9 @@ rustPlatform.buildRustPackage (finalAttrs: { tests.version = testers.testVersion { package = finalAttrs.finalPackage; command = "starpls version"; - version = "v${finalAttrs.version}"; + version = "v${ + lib.strings.substring 0 (builtins.stringLength finalAttrs.version - 6) finalAttrs.version + }"; }; }; diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index 28c8762b45ac..f4437154988d 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "supabase-cli"; - version = "2.23.7"; + version = "2.33.9"; src = fetchFromGitHub { owner = "supabase"; diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix index 363303666a79..333d98c90df7 100644 --- a/pkgs/by-name/to/tombi/package.nix +++ b/pkgs/by-name/to/tombi/package.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tombi"; - version = "0.4.42"; + version = "0.5.6"; src = fetchFromGitHub { owner = "tombi-toml"; repo = "tombi"; tag = "v${finalAttrs.version}"; - hash = "sha256-EOUi8yIXRJag9U2RzXWgX8vmOO7OJ/hmCpx7BvKsml4="; + hash = "sha256-EjKvVBIiG20qsr4XmGtjx7I39/tvl9HGPza5fpbwMeg="; }; # Tests relies on the presence of network doCheck = false; cargoBuildFlags = [ "--package tombi-cli" ]; - cargoHash = "sha256-Hwa+P0Qt3W171EzhuEdzY85w3XuHv6s4MCFkH4Ejqa8="; + cargoHash = "sha256-TlGGkj0YtVp00swQfgjRqmYkKHDBxEUh3e4FYh6vRgk="; postPatch = '' substituteInPlace Cargo.toml \ diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index 3a8f29185bea..57150e1312f5 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "elementary-capnet-assist"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = "capnet-assist"; rev = version; - sha256 = "sha256-u+JYJ5J5Cx27MrVlhh6AXAtpKGw7Kf1+MyJEEHqgod0="; + sha256 = "sha256-HowrCYOVSYSOCRpTIXFfw4lLUulXY6j5QcxJOBMo984="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 14fd4bb63a2f..980ebdf2d582 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -92,9 +92,9 @@ major = "3"; minor = "14"; patch = "0"; - suffix = "rc1"; + suffix = "rc2"; }; - hash = "sha256-hwd4CunxnFv1ufJ4JxgboRza17spLqScrVQkMx5A7os="; + hash = "sha256-vGKFTPIyNFvSLJCRpoRk4B4FbGRzo//6hFcsijQtplY="; inherit passthruFun; }; # Minimal versions of Python (built without optional dependencies) diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 7b200199aac5..36a9d866d4f1 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "pythia"; - version = "8.313"; + version = "8.315"; src = fetchurl { url = "https://pythia.org/download/pythia83/pythia${ builtins.replaceStrings [ "." ] [ "" ] version }.tgz"; - sha256 = "sha256-0H6AFQHE3LdtlI3GMoU3X1l0U8HW7GXnEodgPcd2cYw="; + sha256 = "sha256-Sy/nNB4z6QtyJv3Koqe/kyeYezNU6EwE8f2SVoY2kK4="; }; nativeBuildInputs = [ rsync ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 7b0354430edc..a6e5c276524d 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.81.0"; + version = "3.82.0"; pyproject = true; src = fetchPypi { pname = "adafruit_platformdetect"; inherit version; - hash = "sha256-SF/OhnHbgEQ5VPxHdnoEIoSu6rSNk+ISWEb+v30i8h8="; + hash = "sha256-C/ese6ezyDFp+3ifobq/DlHsz4g0wrBnuWCoa69qYYg="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 2e1daa78e576..4accc61dc56a 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "84"; + version = "85"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "aiounifi"; tag = "v${version}"; - hash = "sha256-8zOM1K1N1NFUQwyEVRDFqHntK+HSpXG2F1sRhOs7Bc4="; + hash = "sha256-Uc+eetvVBArCwVrKeQQquBN2SOGehlxyfTG5p35vCr0="; }; postPatch = '' @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for communicating with Unifi Controller API"; homepage = "https://github.com/Kane610/aiounifi"; - changelog = "https://github.com/Kane610/aiounifi/releases/tag/v${version}"; + changelog = "https://github.com/Kane610/aiounifi/releases/tag/${src.tag}"; license = licenses.mit; maintainers = [ ]; mainProgram = "aiounifi"; diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index b51cee7083bb..ed996b727c26 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, # build poetry-core, @@ -15,26 +14,26 @@ buildPythonPackage rec { pname = "astral"; version = "3.2"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-m3w7QS6eadFyz7JL4Oat3MnxvQGijbi+vmbXXMxTPYg="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ freezegun pytestCheckHook ]; + pythonImportsCheck = [ "astral" ]; + meta = with lib; { - changelog = "https://github.com/sffjunkie/astral/releases/tag/${version}"; description = "Calculations for the position of the sun and the moon"; homepage = "https://github.com/sffjunkie/astral/"; + changelog = "https://github.com/sffjunkie/astral/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ flokli ]; }; diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index 3edd3f454312..33f3bddbf267 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "4.0.0"; + version = "4.0.1"; pyproject = true; src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "bleak-retry-connector"; tag = "v${version}"; - hash = "sha256-zF1wGDpcUK/88A+2JHuu2bU1tYmJIvSfdZX/IZEmauQ="; + hash = "sha256-6x9n8DG7nyGLFCcPAEyIy3sWZ4sthgFT24/Owv0KTsQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/cyipopt/default.nix b/pkgs/development/python-modules/cyipopt/default.nix index da1c8b8f88a0..80035f189809 100644 --- a/pkgs/development/python-modules/cyipopt/default.nix +++ b/pkgs/development/python-modules/cyipopt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "cyipopt"; - version = "1.5.0"; + version = "1.6.1"; pyproject = true; src = fetchFromGitHub { owner = "mechmotum"; repo = "cyipopt"; tag = "v${version}"; - hash = "sha256-ddiSCVzywlCeeVbRJg2wxKIlAVlZw9Js95IbEDqhh5Q="; + hash = "sha256-feGGAwhNw+xZrSsag2W5nruQWAC6NP9k4F0X9EjaRTg="; }; nativeBuildInputs = [ pkg-config ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = { description = "Cython interface for the interior point optimzer IPOPT"; homepage = "https://github.com/mechmotum/cyipopt"; - changelog = "https://github.com/mechmotum/cyipopt/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/mechmotum/cyipopt/blob/${src.tag}/CHANGELOG.rst"; license = lib.licenses.epl20; maintainers = with lib.maintainers; [ nim65s ]; }; diff --git a/pkgs/development/python-modules/mcpadapt/default.nix b/pkgs/development/python-modules/mcpadapt/default.nix index 08c8832a6c76..bef7fcdaae86 100644 --- a/pkgs/development/python-modules/mcpadapt/default.nix +++ b/pkgs/development/python-modules/mcpadapt/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "mcpadapt"; - version = "0.1.12"; + version = "0.1.13"; pyproject = true; src = fetchFromGitHub { owner = "grll"; repo = "mcpadapt"; tag = "v${version}"; - hash = "sha256-mU/zcNEHmPfSMEMgjj4u0iwmXBH2cJzGEANPxyiR1l0="; + hash = "sha256-yz4fPywhlCu6DIhYoeaK/eAYjht8LCzx9ltX2XsIFxw="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pyaussiebb/default.nix b/pkgs/development/python-modules/pyaussiebb/default.nix index 190bc5f67288..43cd58701663 100644 --- a/pkgs/development/python-modules/pyaussiebb/default.nix +++ b/pkgs/development/python-modules/pyaussiebb/default.nix @@ -3,7 +3,6 @@ aiohttp, buildPythonPackage, fetchFromGitHub, - loguru, pdm-backend, pydantic, requests, @@ -26,7 +25,6 @@ buildPythonPackage rec { dependencies = [ aiohttp requests - loguru pydantic ]; @@ -35,11 +33,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "aussiebb" ]; - meta = with lib; { + meta = { description = "Module for interacting with the Aussie Broadband APIs"; homepage = "https://github.com/yaleman/aussiebb"; changelog = "https://github.com/yaleman/pyaussiebb/blob/${src.tag}/CHANGELOG.md"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pydantic-yaml/default.nix b/pkgs/development/python-modules/pydantic-yaml/default.nix index e1c980e55274..de5f184ee66d 100644 --- a/pkgs/development/python-modules/pydantic-yaml/default.nix +++ b/pkgs/development/python-modules/pydantic-yaml/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - importlib-metadata, pydantic, ruamel-yaml, typing-extensions, @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "pydantic-yaml"; - version = "1.5.1"; + version = "1.6.0"; pyproject = true; @@ -21,7 +20,7 @@ buildPythonPackage rec { owner = "NowanIlfideme"; repo = "pydantic-yaml"; tag = "v${version}"; - hash = "sha256-UOehghNjPymuZtGp1yM5T15M6/XmK1rgTN9uVCVOst4="; + hash = "sha256-n5QWVHgYAg+Ad7Iv6CBSRQcl8lv4ZtcFMiC2ZHyi414="; }; postPatch = '' @@ -32,7 +31,6 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; dependencies = [ - importlib-metadata pydantic ruamel-yaml typing-extensions diff --git a/pkgs/development/python-modules/wagtail-factories/default.nix b/pkgs/development/python-modules/wagtail-factories/default.nix index 3079e81c815d..c3d3bd399f4d 100644 --- a/pkgs/development/python-modules/wagtail-factories/default.nix +++ b/pkgs/development/python-modules/wagtail-factories/default.nix @@ -1,25 +1,28 @@ { + lib, buildPythonPackage, callPackage, factory-boy, fetchFromGitHub, - lib, + setuptools, wagtail, }: buildPythonPackage rec { pname = "wagtail-factories"; - version = "4.2.1"; - format = "setuptools"; + version = "4.3.0"; + pyproject = true; src = fetchFromGitHub { repo = "wagtail-factories"; owner = "wagtail"; - tag = version; - sha256 = "sha256-jo8VwrmxHBJnORmuR6eTLrf/eupNL2vhXcw81EzfTxM="; + tag = "v${version}"; + hash = "sha256-Rbu8D0vmUyF76YzF1QSQC5c0s12GxRrHNuUhMxcZdQY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ factory-boy wagtail ]; @@ -33,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Factory boy classes for wagtail"; homepage = "https://github.com/wagtail/wagtail-factories"; - changelog = "https://github.com/wagtail/wagtail-factories/blob/${version}/CHANGES"; + changelog = "https://github.com/wagtail/wagtail-factories/blob/${src.tag}/CHANGES"; license = licenses.mit; maintainers = with maintainers; [ sephi ]; }; diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix deleted file mode 100644 index 7e9a5b483ffd..000000000000 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ /dev/null @@ -1,272 +0,0 @@ -# Compatibility stubs for packages that used the old SDK frameworks. -{ - lib, - callPackage, - pkgs, -}: - -let - mkStub = callPackage ../apple-sdk/mk-stub.nix { } "darwin.apple_sdk_11_0" "11.0"; -in -lib.genAttrs [ - "CLTools_Executables" - "IOKit" - "Libsystem" - "LibsystemCross" - "MacOSX-SDK" - "configd" - "darwin-stubs" - "libcharset" - "libcompression" - "libnetwork" - "libpm" - "libunwind" - "objc4" - "sdkRoot" -] mkStub -// { - frameworks = lib.genAttrs [ - "AGL" - "AVFCapture" - "AVFCore" - "AVFoundation" - "AVKit" - "Accelerate" - "Accessibility" - "Accounts" - "AdServices" - "AdSupport" - "AddressBook" - "AddressBookCore" - "AppKit" - "AppTrackingTransparency" - "Apple80211" - "AppleScriptKit" - "AppleScriptObjC" - "ApplicationServices" - "AudioToolbox" - "AudioToolboxCore" - "AudioUnit" - "AudioVideoBridging" - "AuthenticationServices" - "AutomaticAssessmentConfiguration" - "Automator" - "BackgroundTasks" - "BusinessChat" - "CFNetwork" - "CalendarStore" - "CallKit" - "Carbon" - "ClassKit" - "CloudKit" - "Cocoa" - "Collaboration" - "ColorSync" - "Combine" - "Contacts" - "ContactsPersistence" - "ContactsUI" - "CoreAudio" - "CoreAudioKit" - "CoreAudioTypes" - "CoreBluetooth" - "CoreData" - "CoreDisplay" - "CoreFoundation" - "CoreGraphics" - "CoreHaptics" - "CoreImage" - "CoreLocation" - "CoreMIDI" - "CoreMIDIServer" - "CoreML" - "CoreMedia" - "CoreMediaIO" - "CoreMotion" - "CoreServices" - "CoreSpotlight" - "CoreSymbolication" - "CoreTelephony" - "CoreText" - "CoreVideo" - "CoreWLAN" - "CryptoKit" - "CryptoTokenKit" - "DVDPlayback" - "DebugSymbols" - "DeveloperToolsSupport" - "DeviceCheck" - "DirectoryService" - "DiscRecording" - "DiscRecordingUI" - "DiskArbitration" - "DisplayServices" - "DriverKit" - "EventKit" - "ExceptionHandling" - "ExecutionPolicy" - "ExternalAccessory" - "FWAUserLib" - "FileProvider" - "FileProviderUI" - "FinderSync" - "ForceFeedback" - "Foundation" - "GLKit" - "GLUT" - "GSS" - "GameCenterFoundation" - "GameCenterUI" - "GameCenterUICore" - "GameController" - "GameKit" - "GameplayKit" - "HIDDriverKit" - "Hypervisor" - "ICADevices" - "IMServicePlugIn" - "IOBluetooth" - "IOBluetoothUI" - "IOKit" - "IOSurface" - "IOUSBHost" - "IdentityLookup" - "ImageCaptureCore" - "ImageIO" - "InputMethodKit" - "InstallerPlugins" - "InstantMessage" - "Intents" - "JavaNativeFoundation" - "JavaRuntimeSupport" - "JavaScriptCore" - "JavaVM" - "Kerberos" - "Kernel" - "KernelManagement" - "LDAP" - "LatentSemanticMapping" - "LinkPresentation" - "LocalAuthentication" - "MLCompute" - "MapKit" - "MediaAccessibility" - "MediaLibrary" - "MediaPlayer" - "MediaRemote" - "MediaToolbox" - "Message" - "Metal" - "MetalKit" - "MetalPerformanceShaders" - "MetalPerformanceShadersGraph" - "MetricKit" - "ModelIO" - "MultipeerConnectivity" - "MultitouchSupport" - "NaturalLanguage" - "NearbyInteraction" - "NetFS" - "Network" - "NetworkExtension" - "NetworkingDriverKit" - "NotificationCenter" - "OSAKit" - "OSLog" - "OpenAL" - "OpenCL" - "OpenDirectory" - "OpenGL" - "PCIDriverKit" - "PCSC" - "PDFKit" - "ParavirtualizedGraphics" - "PassKit" - "PassKitCore" - "PencilKit" - "Photos" - "PhotosUI" - "PreferencePanes" - "PushKit" - "Python" - "QTKit" - "Quartz" - "QuartzCore" - "QuickLook" - "QuickLookThumbnailing" - "QuickTime" - "RealityKit" - "ReplayKit" - "Ruby" - "SafariServices" - "SceneKit" - "ScreenSaver" - "ScreenTime" - "ScriptingBridge" - "Security" - "SecurityFoundation" - "SecurityInterface" - "SensorKit" - "ServiceManagement" - "SignpostMetrics" - "SkyLight" - "Social" - "SoundAnalysis" - "Speech" - "SpriteKit" - "StoreKit" - "SwiftUI" - "SyncServices" - "System" - "SystemConfiguration" - "SystemExtensions" - "TWAIN" - "Tcl" - "Tk" - "UIFoundation" - "URLFormatting" - "USBDriverKit" - "UniformTypeIdentifiers" - "UserNotifications" - "UserNotificationsUI" - "VideoDecodeAcceleration" - "VideoSubscriberAccount" - "VideoToolbox" - "Virtualization" - "Vision" - "WebKit" - "WidgetKit" - "iTunesLibrary" - "vmnet" - ] mkStub; - - libs = lib.genAttrs [ - "Xplugin" - "utmp" - "libDER" - "xpc" - "sandbox" - "simd" - ] mkStub; - - version = "11.0"; -} -// - lib.genAttrs - [ - "callPackage" - "stdenv" - "llvmPackages_12" - "llvmPackages_13" - "llvmPackages_14" - "llvmPackages_15" - "llvmPackages_16" - "rustPlatform" - "xcodebuild" - ] - ( - name: - lib.warn - "darwin.apple_sdk_11_0.${name}: deprecated and will be removed in Nixpkgs 25.11; see for documentation and migration instructions" - pkgs.${name} - ) diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/default.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/default.nix deleted file mode 100644 index 245cb2b64740..000000000000 --- a/pkgs/os-specific/darwin/apple-sdk-12.3/default.nix +++ /dev/null @@ -1,261 +0,0 @@ -# Compatibility stubs for packages that used the old SDK frameworks. -{ - lib, - callPackage, - pkgs, -}: - -let - mkStub = callPackage ../apple-sdk/mk-stub.nix { } "darwin.apple_sdk_12_3" "12.3"; -in -lib.genAttrs [ - "CLTools_Executables" - "Libsystem" - "LibsystemCross" - "darwin-stubs" - "libnetwork" - "libpm" - "libunwind" - "objc4" - "sdkRoot" -] mkStub -// { - frameworks = lib.genAttrs [ - "AGL" - "AVFAudio" - "AVFCapture" - "AVFCore" - "AVFoundation" - "AVKit" - "Accelerate" - "Accessibility" - "Accounts" - "AdServices" - "AdSupport" - "AddressBook" - "AddressBookCore" - "AppKit" - "AppTrackingTransparency" - "AppleScriptKit" - "AppleScriptObjC" - "ApplicationServices" - "AudioToolbox" - "AudioToolboxCore" - "AudioUnit" - "AudioVideoBridging" - "AuthenticationServices" - "AutomaticAssessmentConfiguration" - "Automator" - "BackgroundTasks" - "BusinessChat" - "CFNetwork" - "CHIP" - "CalendarStore" - "CallKit" - "Carbon" - "ClassKit" - "CloudKit" - "Cocoa" - "Collaboration" - "ColorSync" - "Combine" - "Contacts" - "ContactsPersistence" - "ContactsUI" - "CoreAudio" - "CoreAudioKit" - "CoreAudioTypes" - "CoreBluetooth" - "CoreData" - "CoreDisplay" - "CoreFoundation" - "CoreGraphics" - "CoreHaptics" - "CoreImage" - "CoreLocation" - "CoreMIDI" - "CoreMIDIServer" - "CoreML" - "CoreMedia" - "CoreMediaIO" - "CoreMotion" - "CoreServices" - "CoreSpotlight" - "CoreSymbolication" - "CoreTelephony" - "CoreText" - "CoreVideo" - "CoreWLAN" - "CreateML" - "CryptoKit" - "CryptoTokenKit" - "DVDPlayback" - "DataDetection" - "DebugSymbols" - "DeveloperToolsSupport" - "DeviceActivity" - "DeviceCheck" - "DirectoryService" - "DiscRecording" - "DiscRecordingUI" - "DiskArbitration" - "DisplayServices" - "DriverKit" - "EventKit" - "ExceptionHandling" - "ExecutionPolicy" - "ExposureNotification" - "ExternalAccessory" - "FWAUserLib" - "FileProvider" - "FileProviderUI" - "FinderSync" - "ForceFeedback" - "Foundation" - "GLKit" - "GLUT" - "GSS" - "GameCenterFoundation" - "GameCenterUI" - "GameCenterUICore" - "GameController" - "GameKit" - "GameplayKit" - "GroupActivities" - "Hypervisor" - "ICADevices" - "IMServicePlugIn" - "IOBluetooth" - "IOBluetoothUI" - "IOKit" - "IOSurface" - "IOUSBHost" - "IdentityLookup" - "ImageCaptureCore" - "ImageIO" - "InputMethodKit" - "InstallerPlugins" - "InstantMessage" - "Intents" - "IntentsUI" - "JavaNativeFoundation" - "JavaRuntimeSupport" - "JavaScriptCore" - "JavaVM" - "Kerberos" - "Kernel" - "KernelManagement" - "LDAP" - "LatentSemanticMapping" - "LinkPresentation" - "LocalAuthentication" - "LocalAuthenticationEmbeddedUI" - "MLCompute" - "MailKit" - "ManagedSettings" - "MapKit" - "MediaAccessibility" - "MediaLibrary" - "MediaPlayer" - "MediaToolbox" - "Message" - "Metal" - "MetalKit" - "MetalPerformanceShaders" - "MetalPerformanceShadersGraph" - "MetricKit" - "ModelIO" - "MultipeerConnectivity" - "MultitouchSupport" - "MusicKit" - "NaturalLanguage" - "NearbyInteraction" - "NetFS" - "Network" - "NetworkExtension" - "NotificationCenter" - "OSAKit" - "OSLog" - "OpenAL" - "OpenCL" - "OpenDirectory" - "OpenGL" - "PCSC" - "PDFKit" - "PHASE" - "ParavirtualizedGraphics" - "PassKit" - "PassKitCore" - "PencilKit" - "Photos" - "PhotosUI" - "PreferencePanes" - "PushKit" - "QTKit" - "Quartz" - "QuartzCore" - "QuickLook" - "QuickLookThumbnailing" - "QuickLookUI" - "QuickTime" - "RealityFoundation" - "RealityKit" - "ReplayKit" - "Ruby" - "SafariServices" - "SceneKit" - "ScreenCaptureKit" - "ScreenSaver" - "ScreenTime" - "ScriptingBridge" - "Security" - "SecurityFoundation" - "SecurityInterface" - "SensorKit" - "ServiceManagement" - "ShazamKit" - "SignpostMetrics" - "SkyLight" - "Social" - "SoundAnalysis" - "Speech" - "SpriteKit" - "StoreKit" - "SwiftUI" - "SyncServices" - "System" - "SystemConfiguration" - "SystemExtensions" - "TWAIN" - "TabularData" - "Tcl" - "Tk" - "UIFoundation" - "URLFormatting" - "UniformTypeIdentifiers" - "UserNotifications" - "UserNotificationsUI" - "VideoDecodeAcceleration" - "VideoSubscriberAccount" - "VideoToolbox" - "Virtualization" - "Vision" - "WebKit" - "WidgetKit" - "iTunesLibrary" - "vmnet" - ] mkStub; - - libs = lib.genAttrs [ - "Xplugin" - "utmp" - "libDER" - "xpc" - "sandbox" - "simd" - "utmp" - "xpc" - ] mkStub; - - version = "12.3"; -} diff --git a/pkgs/os-specific/darwin/apple-sdk/mk-stub.nix b/pkgs/os-specific/darwin/apple-sdk/mk-stub.nix deleted file mode 100644 index f2eed9965cf0..000000000000 --- a/pkgs/os-specific/darwin/apple-sdk/mk-stub.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, stdenvNoCC }: - -prefix: version: pname: -lib.warnOnInstantiate - "${prefix}.${pname}: these stubs do nothing and will be removed in Nixpkgs 25.11; see for documentation and migration instructions." - ( - stdenvNoCC.mkDerivation { - inherit pname version; - - buildCommand = '' - mkdir -p "$out" - echo "Individual frameworks have been deprecated. See the stdenv documentation for how to use `apple-sdk`" \ - > "$out/README" - ''; - - passthru.isDarwinCompatStub = true; - } - ) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index b6ff72f0c884..af2a114015a0 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -178,9 +178,12 @@ lib.makeOverridable ( outputs = [ "out" "dev" + "modules" ]; }) // { + __structuredAttrs = true; + passthru = rec { inherit version @@ -306,17 +309,17 @@ lib.makeOverridable ( # reads the existing .config file and prompts the user for options in # the current kernel source that are not found in the file. - make $makeFlags "''${makeFlagsArray[@]}" oldconfig + make "''${makeFlags[@]}" oldconfig runHook postConfigure - make $makeFlags "''${makeFlagsArray[@]}" prepare + make "''${makeFlags[@]}" prepare actualModDirVersion="$(cat $buildRoot/include/config/kernel.release)" if [ "$actualModDirVersion" != "${modDirVersion}" ]; then echo "Error: modDirVersion ${modDirVersion} specified in the Nix expression is wrong, it should be: $actualModDirVersion" exit 1 fi - buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=$(date -u -d @$SOURCE_DATE_EPOCH)") + buildFlags+=("KBUILD_BUILD_TIMESTAMP=$(date -u -d @$SOURCE_DATE_EPOCH)") cd $buildRoot ''; @@ -334,12 +337,12 @@ lib.makeOverridable ( ++ extraMakeFlags; installFlags = [ - "INSTALL_PATH=$(out)" + "INSTALL_PATH=${placeholder "out"}" ] - ++ (optional isModular "INSTALL_MOD_PATH=$(out)") + ++ (optional isModular "INSTALL_MOD_PATH=${placeholder "modules"}") ++ optionals buildDTBs [ "dtbs_install" - "INSTALL_DTBS_PATH=$(out)/dtbs" + "INSTALL_DTBS_PATH=${placeholder "out"}/dtbs" ]; preInstall = @@ -396,7 +399,7 @@ lib.makeOverridable ( ''; in '' - installFlagsArray+=("-j$NIX_BUILD_CORES") + installFlags+=("-j$NIX_BUILD_CORES") export HOME=${installkernel} ''; @@ -433,12 +436,10 @@ lib.makeOverridable ( mkdir -p $dev cp vmlinux $dev/ if [ -z "''${dontStrip-}" ]; then - installFlagsArray+=("INSTALL_MOD_STRIP=1") + installFlags+=("INSTALL_MOD_STRIP=1") fi - make modules_install $makeFlags "''${makeFlagsArray[@]}" \ - $installFlags "''${installFlagsArray[@]}" - unlink $out/lib/modules/${modDirVersion}/build - rm -f $out/lib/modules/${modDirVersion}/source + make modules_install "''${makeFlags[@]}" "''${installFlags[@]}" + unlink $modules/lib/modules/${modDirVersion}/build mkdir -p $dev/lib/modules/${modDirVersion}/{build,source} @@ -450,7 +451,7 @@ lib.makeOverridable ( cd $dev/lib/modules/${modDirVersion}/source cp $buildRoot/{.config,Module.symvers} $dev/lib/modules/${modDirVersion}/build - make modules_prepare $makeFlags "''${makeFlagsArray[@]}" O=$dev/lib/modules/${modDirVersion}/build + make modules_prepare "''${makeFlags[@]}" O=$dev/lib/modules/${modDirVersion}/build # For reproducibility, removes accidental leftovers from a `cc1` call # from a `try-run` call from the Makefile @@ -560,6 +561,20 @@ lib.makeOverridable ( makeFlags = [ "O=$(buildRoot)" + + # We have a `modules` variable in the environment for our + # split output, but the kernel Makefiles also define their + # own `modules` variable. Their definition wins, but Make + # remembers that the variable was originally from the + # environment and exports it to all the build recipes. This + # breaks the build with an “Argument list too long” error due + # to passing the huge list of every module object file in the + # environment of every process invoked by every build recipe. + # + # We use `--eval` here to undefine the inherited environment + # variable before any Makefiles are read, ensuring that the + # kernel’s definition creates a new, unexported variable. + "--eval=undefine modules" ] ++ commonMakeFlags; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix index fbe5635f1b17..0212f5621b17 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix @@ -6,18 +6,18 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.6.5"; + version = "4.6.8"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-ciIWo2m4Cvktzqz6fPLdvBEfGoxH98L/AtzWsrIJmgg="; + hash = "sha256-UvvEfjj6mDXMBSCxpIexJyXed32hfUieDy2lc2O8cI4="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-NHt0CB8DCcMMaNvH4eERcSxMar2Uhc3BoUqy1KnqYqQ="; + npmDepsHash = "sha256-oqG38l56S49Lecz+LqbyYnqkJRlijkRUPfqgmUcSslk="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/klipper/klipper-flash.nix b/pkgs/servers/klipper/klipper-flash.nix index 95f8a261ebcd..78ba90218953 100644 --- a/pkgs/servers/klipper/klipper-flash.nix +++ b/pkgs/servers/klipper/klipper-flash.nix @@ -38,7 +38,7 @@ writeShellApplication { if matchBoard != null && matchPlatform != null then '' pushd ${klipper-firmware} - ${klipper}/lib/scripts/flash_usb.py -t ${matchBoard} -d ${flashDevice} ${klipper-firmware}/klipper.bin $@ + ${klipper}/lib/scripts/flash_usb.py -t ${matchBoard} -d ${flashDevice} ${klipper-firmware}/klipper.bin "$@" popd '' else diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 84369a269331..fcfc01d7f890 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -424,9 +424,6 @@ rec { }); }); - # `overrideSDK` is deprecated. Add the versioned variants of `apple-sdk` to `buildInputs` change the SDK. - overrideSDK = pkgs.callPackage ./darwin/override-sdk.nix { inherit lib extendMkDerivationArgs; }; - withDefaultHardeningFlags = defaultHardeningFlags: stdenv: let diff --git a/pkgs/stdenv/darwin/override-sdk.nix b/pkgs/stdenv/darwin/override-sdk.nix deleted file mode 100644 index ce4d48874b0c..000000000000 --- a/pkgs/stdenv/darwin/override-sdk.nix +++ /dev/null @@ -1,34 +0,0 @@ -# This is a compatibility shim with `overrideSDK`. -# Note: `overrideSDK` is deprecated. It will be removed in 25.11. -{ - lib, - stdenvNoCC, - extendMkDerivationArgs, - pkgsHostTarget, -}: - -stdenv: sdkVersion: -let - darwinSdkVersion = - if lib.isAttrs sdkVersion then sdkVersion.darwinSdkVersion or "11.0" else sdkVersion; -in -assert lib.assertMsg (darwinSdkVersion == "11.0" || darwinSdkVersion == "12.3") '' - `overrideSDK` and `darwin.apple_sdk_11_0.callPackage` are deprecated. - Only the 11.0 and 12.3 SDKs are supported using them. Please use - the versioned `apple-sdk` variants to use other SDK versions. - - See the stdenv documentation for how to use `apple-sdk`. -''; -assert lib.warn - "overrideSDK: this mechanism is deprecated and will be removed in 25.11, use `apple-sdk_*` or `darwinMinVersionHook` in build inputs instead; see for documentation" - true; -stdenv.override (old: { - mkDerivationFromStdenv = extendMkDerivationArgs old (args: { - buildInputs = - args.buildInputs or [ ] - ++ lib.optional (darwinSdkVersion == "12.3") pkgsHostTarget.apple-sdk_12 - ++ lib.optional (sdkVersion ? darwinMinVersion) ( - pkgsHostTarget.darwinMinVersionHook sdkVersion.darwinMinVersion - ); - }); -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6c16ca998d68..9862a261a497 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1543,6 +1543,7 @@ mapAliases { oraclejdk11 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 OSCAR = oscar; # Added 2024-06-12 osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2024-10-17 + overrideSDK = "overrideSDK has been removed as it was a legacy compatibility stub; see for migration instructions"; # Added 2025-08-04 ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24 oxygen-icons5 = throw '' The top-level oxygen-icons5 alias has been removed. diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix index d2cc6f94a960..690f9ca159fc 100644 --- a/pkgs/top-level/darwin-aliases.nix +++ b/pkgs/top-level/darwin-aliases.nix @@ -45,13 +45,15 @@ let n: alias: removeDistribute (removeRecurseForDerivations (checkInPkgs n alias)) ); - # Old Darwin pattern stubs; remove these by 25.11. + # Old Darwin pattern stubs; converted to throws in 25.11. - mkStub = pkgs.callPackage ../os-specific/darwin/apple-sdk/mk-stub.nix { }; + mkThrow = + name: + throw "darwin.${name} has been removed as it was a legacy compatibility stub; see for migration instructions"; - apple_sdk_11_0 = pkgs.callPackage ../os-specific/darwin/apple-sdk-11.0 { }; + apple_sdk_11_0 = mkThrow "apple_sdk_11_0"; - apple_sdk_12_3 = pkgs.callPackage ../os-specific/darwin/apple-sdk-12.3 { }; + apple_sdk_12_3 = mkThrow "apple_sdk_12_3"; apple_sdk = apple_sdk_11_0; @@ -92,7 +94,7 @@ let "objc4" "ppp" "xnu" - ] (mkStub "darwin" "11.0"); + ] mkThrow; in stubs @@ -126,13 +128,9 @@ stubs ### L ### libauto = throw "'darwin.libauto' has been removed, as it was broken and unmaintained"; # added 2024-05-10 - libresolvHeaders = lib.warnOnInstantiate "darwin.libresolvHeaders: use `lib.getInclude darwin.libresolv`; this will be removed in 25.11" ( - lib.getDev self.libresolv - ); # added 2025-04-20 + libresolvHeaders = throw "darwin.libresolvHeaders has been removed; use `lib.getInclude darwin.libresolv`"; # converted to throw 2025-07-29 libtapi = pkgs.libtapi; # 2024-08-16 - libutilHeaders = lib.warnOnInstantiate "darwin.libutilHeaders: use `lib.getInclude darwin.libutil`; this will be removed in 25.11" ( - lib.getDev self.libutil - ); # added 2025-04-20 + libutilHeaders = throw "darwin.libutilHeaders has been removed; use `lib.getInclude darwin.libutil`"; # converted to throw 2025-07-29 ### M ### @@ -152,14 +150,7 @@ stubs ### S ### - stdenvNoCF = - lib.warnOnInstantiate - "darwin.stdenvNoCF: use `stdenv` or `stdenvNoCC`; this will be removed in 25.11" - ( - pkgs.stdenv.override { - extraBuildInputs = [ ]; - } - ); # added 2025-04-20 + stdenvNoCF = throw "darwin.stdenvNoCF has been removed; use `stdenv` or `stdenvNoCC`"; # converted to throw 2025-07-29 stubs = throw "'darwin.stubs.*' have been removed as they were unused"; # added 2025-04-20 swift-corelibs-foundation = throw "'darwin.swift-corelibs-foundation' has been removed, as it was broken and is no longer used"; # added 2025-04-20 })