diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index d9e27a469008..27bff446bb6e 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -10,7 +10,6 @@ -- Paths under `/etc/xdg/` from packages in `environment.systemPackages` are no longer linked into the global `/etc/` by default. Modules depending on such directories must declare them explicitly using `environment.pathsToLink`. - `databricks-cli` has been updated from `0.290.2` to `1.x.x`, the first major release. OAuth tokens for interactive logins (`auth_type = databricks-cli`) are now stored in the OS-native secure store by default (Secret Service on Linux) instead of `~/.databricks/token-cache.json`; cached tokens from older versions are not migrated, so run `databricks auth login` once per profile after upgrading. To keep the previous file-backed storage, set `DATABRICKS_AUTH_STORAGE=plaintext` or add `auth_storage = plaintext` under `[__settings__]` in `~/.databrickscfg`. Additionally, the `vector_search_endpoints` DABs resource renamed `min_qps` to `target_qps` (and the `vector-search-endpoints` command renamed `--min-qps` to `--target-qps`). See the [upstream changelog](https://github.com/databricks/cli/blob/main/CHANGELOG.md) for details. - `hurl` has been updated to `8.x.x` which has some breaking changes. See [upstream changelog](https://github.com/Orange-OpenSource/hurl/releases/tag/8.0.0) for details. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 26d7e7fa77b5..560c62c03184 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4203,6 +4203,13 @@ githubId = 18356186; name = "Gabriela Moreira"; }; + buggymcbugfix = { + email = "nix@vilem.net"; + github = "buggymcbugfix"; + matrix = "@buggymcbugfix:matrix.org"; + githubId = 17603372; + name = "Vilem Liepelt"; + }; bugworm = { email = "bugworm@zoho.com"; github = "bugworm"; diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 5776c8ede413..c014f00da605 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -187,6 +187,7 @@ in environment.pathsToLink = [ "/bin" + "/etc/xdg" "/etc/gtk-2.0" "/etc/gtk-3.0" "/lib" # FIXME: remove and update debug-info.nix diff --git a/nixos/modules/config/xdg/autostart.nix b/nixos/modules/config/xdg/autostart.nix index a266b046de1a..46c90ae1793a 100644 --- a/nixos/modules/config/xdg/autostart.nix +++ b/nixos/modules/config/xdg/autostart.nix @@ -22,6 +22,8 @@ }; config = { + # FIXME this does not actually work because "/etc/xdg" is linked + # unconditionally in `nixos/modules/config/system-path.nix` environment.pathsToLink = lib.mkIf config.xdg.autostart.install [ "/etc/xdg/autostart" ]; diff --git a/nixos/modules/services/desktop-managers/cosmic.nix b/nixos/modules/services/desktop-managers/cosmic.nix index 3d367f01defe..14fdda18c235 100644 --- a/nixos/modules/services/desktop-managers/cosmic.nix +++ b/nixos/modules/services/desktop-managers/cosmic.nix @@ -124,16 +124,7 @@ in }; }; - systemd = { - packages = [ pkgs.cosmic-session ]; - user.targets = { - # TODO: remove when upstream has XDG autostart support - cosmic-session = { - wants = [ "xdg-desktop-autostart.target" ]; - before = [ "xdg-desktop-autostart.target" ]; - }; - }; - }; + systemd.packages = [ pkgs.cosmic-session ]; fonts.packages = with pkgs; [ fira diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 311bf9cc9aa1..6a52b920c2e2 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -774,7 +774,6 @@ in ]; }; serviceConfig.Type = "oneshot"; - serviceConfig.EnvironmentFile = "-/etc/switch-root.conf"; description = "NixOS Activation"; script = # bash @@ -782,14 +781,6 @@ in set -uo pipefail export PATH="/bin:${cfg.package.util-linux}/bin" - # A non-NixOS closure (e.g. init=/bin/sh) has no prepare-root; - # initrd-find-nixos-closure records this as a non-empty NEW_INIT. - # Skip activation and let initrd-switch-root hand over to it directly. - if [ -n "''${NEW_INIT:-}" ]; then - echo "$NEW_INIT is not a NixOS system - not activating" - exit 0 - fi - closure="$(realpath /nixos-closure)" # Initialize the system diff --git a/nixos/modules/system/etc/etc-activation.nix b/nixos/modules/system/etc/etc-activation.nix index 31842fc9c0c6..b00c25e37802 100644 --- a/nixos/modules/system/etc/etc-activation.nix +++ b/nixos/modules/system/etc/etc-activation.nix @@ -71,10 +71,6 @@ RequiresMountsFor = [ "/sysroot/nix/store" ]; - # find-etc only creates this symlink for a NixOS init. For a - # non-NixOS init= (e.g. init=/bin/sh) it is absent, so skip the - # mount instead of failing the whole initrd. - ConditionPathExists = "/etc-metadata-image"; }; requires = [ config.boot.initrd.systemd.services.initrd-find-etc.name @@ -127,8 +123,6 @@ "/run/nixos-etc-metadata" ]; DefaultDependencies = false; - # Skip for a non-NixOS init=, see the metadata mount above. - ConditionPathExists = "/etc-basedir"; }; } ]; @@ -146,8 +140,6 @@ # before the overlay is mounted. "/run/nixos-etc-metadata" ]; - # Skip for a non-NixOS init=, see the metadata mount above. - ConditionPathExists = "/etc-metadata-image"; }; serviceConfig = { Type = "oneshot"; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d8971bd745e3..1c760d0648f0 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1645,7 +1645,6 @@ in "i686-linux" ] ./initrd-network-openvpn { systemdStage1 = true; }; systemd-initrd-networkd-ssh = runTest ./systemd-initrd-networkd-ssh.nix; - systemd-initrd-non-nixos = runTest ./systemd-initrd-non-nixos.nix; systemd-initrd-shutdown = runTest { imports = [ ./systemd-shutdown.nix ]; _module.args.systemdStage1 = true; diff --git a/nixos/tests/systemd-initrd-non-nixos.nix b/nixos/tests/systemd-initrd-non-nixos.nix deleted file mode 100644 index 0f564af6504a..000000000000 --- a/nixos/tests/systemd-initrd-non-nixos.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib, pkgs, ... }: -let - marker = "REACHED NON-NIXOS INIT AS PID 1"; - - # A non-NixOS init (no prepare-root). We use a store path, not literal - # /bin/sh: a fresh disk has no /bin/sh yet (it is created by the activation a - # non-NixOS init skips), while the store is always mounted; init=/bin/sh works - # the same on a real system. Writes a marker, then stays alive so PID 1 lives. - nonNixosInit = pkgs.writeShellScriptBin "non-nixos" '' - echo "${marker}" > /dev/console - exec ${pkgs.coreutils}/bin/sleep infinity - ''; - - common = { - boot.initrd.systemd.enable = true; - - virtualisation = { - # tmpfs root, like real non-NixOS closure init= microvm consumers. - diskImage = null; - - graphics = false; - }; - - # Speed up wait_for_console. - boot.consoleLogLevel = lib.mkForce 3; - boot.initrd.systemd.managerEnvironment.SYSTEMD_LOG_LEVEL = "warning"; - - # switch-root needs an os-release on the target root. A real system has one - # on disk; our fresh tmpfs does not, so create it. - boot.initrd.systemd.tmpfiles.settings."10-os-release"."/sysroot/etc/os-release".f = { - mode = "0644"; - argument = "ID=test-non-nixos"; - }; - }; -in -{ - name = "systemd-initrd-non-nixos"; - - nodes = { - bashActivation = common; - - nixosInit = { - imports = [ common ]; - system.nixos-init.enable = true; - system.etc.overlay.enable = true; - services.userborn.enable = true; - }; - }; - - testScript = '' - import os - - # The last init= on the cmdline wins; QEMU_KERNEL_PARAMS is appended after - # the default one, so this boots our non-NixOS init. - os.environ["QEMU_KERNEL_PARAMS"] = "init=${lib.getExe nonNixosInit}" - - start_all() - - # If a code path does not skip the non-NixOS init, switch-root is blocked and - # the machine drops to emergency mode: the marker never appears and the wait - # times out. - with subtest("bash initrd-nixos-activation skips a non-NixOS init"): - bashActivation.wait_for_console_text("${marker}", timeout=300) - - with subtest("nixos-init switches to a non-NixOS init directly"): - nixosInit.wait_for_console_text("${marker}", timeout=300) - ''; -} 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 01037d6d0d17..794db4af5815 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-TEEv8R6VXuOhcX2OgTKY7A8L2akisJLsx6I6bUdV3a0="; + hash = "sha256-/ns84fHAyTY7sSvhUNzq1XQYq2Xy303zs2BxJY8DBVA="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-wis4QqTuCiRAVpoGp+Ds83lWPsNUUPmXbZcYiWuY2zg="; + hash = "sha256-U69X5lpeJaeNVL4WWzCUpI6IfbKSJXGpl30AYnx1fBQ="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-2njmUMYxFAaKzCdwM//S5D0fqVZhIKG0JzbT1ye4Sr4="; + hash = "sha256-DHE09NtGNOjB0HdBqTKRtDsZXpxb651kiVGhRwO1tBU="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-+cJhcXufpiNrpdL+HH3mW+rrzb7Si/4LGvoce1o0c/w="; + hash = "sha256-5YIZVBMsoF0bWP27sVEVHAaAiqvmoSUgdbc8wsqUCLA="; }; }; in { name = "claude-code"; publisher = "anthropic"; - version = "2.1.186"; + version = "2.1.187"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/by-name/al/alsa-ucm-conf-asahi/package.nix b/pkgs/by-name/al/alsa-ucm-conf-asahi/package.nix index ba4df31df4ea..f52781a1dbe2 100644 --- a/pkgs/by-name/al/alsa-ucm-conf-asahi/package.nix +++ b/pkgs/by-name/al/alsa-ucm-conf-asahi/package.nix @@ -9,13 +9,13 @@ let alsa-ucm-conf-asahi = stdenvNoCC.mkDerivation (finalAttrs: { pname = "alsa-ucm-conf-asahi"; - version = "8"; + version = "9"; src = fetchFromGitHub { owner = "AsahiLinux"; repo = "alsa-ucm-conf-asahi"; tag = "v${finalAttrs.version}"; - hash = "sha256-FPrAzscc1ICSCQSqULaGLqG4UCq8GZU9XLV7TUSBBRM="; + hash = "sha256-F+NiEP4EKLUVV2oHSVY+fkXlzXcLyywNOolUy9DO8sI="; }; installPhase = '' diff --git a/pkgs/by-name/ap/apm-cli/package.nix b/pkgs/by-name/ap/apm-cli/package.nix index d04b256b65e9..4730ddb4720a 100644 --- a/pkgs/by-name/ap/apm-cli/package.nix +++ b/pkgs/by-name/ap/apm-cli/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "apm-cli"; - version = "0.18.0"; + version = "0.21.0"; pyproject = true; __structuredAttrs = true; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "microsoft"; repo = "apm"; tag = "v${finalAttrs.version}"; - hash = "sha256-mHu5r08y3OUTJjnl5Xvb23yhoJu9DupoZhkhL74K6UE="; + hash = "sha256-Wotyqsg/1nbjttMk+4wpGK76+kaL7j6oMH61NwsTuNc="; }; postPatch = '' diff --git a/pkgs/by-name/as/asahi-audio/package.nix b/pkgs/by-name/as/asahi-audio/package.nix index edfe3364b1ba..c256a4221570 100644 --- a/pkgs/by-name/as/asahi-audio/package.nix +++ b/pkgs/by-name/as/asahi-audio/package.nix @@ -9,13 +9,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "asahi-audio"; - version = "3.4"; + version = "4.0"; src = fetchFromGitHub { owner = "AsahiLinux"; repo = "asahi-audio"; tag = "v${finalAttrs.version}"; - hash = "sha256-7AuPkR/M1a4zB9+dJuOuv9uTp+kIqPlxVOXipsyGGz8="; + hash = "sha256-Tp+yL7SbzowYcCrfI7UU+5GeIJtyBMuE7KhcYmA1+hw="; }; makeFlags = [ diff --git a/pkgs/by-name/bl/blackfire/package.nix b/pkgs/by-name/bl/blackfire/package.nix index 0652939fdc29..0205b58df2db 100644 --- a/pkgs/by-name/bl/blackfire/package.nix +++ b/pkgs/by-name/bl/blackfire/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2026.6.0"; + version = "2026.6.1"; src = passthru.sources.${stdenv.hostPlatform.system} @@ -60,23 +60,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - hash = "sha256-JPhh7LNiLZXLN5iycNobZ/uJQjOhKqqYSw9P78+/BKk="; + hash = "sha256-doeqXoS0B7AyzyhkLB9wUC6iuD0c2KIhAIEPeYaDC5E="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - hash = "sha256-uoqUDJ/bexqaRlf5Y692OGm91W1ErlS8Q8/l9MlsHwU="; + hash = "sha256-bQWhiSw9/gGyGoLEyz6BHaRPNLxuqouiobBMfB5ytYk="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - hash = "sha256-kL9s17Bnt8UYj3IiX2b7e3OWSsRLq5TSzdK6OdByD40="; + hash = "sha256-B+rhmnM2sVICVLDcYq2OEp402Wz6kywCRqeS95Vdzlw="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - hash = "sha256-p9D87uaDVu25SG4cclmzaq9oKaFDlIy8/XLx3rHuIQ4="; + hash = "sha256-Ofs9raAtx/duS8dXWfvjKGzhJr3j9+gkH8lP/VLfnkE="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - hash = "sha256-ppCSvk259NNlujl9olyRlmwRdNbLu/uRs+gq71S79B8="; + hash = "sha256-+rMiD/vFFIA8dR3quUnpr8uDNTdvnXyYjT8brgiOxBI="; }; }; diff --git a/pkgs/by-name/bl/bluesky-pds/package.nix b/pkgs/by-name/bl/bluesky-pds/package.nix index 3c990477451a..3b8b4081ba7d 100644 --- a/pkgs/by-name/bl/bluesky-pds/package.nix +++ b/pkgs/by-name/bl/bluesky-pds/package.nix @@ -27,13 +27,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "pds"; - version = "0.4.5001"; + version = "0.4.5006"; src = fetchFromGitHub { owner = "bluesky-social"; repo = "pds"; tag = "v${finalAttrs.version}"; - hash = "sha256-j7XNZYZHHj5HdtEuTAhNU9TD7S7eMILMflZJn0nDVaY="; + hash = "sha256-Jb2qAB6P5KlRu4L99fcK/v0/Fspr8IFaFXuYg+PBxhM="; }; sourceRoot = "${finalAttrs.src.name}/service"; @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { ; inherit pnpm; fetcherVersion = 4; - hash = "sha256-3/gjhQIMxI/mwqmKV1wZ6oMiCGHutXuDY2CFSN3QnE4="; + hash = "sha256-YfwoUkTJJ2qANqwtSWKDGfFmahAtIDNyYFwCUE72oB0="; }; buildPhase = '' diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json index a9a23a745d73..d92c820fce8a 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.186", - "commit": "6a56aff51d9e9faf62f26f2748501c2e32eec5e8", - "buildDate": "2026-06-22T16:51:01Z", + "version": "2.1.187", + "commit": "6a53320fad5541a68d79e4b6c53677df77b98e33", + "buildDate": "2026-06-23T17:07:42Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "463a79cc34a9787cff1b3361b4ec9e2dff928c18b077f41f0bb412e4cda78637", - "size": 216811232 + "checksum": "a59a16ba4922adab7a145728f215d042184d349f5f7e72cddb7fc114250a4ce3", + "size": 215994048 }, "darwin-x64": { "binary": "claude", - "checksum": "9e17e23d451cbbc64cf4b9536c1d25efd86808512617c855091fa608f77c9899", - "size": 224349952 + "checksum": "7f57b6935b4246d03cb7acee90dc22153083483a267da589c5c920dd04744c36", + "size": 224795776 }, "linux-arm64": { "binary": "claude", - "checksum": "817e5ff483568b78c49171be317b9b9190cade77248a5776e912789312961cb6", - "size": 231782112 + "checksum": "b49be8a5e565bf2d45b50d2de62017b25462131acc9425d2fdb98b8f29c9dce2", + "size": 232240864 }, "linux-x64": { "binary": "claude", - "checksum": "6a6d5d23486597c93138941c9b68caa0fbcd2dcedbf49e29a9c8d83e3a1cb329", - "size": 234436392 + "checksum": "bb02fcb33626f8c599d10d8bee38585d4cf8d4225c3b497869dee7454e7bf361", + "size": 234874664 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "24906d06ab4cf312eb30a8d656a8d8c7fb22099ea8eb974e38ecfbc25d6631aa", - "size": 225161416 + "checksum": "972fc2e0bc8104edb593ce7723d4414c0ed8e4df6d90ad26ae48097b1d910478", + "size": 225620168 }, "linux-x64-musl": { "binary": "claude", - "checksum": "d0cb255cfb03513f6099af40f045b5852a1d8a1b59d0f405d84d2a01da6c9598", - "size": 229420432 + "checksum": "c5a783d13aac71d42324f2e9dcd395c266bd5774951faf0d94855c737024bee3", + "size": 229858704 }, "win32-x64": { "binary": "claude.exe", - "checksum": "6a286f0795d6dd46187b86e9124f819af35319169901cd883b80a75c47469516", - "size": 225908896 + "checksum": "24964d08c5100bac6071352e5837101b333de1c1afefd2b8b0e7a60db6c0ef5c", + "size": 226329760 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "245869d5e5242aabfde49b091628aa4b3e7546f2cac52e1d6feb221a820910bc", - "size": 220571808 + "checksum": "04124c0ba09ece85a856de652e84386094c372f002ff767a94d4a43ecf776f96", + "size": 220992160 } } } diff --git a/pkgs/by-name/cs/csharpier/package.nix b/pkgs/by-name/cs/csharpier/package.nix index 23a75a8bc7a7..6731cf7c7c12 100644 --- a/pkgs/by-name/cs/csharpier/package.nix +++ b/pkgs/by-name/cs/csharpier/package.nix @@ -2,10 +2,10 @@ buildDotnetGlobalTool { pname = "csharpier"; - version = "1.2.6"; + version = "1.3.0"; executables = "csharpier"; - nugetHash = "sha256-SaBHGaaeg/1c4okHN1Pn8caGZgfLJ/KsGRqgUiAqKlQ="; + nugetHash = "sha256-hwieEoQTcATyKZIZ7CQSWANPBv+pEShg6cDXU5EIexU="; meta = { description = "Opinionated code formatter for C#"; diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index dbcc517399ae..bd2dc45d2ed6 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -22,38 +22,38 @@ let deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec { - version = "2.52.0"; + version = "2.53.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-AQo27qnHPCK6q/3+Umk6ueqkOIVBA8n4q9S5iEZ7TkM="; + hash = "sha256-W2Yh5+6MaJ47GqJioGKge2J3RetGGTcl+0YxPPlSdDo="; }; cargoDeps = rustPlatform.fetchCargoVendor { pname = "chatmail-core"; inherit version src; - hash = "sha256-ni8iaVPHXWhxfiBvtVzGRyPcxkbV0HiqcQCHGmAqk7s="; + hash = "sha256-aoPc5XvjwwuA9aOTvIOpTm15wozC9glJGqn3vPqsJF4="; }; }; electron = electron_41; in stdenv.mkDerivation (finalAttrs: { pname = "deltachat-desktop"; - version = "2.52.0"; + version = "2.53.1"; __structuredAttrs = true; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-/FdGI6Dr9lz0+g/xSzHXbMdqWHf4TliHDXXiAQKKkOs="; + hash = "sha256-UJ6005PeQBiL9Inj/VRZjgxZtR278Ky2RcD5MywcGD8="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 4; - hash = "sha256-0VvyZzWAdVGsuYb8CI36KqkqvjgRsTLJov1L44MxUHQ="; + hash = "sha256-t5OHx1GCaTIgGo9193Z3Kkl+jHCBIgtRypcUaO6By3I="; }; strictDeps = true; diff --git a/pkgs/by-name/de/deltachat-tauri/package.nix b/pkgs/by-name/de/deltachat-tauri/package.nix index f812683ceae5..26cb46756bca 100644 --- a/pkgs/by-name/de/deltachat-tauri/package.nix +++ b/pkgs/by-name/de/deltachat-tauri/package.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ; __structuredAttrs = true; - cargoHash = "sha256-euRUA4LTmAdb9466DAMqKgAPX3N4KNXCh1ED9cL42lA="; + cargoHash = "sha256-iGgsG5V0cFzoudVASGqLakpuy2h4oD979LHuBclj+3o="; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs \ diff --git a/pkgs/by-name/gi/git-pages-cli/package.nix b/pkgs/by-name/gi/git-pages-cli/package.nix index a4fb358e4ea8..98760b019b25 100644 --- a/pkgs/by-name/gi/git-pages-cli/package.nix +++ b/pkgs/by-name/gi/git-pages-cli/package.nix @@ -8,7 +8,7 @@ buildGoModule (finalAttrs: { pname = "git-pages-cli"; - version = "1.9.0"; + version = "1.10.0"; __structuredAttrs = true; @@ -16,7 +16,7 @@ buildGoModule (finalAttrs: { owner = "git-pages"; repo = "git-pages-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-toqL/BUj3MDAqqD+94nLyw7QwU5jsUqThQVK0hJbU8Y="; + hash = "sha256-GIZ6kdCd8BIBEZxBw4Srwnbbl3PtpS2IRyA+Hx5PbAc="; }; vendorHash = "sha256-SNLSkz38AgLfjpKaEYawBLdWznKWOz62bNzuaquk7Rs="; diff --git a/pkgs/by-name/gv/gvm-libs/package.nix b/pkgs/by-name/gv/gvm-libs/package.nix index 0f2b9ba3cf14..574ef0cdaa39 100644 --- a/pkgs/by-name/gv/gvm-libs/package.nix +++ b/pkgs/by-name/gv/gvm-libs/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gvm-libs"; - version = "23.3.0"; + version = "23.7.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "gvm-libs"; tag = "v${finalAttrs.version}"; - hash = "sha256-aS+3XMz37TJTI56y0EecRCbrdkO1JIYm5KamC54tFyI="; + hash = "sha256-cRSvrmasKrk0xMnq7/bF0F6wWSKNcXDRm+p/JlciPGo="; }; postPatch = '' diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 85bc288af43e..faa231744418 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0-rolling-2026-06-22"; + version = "2.3.0-rolling-2026-06-24"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "f12fb3cca02ba31e89c87bc90041fe800dbed3f2"; - hash = "sha256-OJ/MF6A6lcxWKgcOntCVc0fkcnQ9FJx8Wn2Pewz0h84="; + rev = "66fcbfed806d7645577e4e78e4d536d38379764d"; + hash = "sha256-RzQHDHihcD+ife1CBCGliytrkt8eYVdL8AHdaYp3CFQ="; }; outputs = [ diff --git a/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch b/pkgs/by-name/in/intel-compute-runtime-legacy1/bump-cmake.patch similarity index 100% rename from pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch rename to pkgs/by-name/in/intel-compute-runtime-legacy1/bump-cmake.patch diff --git a/pkgs/by-name/in/intel-compute-runtime-legacy1/gcc15-allow-llvm-free-nonheap-object-warning.patch b/pkgs/by-name/in/intel-compute-runtime-legacy1/gcc15-allow-llvm-free-nonheap-object-warning.patch new file mode 100644 index 000000000000..90cd81176d12 --- /dev/null +++ b/pkgs/by-name/in/intel-compute-runtime-legacy1/gcc15-allow-llvm-free-nonheap-object-warning.patch @@ -0,0 +1,14 @@ +diff --git a/igc/IGC/common/LLVMWarningsPush.hpp b/igc/IGC/common/LLVMWarningsPush.hpp +index 12874dfcc2..38acd80943 100644 +--- a/igc/IGC/common/LLVMWarningsPush.hpp ++++ b/igc/IGC/common/LLVMWarningsPush.hpp +@@ -43,6 +43,9 @@ + #if __GNUC__ > 8 + #pragma GCC diagnostic ignored "-Winit-list-lifetime" + #endif ++#if __GNUC__ > 14 ++#pragma GCC diagnostic ignored "-Wfree-nonheap-object" ++#endif + #endif + + #if defined(_WIN32) || defined(_WIN64) diff --git a/pkgs/by-name/in/intel-compute-runtime-legacy1/gcc15-llvm-header-fixes.patch b/pkgs/by-name/in/intel-compute-runtime-legacy1/gcc15-llvm-header-fixes.patch new file mode 100644 index 000000000000..d0b0964f5748 --- /dev/null +++ b/pkgs/by-name/in/intel-compute-runtime-legacy1/gcc15-llvm-header-fixes.patch @@ -0,0 +1,13 @@ +diff --git a/llvm-project/llvm/include/llvm/Support/Threading.h b/llvm-project/llvm/include/llvm/Support/Threading.h +index ba6c531ab4..78aa5e7be5 100644 +--- a/llvm-project/llvm/include/llvm/Support/Threading.h ++++ b/llvm-project/llvm/include/llvm/Support/Threading.h +@@ -18,7 +18,7 @@ + #include "llvm/ADT/StringRef.h" + #include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX + #include "llvm/Support/Compiler.h" +-#include // So we can check the C++ standard lib macros. ++#include // So we can check the C++ standard lib macros. + #include + + #if defined(_MSC_VER) diff --git a/pkgs/by-name/in/intel-compute-runtime-legacy1/intel-graphics-compiler.nix b/pkgs/by-name/in/intel-compute-runtime-legacy1/intel-graphics-compiler.nix new file mode 100644 index 000000000000..859ca5c54f5e --- /dev/null +++ b/pkgs/by-name/in/intel-compute-runtime-legacy1/intel-graphics-compiler.nix @@ -0,0 +1,156 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + git, + bison, + flex, + zlib, + intel-compute-runtime, + python3, + spirv-tools, + spirv-headers, +}: + +let + llvmVersion = "16.0.6"; +in +stdenv.mkDerivation rec { + pname = "intel-graphics-compiler"; + version = "2.34.4"; + + # See the repository for expected versions: + # + srcs = [ + (fetchFromGitHub { + name = "igc"; + owner = "intel"; + repo = "intel-graphics-compiler"; + tag = "v${version}"; + hash = "sha256-w20nrn3wo9Dvv3BILYBzuJTTLXqcWaRAF7SiPtryhwk="; + }) + (fetchFromGitHub { + name = "llvm-project"; + owner = "llvm"; + repo = "llvm-project"; + tag = "llvmorg-${llvmVersion}"; + hash = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; + }) + (fetchFromGitHub { + name = "vc-intrinsics"; + owner = "intel"; + repo = "vc-intrinsics"; + tag = "v0.25.0"; + hash = "sha256-ozc1w3V5RqWHwqNHuefZJMN8RAYxrJxH9bd1BEqxfiQ="; + }) + (fetchFromGitHub { + name = "opencl-clang"; + owner = "intel"; + repo = "opencl-clang"; + tag = "v16.0.11"; + hash = "sha256-ema1jTNMHs3pUituVb1NPllc6cA8eYJHtDOjuEzIDWM="; + }) + (fetchFromGitHub { + name = "llvm-spirv"; + owner = "KhronosGroup"; + repo = "SPIRV-LLVM-Translator"; + tag = "v16.0.24"; + hash = "sha256-aTcwfQt2WdOA44jfHdD7x7oxt8emSDexgZnI7MPVqvU="; + }) + ]; + + patches = [ + # Raise minimum CMake version to 3.5 + # https://github.com/intel/intel-graphics-compiler/commit/4f0123a7d67fb716b647f0ba5c1ab550abf2f97d + # https://github.com/intel/intel-graphics-compiler/pull/364 + ./bump-cmake.patch + + # Fix for GCC 15 by adding a previously-implicit `#include ` and + # replacing `` with `` in the the llvm directory. Based + # on https://github.com/intel/intel-graphics-compiler/pull/383. + ./gcc15-llvm-header-fixes.patch + + # Fix for GCC 15 by disabling `-Werror` for `-Wfree-nonheap-object` + # warnings within LLVM. This is in accordance with IGC disabling warnings + # that originate from within LLVM (see `IGC/common/LLVMWarningsPush.hpp`). + ./gcc15-allow-llvm-free-nonheap-object-warning.patch + ]; + + sourceRoot = "."; + + cmakeDir = "../igc"; + + postUnpack = '' + chmod -R +w . + mv opencl-clang llvm-spirv llvm-project/llvm/projects/ + ''; + + postPatch = '' + substituteInPlace igc/IGC/AdaptorOCL/igc-opencl.pc.in \ + --replace-fail '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \ + --replace-fail '/@CMAKE_INSTALL_LIBDIR@' "/lib" + + chmod +x igc/IGC/Scripts/igc_create_linker_script.sh + patchShebangs --build igc/IGC/Scripts/igc_create_linker_script.sh + + # The build system only applies patches when the sources are in a + # Git repository. + git -C llvm-project init + git -C llvm-project -c user.name=nixbld -c user.email= commit --allow-empty -m stub + substituteInPlace llvm-project/llvm/projects/opencl-clang/cmake/modules/CMakeFunctions.cmake \ + --replace-fail 'COMMAND ''${GIT_EXECUTABLE} am --3way --keep-non-patch --ignore-whitespace -C0 ' \ + 'COMMAND patch -p1 --ignore-whitespace -i ' + + # match default LLVM version with our provided version to apply correct patches + substituteInPlace igc/external/llvm/llvm_preferred_version.cmake \ + --replace-fail "16.0.6" "${llvmVersion}" + ''; + + nativeBuildInputs = [ + bison + cmake + flex + git + ninja + (python3.withPackages ( + ps: with ps; [ + mako + pyyaml + ] + )) + zlib + ]; + + buildInputs = [ + spirv-headers + spirv-tools + ]; + + strictDeps = true; + + # testing is done via intel-compute-runtime + doCheck = false; + + cmakeFlags = [ + "-DIGC_OPTION__SPIRV_TOOLS_MODE=Prebuilds" + "-DIGC_OPTION__USE_PREINSTALLED_SPIRV_HEADERS=ON" + "-DSPIRV-Headers_INCLUDE_DIR=${spirv-headers}/include" + "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}" + "-Wno-dev" + ]; + + passthru.tests = { + inherit intel-compute-runtime; + }; + + meta = { + description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware"; + homepage = "https://github.com/intel/intel-graphics-compiler"; + changelog = "https://github.com/intel/intel-graphics-compiler/releases/tag/v${version}"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ fleaz ]; + }; +} diff --git a/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix b/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix index 424f8fe55c47..b91c58a244d3 100644 --- a/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix +++ b/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix @@ -1,11 +1,11 @@ { lib, + callPackage, stdenv, fetchFromGitHub, cmake, pkg-config, intel-gmmlib, - intel-graphics-compiler, level-zero, libva, gitUpdater, @@ -13,6 +13,8 @@ let inherit (lib) cmakeBool; + # intel-graphics-compiler >= 2.36 does no longer support 8th Gen + intel-graphics-compiler = callPackage ./intel-graphics-compiler.nix { }; in stdenv.mkDerivation (finalAttrs: { # https://github.com/intel/compute-runtime/blob/master/LEGACY_PLATFORMS.md diff --git a/pkgs/by-name/in/intel-graphics-compiler/package.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix index 3c0a5c6c5eaf..99398395bf78 100644 --- a/pkgs/by-name/in/intel-graphics-compiler/package.nix +++ b/pkgs/by-name/in/intel-graphics-compiler/package.nix @@ -11,15 +11,28 @@ intel-compute-runtime, python3, spirv-tools, - spirv-headers, }: let - llvmVersion = "16.0.6"; + llvmVersion = "17.0.6"; + + spirv-headers = stdenv.mkDerivation { + pname = "spirv-headers"; + version = "1.4.341.0-unstable-2026-04-29"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Headers"; + rev = "b8a32968473ce852a809b9de5f04f02a5a9dfa78"; + hash = "sha256-k5lAF7TxJ+8cXDnx7lQxG/3IjSTzYcqBl5PYY2gv9E8="; + }; + + nativeBuildInputs = [ cmake ]; + }; in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "2.34.4"; + version = "2.36.3"; # See the repository for expected versions: # @@ -29,14 +42,14 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "intel-graphics-compiler"; tag = "v${version}"; - hash = "sha256-w20nrn3wo9Dvv3BILYBzuJTTLXqcWaRAF7SiPtryhwk="; + hash = "sha256-0GzZQECcngF9b5lZyeIKXeM6w64WzCYFtHOobQKN80o="; }) (fetchFromGitHub { name = "llvm-project"; owner = "llvm"; repo = "llvm-project"; tag = "llvmorg-${llvmVersion}"; - hash = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; + hash = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; }) (fetchFromGitHub { name = "vc-intrinsics"; @@ -49,24 +62,19 @@ stdenv.mkDerivation rec { name = "opencl-clang"; owner = "intel"; repo = "opencl-clang"; - tag = "v16.0.11"; - hash = "sha256-ema1jTNMHs3pUituVb1NPllc6cA8eYJHtDOjuEzIDWM="; + tag = "v17.0.7"; + hash = "sha256-7kQlH1Y4pnNvj/CS2qAVbYUl9FQWBuMew7i8CpORfKE="; }) (fetchFromGitHub { name = "llvm-spirv"; owner = "KhronosGroup"; repo = "SPIRV-LLVM-Translator"; - tag = "v16.0.24"; - hash = "sha256-aTcwfQt2WdOA44jfHdD7x7oxt8emSDexgZnI7MPVqvU="; + tag = "v17.0.24"; + hash = "sha256-s/dNWmT3KXdXK0CSVjqEfsY9r8ONAGMZ5KUy9FeqF0E="; }) ]; patches = [ - # Raise minimum CMake version to 3.5 - # https://github.com/intel/intel-graphics-compiler/commit/4f0123a7d67fb716b647f0ba5c1ab550abf2f97d - # https://github.com/intel/intel-graphics-compiler/pull/364 - ./bump-cmake.patch - # Fix for GCC 15 by adding a previously-implicit `#include ` and # replacing `` with `` in the the llvm directory. Based # on https://github.com/intel/intel-graphics-compiler/pull/383. diff --git a/pkgs/by-name/ja/jackett/package.nix b/pkgs/by-name/ja/jackett/package.nix index 79b99e8ae42d..78fb01480bab 100644 --- a/pkgs/by-name/ja/jackett/package.nix +++ b/pkgs/by-name/ja/jackett/package.nix @@ -12,13 +12,13 @@ buildDotnetModule (finalAttrs: { pname = "jackett"; - version = "0.24.2066"; + version = "0.24.2108"; src = fetchFromGitHub { owner = "jackett"; repo = "jackett"; tag = "v${finalAttrs.version}"; - hash = "sha256-hK7QfztI3kFJcOG9OTQ5/lOusFKnv8AyNfCaU9IhdKE="; + hash = "sha256-MWA5gTiNjkKIaHgUGVt2XV3QBPYGTf/dVqCnmdAaJ0U="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/by-name/ke/keifu/package.nix b/pkgs/by-name/ke/keifu/package.nix index 691f403a235e..2dd1254741c9 100644 --- a/pkgs/by-name/ke/keifu/package.nix +++ b/pkgs/by-name/ke/keifu/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "keifu"; - version = "0.4.0"; + version = "0.5.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "trasta298"; repo = "keifu"; tag = "v${finalAttrs.version}"; - hash = "sha256-668ejr2pxjGfQ0/hhJSNBSZME2+hSGuNJmwmbLVqy0o="; + hash = "sha256-ndMWi//G9kwnoPf58YtICyytMv2t0e4h7cwBdfpaoVY="; }; - cargoHash = "sha256-6YmpsKkf/Mox98fRdrwbwzFohgOicRfCxcAIGSwmT7g="; + cargoHash = "sha256-lNctnxVntxRZaS9XeII1sQZ2ZNKkSvd8n+bq5Fwd6QM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/la/lan-mouse/package.nix b/pkgs/by-name/la/lan-mouse/package.nix index 97acca9f355b..0c086a58ef8a 100644 --- a/pkgs/by-name/la/lan-mouse/package.nix +++ b/pkgs/by-name/la/lan-mouse/package.nix @@ -14,24 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "lan-mouse"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "feschber"; repo = "lan-mouse"; rev = "v${version}"; - hash = "sha256-ofiNgJbmf35pfRvZB3ZmMkCJuM7yYgNL+Dd5mZZqyNk="; - }; - - # lan-mouse uses `git` to determine the version at build time and - # has Cargo set the `GIT_DESCRIBE` environment variable. To improve - # build reproducibility, we define the variable based on the package - # version instead. - prePatch = '' - rm build.rs - ''; - env = { - GIT_DESCRIBE = "${version}-nixpkgs"; + hash = "sha256-6EqA9WfiukOymUT4FkNdMvzmFKByW0LLoI/9sv4TzBU="; }; nativeBuildInputs = [ @@ -47,7 +36,7 @@ rustPlatform.buildRustPackage rec { libxtst ]; - cargoHash = "sha256-+UXRBYfbkb114mwDGj36oG5ZT3TQtcEzsbyZvtWTMxM="; + cargoHash = "sha256-Lxs0qWvNAv4KCeJ+cDBYBzwlbJfQJshcxPRdg9w0szc="; postInstall = '' install -Dm444 de.feschber.LanMouse.desktop -t $out/share/applications diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix index e44720c7a41b..d241c440c42a 100644 --- a/pkgs/by-name/ma/mattermost/package.nix +++ b/pkgs/by-name/ma/mattermost/package.nix @@ -265,7 +265,7 @@ buildMattermost rec { buildPhase = '' runHook preBuild - for ws in platform/{types,client,components,shared} channels; do + for ws in platform/{types,client,shared,components} channels; do if [ -d "$ws" ]; then npm run build --workspace="$ws" fi diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix index 45685a9cfc8a..e0fd905a82d2 100644 --- a/pkgs/by-name/ma/mattermostLatest/package.nix +++ b/pkgs/by-name/ma/mattermostLatest/package.nix @@ -15,10 +15,10 @@ mattermost.override ( # and make sure the version regex is up to date here. # Ensure you also check ../mattermost/package.nix for ESR releases. regex = "^v(11\\.[0-9]+\\.[0-9]+)$"; - version = "11.7.0"; - srcHash = "sha256-oH9bLN2BPvRSWl5m3VNHBNMBXfdmkwaE9tzL7pcD1mg="; - vendorHash = "sha256-PmwwiXNaDarc1H7z1G4zstgs7tvmZ/d7V5eGqMh1VX4="; - npmDepsHash = "sha256-C3vfWW2hMOMnrPn1538kT+ma09T9VswrmADV/KPkrPc="; + version = "11.8.1"; + srcHash = "sha256-9EIbTwnEeZQKg5uixkMp3sp/n+9I2N9W7hxsW5juF3M="; + vendorHash = "sha256-F2QMrLbio7812ZTGQZZPTqHWtIXbwbDmjUhtvv0DJ9s="; + npmDepsHash = "sha256-9GRM0VXrh1eR16ocSGEV/F2eflOflzkhrhRRnm9uB6s="; autoUpdate = ./package.nix; }; } diff --git a/pkgs/by-name/md/md-tui/package.nix b/pkgs/by-name/md/md-tui/package.nix index e03046cbdc53..41c58989f376 100644 --- a/pkgs/by-name/md/md-tui/package.nix +++ b/pkgs/by-name/md/md-tui/package.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "md-tui"; - version = "0.10.1"; + version = "0.10.2"; __structuredAttrs = true; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "henriklovhaug"; repo = "md-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-bFL84y0735L93x0nWkKAAmTDMdZzs5DDoxqbQhgXUMQ="; + hash = "sha256-VSOAeFY3TsdeOlKt3f9cbEsSNSwvhcYQl129oQMOTaM="; }; - cargoHash = "sha256-xR9bWWDxerP2zGAb43ZWONLcsbmUn8KzMXwDEmrjioU="; + cargoHash = "sha256-l1VXrf19KB6zTrVmINyinz0YpGDDUH9B77CN6CMz/X8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/me/mealie/mealie-frontend.nix b/pkgs/by-name/me/mealie/mealie-frontend.nix deleted file mode 100644 index b3359fb64271..000000000000 --- a/pkgs/by-name/me/mealie/mealie-frontend.nix +++ /dev/null @@ -1,68 +0,0 @@ -src: version: -{ - lib, - fetchYarnDeps, - dart-sass, - nodejs, - fixup-yarn-lock, - stdenv, - yarn, - writableTmpDirAsHomeHook, -}: -stdenv.mkDerivation { - name = "mealie-frontend"; - inherit version; - src = "${src}/frontend"; - - yarnOfflineCache = fetchYarnDeps { - yarnLock = "${src}/frontend/yarn.lock"; - hash = "sha256-F1dhdBHfT9N1Ejk7WLyz2BbKlTPfqqEDNi7ZTL3phWY="; - }; - - nativeBuildInputs = [ - fixup-yarn-lock - nodejs - (yarn.override { inherit nodejs; }) - writableTmpDirAsHomeHook - dart-sass - ]; - - configurePhase = '' - runHook preConfigure - - sed -i 's+"@nuxt/fonts",+// NUXT FONTS DISABLED+g' nuxt.config.ts - - yarn config --offline set yarn-offline-mirror "$yarnOfflineCache" - fixup-yarn-lock yarn.lock - yarn install --offline --frozen-lockfile --no-progress --non-interactive --ignore-scripts - patchShebangs node_modules - - substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \ - --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["dart-sass"];' - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - export NUXT_TELEMETRY_DISABLED=1 - yarn --offline generate - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mv .output/public $out - runHook postInstall - ''; - - meta = { - description = "Frontend for Mealie"; - license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ - litchipi - esch - ]; - }; -} diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix index 765822f5dfa9..ffcf70e2763f 100644 --- a/pkgs/by-name/me/mealie/package.nix +++ b/pkgs/by-name/me/mealie/package.nix @@ -1,7 +1,5 @@ { lib, - pkgs, - callPackage, fetchFromGitHub, makeWrapper, nixosTests, @@ -9,27 +7,99 @@ nltk-data, writeShellScript, nix-update-script, + + # frontend + fetchYarnDeps, + dart-sass, + nodejs, + fixup-yarn-lock, + stdenv, + yarn, + writableTmpDirAsHomeHook, }: let - version = "3.16.0"; + version = "3.19.2"; src = fetchFromGitHub { owner = "mealie-recipes"; repo = "mealie"; tag = "v${version}"; - hash = "sha256-DUwLCe221MQb6AEYNxNDWXoaEdf9q/dNklOXJncnnJ4="; + hash = "sha256-OH48XiOoaIdVCl5tm22OaI5UKKlhj8b0uVsGlgsjx6I="; }; - frontend = callPackage (import ./mealie-frontend.nix src version) { }; + frontend = stdenv.mkDerivation { + name = "mealie-frontend"; + inherit version; + src = "${src}/frontend"; + + __structuredAttrs = true; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${src}/frontend/yarn.lock"; + hash = "sha256-q3dqJrzqEx0G3Q/EGhjVzBd6XTAn6cELfaqLJCD5kFs="; + }; + + nativeBuildInputs = [ + fixup-yarn-lock + nodejs + (yarn.override { inherit nodejs; }) + writableTmpDirAsHomeHook + dart-sass + ]; + + env = { + NUXT_TELEMETRY_DISABLED = 1; + }; + + configurePhase = '' + runHook preConfigure + + sed -i 's+"@nuxt/fonts",+// NUXT FONTS DISABLED+g' nuxt.config.ts + + yarn config --offline set yarn-offline-mirror "$yarnOfflineCache" + fixup-yarn-lock yarn.lock + yarn install --offline --frozen-lockfile --no-progress --non-interactive --ignore-scripts + patchShebangs node_modules + + substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \ + --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["dart-sass"];' + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline generate + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mv .output/public $out + runHook postInstall + ''; + + meta = { + description = "Frontend for Mealie"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ + litchipi + esch + ]; + }; + }; python = python3; pythonpkgs = python.pkgs; in -pythonpkgs.buildPythonApplication rec { +pythonpkgs.buildPythonApplication (finalAttrs: { pname = "mealie"; inherit version src; pyproject = true; + __structuredAttrs = true; + build-system = with pythonpkgs; [ setuptools ]; nativeBuildInputs = [ makeWrapper ]; @@ -112,11 +182,11 @@ pythonpkgs.buildPythonApplication rec { rm -f $out/bin/* makeWrapper ${start_script} $out/bin/mealie \ - --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath dependencies}" \ - --set STATIC_FILES "${frontend}" + --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath finalAttrs.passthru.dependencies}" \ + --set STATIC_FILES "${finalAttrs.passthru.frontend}" makeWrapper ${init_db} $out/libexec/init_db \ - --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath dependencies}" \ + --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath finalAttrs.passthru.dependencies}" \ --set OUT "$out" ''; @@ -136,7 +206,13 @@ pythonpkgs.buildPythonApplication rec { ]; passthru = { - updateScript = nix-update-script { }; + inherit frontend; + updateScript = nix-update-script { + extraArgs = [ + "-s" + "frontend" + ]; + }; tests = { inherit (nixosTests) mealie; }; @@ -160,4 +236,4 @@ pythonpkgs.buildPythonApplication rec { ]; mainProgram = "mealie"; }; -} +}) diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index 58f4552604a4..35bfec707916 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "misskey"; - version = "2026.5.4"; + version = "2026.6.0"; src = fetchFromGitHub { owner = "misskey-dev"; repo = "misskey"; tag = finalAttrs.version; - hash = "sha256-ENq5V1lIFGKIr1xZccy1LFRYVqZVEhDzBhAbDNcG5sM="; + hash = "sha256-jq1HtLabix9qxaAjaCgUN3nsY438ruHgHgC3MuGeR2E="; fetchSubmodules = true; }; @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { ; inherit pnpm; fetcherVersion = 4; - hash = "sha256-wEbYkfp+zfytOPBjEcyTHCaoohGRNRjG5oTUefI5BVw="; + hash = "sha256-GCkSASkgwUvlAlm8hiy4Yk/QMVerVGacxOh1AYouH0g="; }; buildPhase = '' diff --git a/pkgs/by-name/ni/nixos-init/src/find_etc.rs b/pkgs/by-name/ni/nixos-init/src/find_etc.rs index d06f7bbb0114..8b994e1d7534 100644 --- a/pkgs/by-name/ni/nixos-init/src/find_etc.rs +++ b/pkgs/by-name/ni/nixos-init/src/find_etc.rs @@ -3,7 +3,7 @@ use std::{os::unix, path::Path}; use anyhow::{Context, Result}; use crate::config::Config; -use crate::{SYSROOT_PATH, find_init_in_prefix, resolve_in_prefix, verify_init_is_nixos}; +use crate::{SYSROOT_PATH, find_toplevel_in_prefix, resolve_in_prefix}; /// Entrypoint for the `find-etc` binary. /// @@ -12,20 +12,7 @@ use crate::{SYSROOT_PATH, find_init_in_prefix, resolve_in_prefix, verify_init_is /// This avoids needing a reference to the toplevel embedded in the initrd and thus reduces the /// need to re-build it. pub fn find_etc() -> Result<()> { - let init_in_sysroot = - find_init_in_prefix(SYSROOT_PATH).context("Failed to find init in sysroot")?; - - // A non-NixOS init= (e.g. init=/bin/sh) has no etc metadata image. Skip - // without creating the symlinks: the etc-overlay mounts are gated on them - // and so skip too, and initrd-init switches root to the init directly. - let Ok(toplevel) = verify_init_is_nixos(SYSROOT_PATH, &init_in_sysroot) else { - log::info!( - "{} is not a NixOS system - not setting up the etc overlay.", - init_in_sysroot.display() - ); - return Ok(()); - }; - + let toplevel = find_toplevel_in_prefix(SYSROOT_PATH)?; let config = Config::from_toplevel(&toplevel, SYSROOT_PATH)?; let basedir = config diff --git a/pkgs/by-name/ni/nixos-init/src/lib.rs b/pkgs/by-name/ni/nixos-init/src/lib.rs index bbb4abdb829b..c781757c9b82 100644 --- a/pkgs/by-name/ni/nixos-init/src/lib.rs +++ b/pkgs/by-name/ni/nixos-init/src/lib.rs @@ -27,6 +27,16 @@ pub use crate::{ pub const SYSROOT_PATH: &str = "/sysroot"; +/// Find the path to the toplevel closure of the system in a prefix. +/// +/// Uses the `init=` parameter on the kernel command-line. +/// +/// Returns the relative path of the init to the prefix, e.g. without the `/sysroot` prefix. +pub fn find_toplevel_in_prefix(prefix: &str) -> Result { + let init_in_sysroot = find_init_in_prefix(prefix)?; + verify_init_is_nixos(prefix, init_in_sysroot) +} + /// Verify that an init path is inside a `NixOS` toplevel directory. /// /// If the path is verified, returns the path to the toplevel. @@ -77,16 +87,20 @@ pub fn find_init_in_prefix(prefix: &str) -> Result { } /// Extract the value of the `init` parameter from the given kernel `cmdline`. -/// -/// If `init=` appears multiple times the last one wins, matching the kernel. -/// This is what makes appending `init=/bin/sh` at the boot prompt work even -/// though the boot entry already has an `init=`. fn extract_init(cmdline: &str) -> Result { - let init = cmdline + let init_params: Vec<&str> = cmdline .split_ascii_whitespace() - .filter_map(|p| p.strip_prefix("init=")) - .next_back() - .with_context(|| format!("No init= parameter on kernel cmdline: {cmdline}"))?; + .filter(|p| p.starts_with("init=")) + .collect(); + + if init_params.len() != 1 { + bail!("Expected exactly one init param on kernel cmdline: {cmdline}") + } + + let init = init_params + .first() + .and_then(|s| s.split('=').next_back()) + .context("Failed to extract init path from kernel cmdline: {cmdline}")?; Ok(PathBuf::from(init)) } @@ -115,25 +129,4 @@ mod tests { Ok(()) } - - #[test] - fn test_extract_init_single() { - assert_eq!( - extract_init("root=fstab init=/nix/store/xxx-nixos/init quiet").unwrap(), - PathBuf::from("/nix/store/xxx-nixos/init") - ); - } - - #[test] - fn test_extract_init_last_wins() { - assert_eq!( - extract_init("init=/nix/store/xxx-nixos/init init=/bin/sh").unwrap(), - PathBuf::from("/bin/sh") - ); - } - - #[test] - fn test_extract_init_missing() { - assert!(extract_init("root=fstab quiet").is_err()); - } } diff --git a/pkgs/by-name/pa/panache/package.nix b/pkgs/by-name/pa/panache/package.nix index e50261ff6653..9cbc05d6eaf5 100644 --- a/pkgs/by-name/pa/panache/package.nix +++ b/pkgs/by-name/pa/panache/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "panache"; - version = "2.54.0"; + version = "2.58.0"; src = fetchFromGitHub { owner = "jolars"; repo = "panache"; tag = "v${finalAttrs.version}"; - hash = "sha256-JyLIsCJc/kmVBMp+9PRmkx2P1jrtTmmHfbk7mMcHQQ0="; + hash = "sha256-QLW+3xkAYPFVAXM2VwhZm175CksDG9HL9rCEkH7knlU="; }; - cargoHash = "sha256-LLEkdc6MstTfRGoTgtOncmRlSBXnNA2f1qFsR0O5XEM="; + cargoHash = "sha256-OXkkaXWFFOBsZEWL88UWy1dqpwZazk9i8ZAH/tprag4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/pl/plakar/package.nix b/pkgs/by-name/pl/plakar/package.nix index 584908cb2aae..1754b9420be0 100644 --- a/pkgs/by-name/pl/plakar/package.nix +++ b/pkgs/by-name/pl/plakar/package.nix @@ -8,16 +8,19 @@ }: buildGo125Module (finalAttrs: { pname = "plakar"; - version = "1.0.6"; + version = "1.1.3"; + + # to avoid having all the Test(Get|Set|Validate)Service.* tests fail on darwin + __darwinAllowLocalNetworking = true; src = fetchFromGitHub { owner = "PlakarKorp"; repo = "plakar"; tag = "v${finalAttrs.version}"; - hash = "sha256-X8m2dXMb+cxWBbKm0MhhY2pNSBTUONyHoPnGlDG9jOg="; + hash = "sha256-AQyE8VtTdkuevBVMLDfhN1h6/DirdhLgPu+76QfRUas="; }; - vendorHash = "sha256-6MdwUJTu9QvqZ3iGEg39L5B5mce7JssFTF3ZmoTuH3M="; + vendorHash = "sha256-nueFE6Ka1dq4Rt+Qs9YJU9N+yYfEyA8jkVGC4vKLjSI="; buildInputs = [ fuse @@ -30,8 +33,8 @@ buildGo125Module (finalAttrs: { checkFlags = let skippedTests = [ - # mount: fusermount: exec: "fusermount": executable file not found in $PATH - "TestExecuteCmdMountDefault" + # hangs even outside Nix, so probably an upstream issue: + "TestRebuildStateVersionMismatch" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestBTreeScanMemory" @@ -53,6 +56,7 @@ buildGo125Module (finalAttrs: { maintainers = with lib.maintainers; [ heph2 qbit + nadir-ishiguro ]; }; }) diff --git a/pkgs/by-name/qt/qtwebapp/package.nix b/pkgs/by-name/qt/qtwebapp/package.nix index c2f04ff5df82..52b17e7c0403 100644 --- a/pkgs/by-name/qt/qtwebapp/package.nix +++ b/pkgs/by-name/qt/qtwebapp/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { __structuredAttrs = true; - sourceRoot = "source/QtWebApp"; + sourceRoot = "${finalAttrs.src.name}/QtWebApp"; postPatch = '' cat >>QtWebApp.pro <