diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 9ee7a5ff86dc..7fcbde36087c 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -277,6 +277,10 @@ in "zfs" "enableUnstable" ] "Instead set `boot.zfs.package = pkgs.zfs_unstable;`") + (lib.mkRenamedOptionModule + [ "boot" "zfs" "allowHibernation" ] + [ "boot" "zfs" "unsafeAllowHibernation" ] + ) ]; ###### interface @@ -305,12 +309,12 @@ in description = "True if ZFS filesystem support is enabled"; }; - allowHibernation = lib.mkOption { + unsafeAllowHibernation = lib.mkOption { type = lib.types.bool; default = false; description = '' - Allow hibernation support, this may be a unsafe option depending on your - setup. Make sure to NOT use Swap on ZFS. + Allow hibernation (suspend to disk) support. This is generally considered **UNSAFE**, + is not well supported by openzfs, and could lead to corruption and data loss. ''; }; @@ -350,19 +354,18 @@ in forceImportRoot = lib.mkOption { type = lib.types.bool; - default = true; + default = lib.versionOlder config.system.stateVersion "26.11"; + defaultText = lib.literalExpression ''lib.versionOlder config.system.stateVersion "26.11"''; description = '' Forcibly import the ZFS root pool(s) during early boot. - This is enabled by default for backwards compatibility purposes, but it is highly - recommended to disable this option, as it bypasses some of the safeguards ZFS uses - to protect your ZFS pools. + It is highly recommended to keep this option disabled as it bypasses ZFS + safeguard that protect your pools. - If you set this option to `false` and NixOS subsequently fails to - boot because it cannot import the root pool, you should boot with the - `zfs_force=1` option as a kernel parameter (e.g. by manually - editing the kernel params in grub during boot). You should only need to do this - once. + If NixOS fails to boot because it cannot import the root pool, you should boot + with the `zfs_force=1` option as a kernel parameter (e.g. by manually + editing the kernel params via your bootloader). + You should only need to do this after unclean shutdowns. ''; }; @@ -372,10 +375,10 @@ in description = '' Forcibly import all ZFS pool(s). - If you set this option to `false` and NixOS subsequently fails to - import your non-root ZFS pool(s), you should manually import each pool with - "zpool import -f \", and then reboot. You should only need to do - this once. + It is highly recommended to keep this option disabled as it bypasses ZFS + safeguard that protect your pools. + + See {option}`boot.zfs.forceImportRoot` for details. ''; }; @@ -672,12 +675,12 @@ in message = "ZFS requires networking.hostId to be set"; } { - assertion = !cfgZfs.forceImportAll || cfgZfs.forceImportRoot; + assertion = cfgZfs.forceImportAll -> cfgZfs.forceImportRoot; message = "If you enable boot.zfs.forceImportAll, you must also enable boot.zfs.forceImportRoot"; } { - assertion = cfgZfs.allowHibernation -> !cfgZfs.forceImportRoot && !cfgZfs.forceImportAll; - message = "boot.zfs.allowHibernation while force importing is enabled will cause data corruption"; + assertion = cfgZfs.unsafeAllowHibernation -> !cfgZfs.forceImportRoot && !cfgZfs.forceImportAll; + message = "boot.zfs.unsafeAllowHibernation while force importing is enabled will cause data corruption"; } { assertion = !(lib.elem "" allPools); @@ -694,12 +697,25 @@ in } ]; + warnings = + lib.optional + ( + options.boot.zfs.forceImportRoot.definitionsWithLocations == [ + { + inherit (__curPos) file; + value = true; + } + ] + ) + "`boot.zfs.forceImportRoot` is using the default value of `true`. It is highly recommended to set it to `false`, the new default from 26.11 on, to reduce the risk of data loss. Alternatively, you can silence this warning by explicitly setting it to `true`."; + boot = { kernelModules = [ "zfs" ]; - # https://github.com/openzfs/zfs/issues/260 + # https://github.com/openzfs/zfs/issues/260#issuecomment-982142240 # https://github.com/openzfs/zfs/issues/12842 + # https://github.com/openzfs/zfs/issues/14118#issuecomment-1301576647 # https://github.com/NixOS/nixpkgs/issues/106093 - kernelParams = lib.optionals (!config.boot.zfs.allowHibernation) [ "nohibernate" ]; + kernelParams = lib.optionals (!config.boot.zfs.unsafeAllowHibernation) [ "nohibernate" ]; extraModulePackages = [ cfgZfs.modulePackage diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 5a7c493e42b1..7851368075a0 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -23,7 +23,6 @@ let nodes.machine = { - config, pkgs, lib, ... @@ -54,6 +53,8 @@ let # /dev/disk/by-id doesn't get populated in the NixOS test framework boot.zfs.devNodes = "/dev/disk/by-uuid"; + boot.zfs.forceImportRoot = lib.mkDefault false; + specialisation.samba.configuration = { services.samba = { enable = true; @@ -101,6 +102,7 @@ let systemd.services.zfs-import-forcepool.wantedBy = lib.mkVMOverride [ "forcepool.mount" ]; systemd.targets.zfs.wantedBy = lib.mkVMOverride [ ]; boot.zfs.forceImportAll = true; + boot.zfs.forceImportRoot = true; virtualisation.fileSystems."/forcepool" = { device = "forcepool"; fsType = "zfs"; @@ -203,7 +205,6 @@ let in { - series_2_3 = makeZfsTest { zfsPackage = pkgs.zfs_2_3; kernelPackages = pkgs.linuxPackages; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 8037a06b70e3..6a9830ab6808 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -209,6 +209,12 @@ assertNoAdditions { dependencies = [ self.middleclass ]; }; + argtextobj-vim = super.argtextobj-vim.overrideAttrs (old: { + meta = old.meta // { + license = lib.licenses.mit; + }; + }); + arrow-nvim = super.arrow-nvim.overrideAttrs (old: { meta = old.meta // { license = lib.licenses.gpl3Plus; @@ -447,6 +453,12 @@ assertNoAdditions { }; }); + camelcasemotion = super.camelcasemotion.overrideAttrs (old: { + meta = old.meta // { + license = lib.licenses.vim; + }; + }); + catppuccin-nvim = super.catppuccin-nvim.overrideAttrs { nvimSkipModules = [ "catppuccin.groups.integrations.noice" @@ -2219,6 +2231,12 @@ assertNoAdditions { dependencies = [ self.plenary-nvim ]; }; + lsp-format-nvim = super.lsp-format-nvim.overrideAttrs (old: { + meta = old.meta // { + license = lib.licenses.mit; + }; + }); + lsp_extensions-nvim = super.lsp_extensions-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -4477,6 +4495,12 @@ assertNoAdditions { nvimSkipModules = "tsc.better-messages-test"; }; + tslime-vim = super.tslime-vim.overrideAttrs (old: { + meta = old.meta // { + license = lib.licenses.wtfpl; + }; + }); + tsuquyomi = super.tsuquyomi.overrideAttrs (old: { meta = old.meta // { license = lib.licenses.mit; @@ -4709,9 +4733,12 @@ assertNoAdditions { }; }); - vim-beancount = super.vim-beancount.overrideAttrs { + vim-beancount = super.vim-beancount.overrideAttrs (old: { passthru.python3Dependencies = ps: with ps; [ beancount ]; - }; + meta = old.meta // { + license = lib.licenses.vim; + }; + }); vim-bepoptimist = super.vim-bepoptimist.overrideAttrs (old: { meta = old.meta // { @@ -4852,6 +4879,12 @@ assertNoAdditions { }; }); + vim-easymotion = super.vim-easymotion.overrideAttrs (old: { + meta = old.meta // { + license = lib.licenses.mit; + }; + }); + vim-easytags = super.vim-easytags.overrideAttrs (old: { dependencies = [ self.vim-misc ]; patches = [ @@ -5039,6 +5072,12 @@ assertNoAdditions { runtimeDeps = [ jq ]; }; + vim-indentwise = super.vim-indentwise.overrideAttrs (old: { + meta = old.meta // { + license = lib.licenses.gpl3Plus; + }; + }); + vim-isort = super.vim-isort.overrideAttrs { postPatch = '' substituteInPlace autoload/vimisort.vim \ @@ -5328,6 +5367,12 @@ assertNoAdditions { }; }); + vim-textobj-user = super.vim-textobj-user.overrideAttrs (old: { + meta = old.meta // { + license = lib.licenses.mit; + }; + }); + vim-tpipeline = super.vim-tpipeline.overrideAttrs { # Requires global variable nvimSkipModules = "tpipeline.main"; @@ -5506,6 +5551,12 @@ assertNoAdditions { nvimSkipModules = "virt-column.config.types"; }; + vis = super.vis.overrideAttrs (old: { + meta = old.meta // { + license = lib.licenses.vim; + }; + }); + vs-tasks-nvim = super.vs-tasks-nvim.overrideAttrs { checkInputs = [ # Optional telescope integration 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 b4868742f542..7cfd9a85a96e 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -10,26 +10,26 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-w4kUYNnQW4KkIlzxnTASTBFxL3m3/NBwBET7/8ealIY="; + hash = "sha256-J9QdRxN0NdCRfSUBUE7Ox2BG0vdnaWGq27jcR779qRw="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-ZsVR7Qajv78A0+UfR+DqaUZyV1FFRjNs2+vJInboh6U="; + hash = "sha256-53SJDBILWKVqz8EyXO/DF8+j+EK7iVJ47cjhlZhrIWw="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-8zvhF5cs1XOGa/l2M27K2Mv2cgusNy51glFZf1OVdWI="; + hash = "sha256-/82zwt92T5JYGxhnvSmqTA/7ahut6P3SAU5POxUFowM="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-Csb9F6HGWAgvPDjtsu35gjtGCuDLu0WQD1NNX/+S7F8="; + hash = "sha256-2ppC1sDDtDKAWpAW3RHGHeszhoKAVYnRoKw94ZOCaAs="; }; }; in { name = "claude-code"; publisher = "anthropic"; - version = "2.1.119"; + version = "2.1.121"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/by-name/ao/ao3downloader/package.nix b/pkgs/by-name/ao/ao3downloader/package.nix index cd9fb3456d07..ea655ebb1722 100644 --- a/pkgs/by-name/ao/ao3downloader/package.nix +++ b/pkgs/by-name/ao/ao3downloader/package.nix @@ -8,14 +8,14 @@ # https://github.com/nianeyna/ao3downloader/blob/f8399bb8aca276ae7359157b90afd13925c90056/pyproject.toml#L8 python312Packages.buildPythonApplication (finalAttrs: { pname = "ao3downloader"; - version = "2026.4.7"; + version = "2026.4.9"; pyproject = true; src = fetchFromGitHub { owner = "nianeyna"; repo = "ao3downloader"; tag = "v${finalAttrs.version}"; - hash = "sha256-PlMVhvUX/XeNrKfwe+/sFv8Y4k7GEzCR+xIO/zuspxM="; + hash = "sha256-StaF62Ho/xz8kKE5NrLo8G5PdBv493VBshR6gdK9J20="; }; build-system = with python312Packages; [ diff --git a/pkgs/by-name/ca/cargo-udeps/package.nix b/pkgs/by-name/ca/cargo-udeps/package.nix index 13d6617b1e16..9cf38f94b344 100644 --- a/pkgs/by-name/ca/cargo-udeps/package.nix +++ b/pkgs/by-name/ca/cargo-udeps/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-udeps"; - version = "0.1.60"; + version = "0.1.61"; src = fetchFromGitHub { owner = "est31"; repo = "cargo-udeps"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-NW9yjFUV+o7vv5bYD8nxSWHOXOBnDEk36xze90wYuNg="; + sha256 = "sha256-yT/EJWGGhQapbU1o1Gus1Vk5cAhso5ALTBecB3BH46g="; }; - cargoHash = "sha256-vQvtc/CwV1aHeREzmzO8k1FcebbEp3FKMAJb0v2aQig="; + cargoHash = "sha256-DGfAsBucFRFJkjmJkpTpNfQO79jaNa5NezXKf7hYYeM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json index 774b34827eca..7d9c6867f89b 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.119", - "commit": "6f68554839756189e277b8285a18fe47acd9a5a1", - "buildDate": "2026-04-23T20:45:14Z", + "version": "2.1.121", + "commit": "16ffea721a0a39bc787a236dc19fb62307180b75", + "buildDate": "2026-04-27T01:51:03Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "31db3444309d5d0f8b85e8782e2dcd86f31f7e48c1a1e83d69b09268c7b4f9a2", - "size": 213404000 + "checksum": "3810e55d47ed4d413de6dc037e34d58948f779a4c6bdeeacf1748d850c5daad6", + "size": 215417984 }, "darwin-x64": { "binary": "claude", - "checksum": "52b3b75cfe80c626982b2ffb3a6ce1c797824f257dc275cf0a3c32c202b6a3df", - "size": 214951760 + "checksum": "59d817dde54eeef0d752e7bd3869586e6eb5fa2b1d785c06fb9cda8804166037", + "size": 216982224 }, "linux-arm64": { "binary": "claude", - "checksum": "382aa73ea4b07fd8d698e3159b5ef9e1b8739fae7505ba8ddd28b8a6a62819ce", - "size": 245500480 + "checksum": "71b78e6364f97a227b17be40dfcc237461f8d2b1d109444d24b42af0fdefac31", + "size": 247466560 }, "linux-x64": { "binary": "claude", - "checksum": "cca43053f062949495596b11b6fd1b59cf79102adb13bacbe66997e6fae41e4a", - "size": 245230208 + "checksum": "b4b684bbcb3a88029ec419dbc08824b2f3c69656a0aa2374860f9525fc67c98f", + "size": 247265920 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "e09bfaedd8bfdeaebe5f1cf9bb81ebeb718312c68fffce379fb51786263143d0", - "size": 238225856 + "checksum": "2f8e2a81f7d41a9cf3e9269fb3237df968194cc7bf8ba478392cd5217d55e8d1", + "size": 240191872 }, "linux-x64-musl": { "binary": "claude", - "checksum": "ef41a11653b39c14db2d343f1f5e2a3af7eb9871c63e64deb6e65919670a4e0b", - "size": 239495616 + "checksum": "d5ad436e256291df5e2248d1026a971229dde43544db3267892afd5c89934eb1", + "size": 241531264 }, "win32-x64": { "binary": "claude.exe", - "checksum": "e18c7dcfad4a3f5d33d202ec2dde630b648cf5b41622154d6210e793c7cceadc", - "size": 254478496 + "checksum": "0a85980a38e9d8fbb2ba51f1d27c3425c7870f75e053ae4be266d23e10edde4a", + "size": 253241504 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "9e0deb10c45108612484ce558fad378206d5ac23feb203067450e6c38d001241", - "size": 251203232 + "checksum": "9c9e1c68d50bb80f5e8d4a91645f042d4802a4fb0f87c34a504ecbb69a54860a", + "size": 249304224 } } } diff --git a/pkgs/by-name/fe/feishu-cli/package.nix b/pkgs/by-name/fe/feishu-cli/package.nix index ef26179f3473..e6f66c86adc1 100644 --- a/pkgs/by-name/fe/feishu-cli/package.nix +++ b/pkgs/by-name/fe/feishu-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "feishu-cli"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "riba2534"; repo = "feishu-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-4+YEU0gRL3WF19a949QweVIdtXt8BWMummjK9ypBHXQ="; + hash = "sha256-n7CqaVpuzJg5oPI7RixvDp8xSA93292yY9K8jmzd+68="; }; vendorHash = "sha256-MZv772U+3+Fcanaiuhz+OCqfIsYyCG7B4iZOnEftbi8="; diff --git a/pkgs/by-name/ge/gefyra/package.nix b/pkgs/by-name/ge/gefyra/package.nix index 5e18be3f7040..3d831bb775e7 100644 --- a/pkgs/by-name/ge/gefyra/package.nix +++ b/pkgs/by-name/ge/gefyra/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gefyra"; - version = "2.4.1"; + version = "2.4.3"; src = fetchzip { url = "https://github.com/gefyrahq/gefyra/releases/download/${finalAttrs.version}/gefyra-${finalAttrs.version}-linux-amd64.zip"; - hash = "sha256-XS+vtwb6UIJK7f3R3QLoyX9+P4n79Fh+v7odiot7Yic="; + hash = "sha256-HWcW4JX8XglcB3OkJKdaKtZ6D9Mdg3jff0nqHOS4ESg="; stripRoot = false; }; diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index 41403e94cb77..10ed2678e89a 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "glab"; - version = "1.92.1"; + version = "1.93.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-4DUEsh2T5rx/0u79+edMLAjTRUmXxlbA0SVH/EwoeVo="; + hash = "sha256-ra+cXfB5DtFXmpgxSTZuXUgRY8Uzsxc84cmmAGq06AE="; leaveDotGit = true; postFetch = '' cd "$out" @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-fnVY1WEwzuRjHXQSGLl1c7bQXxzOHFEPlb/DhntYm2U="; + vendorHash = "sha256-FBYTwTGQ2ma4dEeCGpvduGAPux5g7MsxBHQy8QXXVgQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix index 2dbfbd176d52..a871f30cac5d 100644 --- a/pkgs/by-name/lu/luau-lsp/package.nix +++ b/pkgs/by-name/lu/luau-lsp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau-lsp"; - version = "1.66.0"; + version = "1.66.1"; src = fetchFromGitHub { owner = "JohnnyMorganz"; repo = "luau-lsp"; tag = finalAttrs.version; - hash = "sha256-llirkKL/2X4srwZzTcf0a7yX7AhOgdlsu1jr6yacWV0="; + hash = "sha256-Lz6tnCfkjQc7YhfCETaFLAvW6fTrRwmELxBNURavNeY="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index e34f51d94071..0a09dfcc4d3a 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -31,13 +31,13 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "modrinth-app-unwrapped"; - version = "0.13.3"; + version = "0.13.6"; src = fetchFromGitHub { owner = "modrinth"; repo = "code"; tag = "v${finalAttrs.version}"; - hash = "sha256-vBBa2T5+JYvfO9eibJtcpq9y/GMh2PbO0ZBdkah9gms="; + hash = "sha256-47uokwYsEg5D0lyHdpqfvKlsuXZK0sm5YIWwNjVGsKQ="; }; patches = [ @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '1.0.0-local' '${finalAttrs.version}' ''; - cargoHash = "sha256-dbndaNIZzGX4QjGTJbDsKOReB5OeiBmQr8XNzfWPe/o="; + cargoHash = "sha256-Mnb16KO+xcocUuvQN4woUlb1aFNzzwyIeRP4mIcA1Fk="; mitmCache = gradle.fetchDeps { inherit (finalAttrs) pname; data = ./deps.json; @@ -77,7 +77,7 @@ rustPlatform.buildRustPackage (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_9; fetcherVersion = 3; - hash = "sha256-yF8sHG2+08JmtrKVLT0/gUPFJGgGWFMvHbi+uen2uwU="; + hash = "sha256-Hk32LBD20F2LRgqNs8f1j3VdUxKoTPWs3yJvOghsEbI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/monkeys-audio/package.nix b/pkgs/by-name/mo/monkeys-audio/package.nix index 7876de1b7ad9..cd254c40c895 100644 --- a/pkgs/by-name/mo/monkeys-audio/package.nix +++ b/pkgs/by-name/mo/monkeys-audio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "12.67"; + version = "12.75"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-36iH2iIvR8CVA8uvldIGiPxL5HkNUK94PpCzvffWx6o="; + hash = "sha256-IH72Sjgh4ERkufo1rEHucbpOeMuNeEhfrQBpXvvAvhg="; stripRoot = false; }; diff --git a/pkgs/by-name/on/onedpl/package.nix b/pkgs/by-name/on/onedpl/package.nix new file mode 100644 index 000000000000..fb0e606ab890 --- /dev/null +++ b/pkgs/by-name/on/onedpl/package.nix @@ -0,0 +1,54 @@ +{ + lib, + intelLlvmStdenv, + fetchFromGitHub, + cmake, + onetbb, + nix-update-script, +}: +intelLlvmStdenv.mkDerivation (finalAttrs: { + pname = "onedpl"; + version = "2022.11.1"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "uxlfoundation"; + repo = "oneDPL"; + tag = "oneDPL-${finalAttrs.version}-release"; + hash = "sha256-NfyV34mdKfCxlU+l6ETKWcC9MwvVEgwcBedtLe6WCV4="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + onetbb + ]; + + cmakeFlags = [ + (lib.cmakeFeature "ONEDPL_BACKEND" "dpcpp") + ]; + + # Build times for the tests are excessive + # and to be truly meaningful, they'd require a GPU + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "'oneDPL-(.*)-release'" + ]; + }; + + meta = { + description = "oneAPI DPC++ Library (oneDPL)"; + homepage = "http://uxlfoundation.github.io/oneDPL"; + changelog = "https://github.com/uxlfoundation/oneDPL/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ arunoruto ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/po/poedit/package.nix b/pkgs/by-name/po/poedit/package.nix index f7522b1e1495..c105a1fb63b5 100644 --- a/pkgs/by-name/po/poedit/package.nix +++ b/pkgs/by-name/po/poedit/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + nix-update-script, autoconf, automake, libtool, @@ -24,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "poedit"; - version = "3.6.2"; + version = "3.9"; src = fetchFromGitHub { owner = "vslavik"; repo = "poedit"; rev = "v${finalAttrs.version}-oss"; - hash = "sha256-Lb1R7GMB0GeS2xZASR7w4ee33mMEKP9gPabRHkHlIJI="; + hash = "sha256-N/o57n624b+StXrT6jBxEFSGElcHdV6wrf/Y2JbA55k="; }; nativeBuildInputs = [ @@ -77,6 +78,13 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "(.*)-oss" + ]; + }; + meta = { description = "Cross-platform gettext catalogs (.po files) editor"; mainProgram = "poedit"; diff --git a/pkgs/by-name/qa/qalculate-gtk/package.nix b/pkgs/by-name/qa/qalculate-gtk/package.nix index cbbe1ae1cfd8..06bb06c1ae64 100644 --- a/pkgs/by-name/qa/qalculate-gtk/package.nix +++ b/pkgs/by-name/qa/qalculate-gtk/package.nix @@ -2,10 +2,12 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, autoreconfHook, pkg-config, libqalculate, gtk3, + gtk-mac-integration-gtk3, curl, wrapGAppsHook3, desktopToDarwinBundle, @@ -22,6 +24,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-JZfolSRLRLtv529f25lEPYOlz+y+EdRqKA0Y5d1dK3s="; }; + patches = [ + # Is meaningfull only for Darwin but is better applying unconditionally. + # Can be removed in 5.11 probably, see: + # https://github.com/Qalculate/qalculate-gtk/pull/705 + (fetchpatch { + url = "https://github.com/Qalculate/qalculate-gtk/commit/2f1b6a32d98f122d44d158c20f79a5b9aaf9669f.patch"; + hash = "sha256-v9T8wWvqlI9l6BUszf/575qmoFvh88Cdj/m2XqV8Q4k="; + }) + ]; + hardeningDisable = [ "format" ]; nativeBuildInputs = [ @@ -30,11 +42,16 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; + buildInputs = [ libqalculate gtk3 curl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + gtk-mac-integration-gtk3 ]; + enableParallelBuilding = true; meta = { diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix index ddee6bf15594..be212b258c60 100644 --- a/pkgs/by-name/ra/rattler-build/package.nix +++ b/pkgs/by-name/ra/rattler-build/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rattler-build"; - version = "0.62.2"; + version = "0.63.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "rattler-build"; tag = "v${finalAttrs.version}"; - hash = "sha256-nFXtbY2gVrS7zLTcCMOJLyL79Xi7Zw463OtoGL4zUYI="; + hash = "sha256-/BcVqquY0ggorzY0EJx9lwAWvx1W1I/ynn8GUx32h4o="; }; - cargoHash = "sha256-dOXCwbasxqbcInm3YeYxDOckEDrQte9NESKUjf9zslk="; + cargoHash = "sha256-KiHZwGigwj1ORn5TBxYWn+FUjaZBWPauknA9ewibxdQ="; doCheck = false; # test requires network access diff --git a/pkgs/by-name/sb/sbomnix/package.nix b/pkgs/by-name/sb/sbomnix/package.nix index b5144204eb48..84b15485d4b6 100644 --- a/pkgs/by-name/sb/sbomnix/package.nix +++ b/pkgs/by-name/sb/sbomnix/package.nix @@ -11,14 +11,14 @@ }: python3.pkgs.buildPythonApplication (finalAttrs: { pname = "sbomnix"; - version = "1.7.4"; + version = "1.7.6"; pyproject = true; src = fetchFromGitHub { owner = "tiiuae"; repo = "sbomnix"; tag = "v${finalAttrs.version}"; - hash = "sha256-s7mmtbELRcl/7ab5A3fU7f8m4rIm+mBLmXMeYHa7/n4="; + hash = "sha256-LApJvPeyViGJiJPLu7dFBU79SbMKieLVFKbDtFHo7f4="; # Remove documentation as it contains references to nix store postFetch = '' diff --git a/pkgs/by-name/sc/scrutiny-collector/package.nix b/pkgs/by-name/sc/scrutiny-collector/package.nix index 56f712e8f002..697f554f5684 100644 --- a/pkgs/by-name/sc/scrutiny-collector/package.nix +++ b/pkgs/by-name/sc/scrutiny-collector/package.nix @@ -9,14 +9,14 @@ }: buildGoModule (finalAttrs: { - version = "0.9.1"; + version = "0.9.2"; pname = "scrutiny-collector"; src = fetchFromGitHub { owner = "AnalogJ"; repo = "scrutiny"; tag = "v${finalAttrs.version}"; - hash = "sha256-xEMHkISPBHinT6vRyrWPudvmTiX5gYxMkCEoSm2gLWA="; + hash = "sha256-ZQHTwJZBOYJ2De0CmyxXc4Fb2Vt+jKg+YpDDZhSt+cg="; }; subPackages = "collector/cmd/collector-metrics"; diff --git a/pkgs/by-name/sc/scrutiny/package.nix b/pkgs/by-name/sc/scrutiny/package.nix index f41ed84fdf7c..d0e3a4d9c2bc 100644 --- a/pkgs/by-name/sc/scrutiny/package.nix +++ b/pkgs/by-name/sc/scrutiny/package.nix @@ -35,13 +35,13 @@ let in buildGoModule (finalAttrs: { pname = "scrutiny"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "AnalogJ"; repo = "scrutiny"; tag = "v${finalAttrs.version}"; - hash = "sha256-xEMHkISPBHinT6vRyrWPudvmTiX5gYxMkCEoSm2gLWA="; + hash = "sha256-ZQHTwJZBOYJ2De0CmyxXc4Fb2Vt+jKg+YpDDZhSt+cg="; }; subPackages = "webapp/backend/cmd/scrutiny"; diff --git a/pkgs/by-name/te/textcompare/package.nix b/pkgs/by-name/te/textcompare/package.nix index d34d1547bd1a..1aeb7b1fcd5c 100644 --- a/pkgs/by-name/te/textcompare/package.nix +++ b/pkgs/by-name/te/textcompare/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "textcompare"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "josephmawa"; repo = "TextCompare"; tag = "v${finalAttrs.version}"; - hash = "sha256-xcrw2bDRZbphYQUnCbjicYyg+9RfDlIQx8Jr+KRLAh0="; + hash = "sha256-aTRhe2tgP9IIlduaaAffXqRpDgSG08XosHnTxtpmSvU="; }; strictDeps = true; diff --git a/pkgs/by-name/tf/tfenv/package.nix b/pkgs/by-name/tf/tfenv/package.nix index 416876afb871..00600179edd9 100644 --- a/pkgs/by-name/tf/tfenv/package.nix +++ b/pkgs/by-name/tf/tfenv/package.nix @@ -16,13 +16,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { __structuredAttrs = true; pname = "tfenv"; - version = "3.0.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "tfutils"; repo = "tfenv"; rev = "v${finalAttrs.version}"; - hash = "sha256-2Fpaj/UQDE7PNFX9GNr4tygvKmm/X0yWVVerJ+Y6eks="; + hash = "sha256-bwY5QEXugogNrStT859lNOkPoQ+n3BQZGexErxl5nco="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix index 06da056b38c0..ccba32226c20 100644 --- a/pkgs/by-name/up/updatecli/package.nix +++ b/pkgs/by-name/up/updatecli/package.nix @@ -12,16 +12,16 @@ buildGoModule (finalAttrs: { pname = "updatecli"; - version = "0.116.0"; + version = "0.116.3"; src = fetchFromGitHub { owner = "updatecli"; repo = "updatecli"; rev = "v${finalAttrs.version}"; - hash = "sha256-34XXA8cBifuPC4Sls34D4kFkMOv9+1oYV3ZqPrWF1zY="; + hash = "sha256-5dJfbw0xoB34XuCym/TcqwdeUORZezfJNu7Plt82VPM="; }; - vendorHash = "sha256-UK6KC/NsEy08mK2tikpAN+H4C61cyHGzqqeoz5kylEg="; + vendorHash = "sha256-cMXepPUJoJGRlQSRSByA2/pjsQXfyH8Va320CywxxDw="; # tests require network access doCheck = false; diff --git a/pkgs/by-name/xw/xwayland/package.nix b/pkgs/by-name/xw/xwayland/package.nix index 4a26bc6945f3..0a36d9525919 100644 --- a/pkgs/by-name/xw/xwayland/package.nix +++ b/pkgs/by-name/xw/xwayland/package.nix @@ -56,11 +56,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xwayland"; - version = "24.1.10"; + version = "24.1.11"; src = fetchurl { url = "mirror://xorg/individual/xserver/xwayland-${finalAttrs.version}.tar.xz"; - hash = "sha256-RZdivo6gRslDhmh9d6h63WBzhovuFPApE+r+u5RbeqA="; + hash = "sha256-JxFaGogZB4QJv2/s/rdyToE3vTZCbecAWls6rgohOP8="; }; postPatch = '' diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix index d2099636373b..222b29dd3b1b 100644 --- a/pkgs/by-name/ya/yafc-ce/package.nix +++ b/pkgs/by-name/ya/yafc-ce/package.nix @@ -12,13 +12,13 @@ let in buildDotnetModule (finalAttrs: { pname = "yafc-ce"; - version = "2.16.0"; + version = "2.18.1"; src = fetchFromGitHub { - owner = "shpaass"; + owner = "Yafc-CE"; repo = "yafc-ce"; tag = "v${finalAttrs.version}"; - hash = "sha256-6+GGxEwn3tenmcukOZPTIZ7UZg/d9uudQP0qwU8mifY="; + hash = "sha256-MdaYAustOMFO2rim0o2FnEhFWINa9E1jEvIQS9SnEHY="; }; projectFile = [ @@ -39,13 +39,6 @@ buildDotnetModule (finalAttrs: { SDL2_image ]; - postPatch = '' - # Yafc finds the root by looking for a `.git` directory, but `.git` is - # removed by Nix to ensure reproducibility. `.github` is not. - substituteInPlace Yafc.I18n.Generator/SourceGenerator.cs \ - --replace-fail 'rootDirectory, ".git"' 'rootDirectory, ".github"' - ''; - meta = { description = "Powerful Factorio calculator/analyser that works with mods, Community Edition"; longDescription = '' @@ -54,9 +47,9 @@ buildDotnetModule (finalAttrs: { YAFC Community Edition is an updated and actively-maintained version of the original YAFC. ''; - homepage = "https://github.com/shpaass/yafc-ce"; - downloadPage = "https://github.com/shpaass/yafc-ce/releases/tag/${finalAttrs.version}"; - changelog = "https://github.com/shpaass/yafc-ce/releases/tag/${finalAttrs.version}"; + homepage = "https://github.com/Yafc-CE/yafc-ce"; + downloadPage = "https://github.com/Yafc-CE/yafc-ce/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/Yafc-CE/yafc-ce/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ diamond-deluxe diff --git a/pkgs/by-name/zu/zuban/package.nix b/pkgs/by-name/zu/zuban/package.nix index e3060670c43c..08174c0cb392 100644 --- a/pkgs/by-name/zu/zuban/package.nix +++ b/pkgs/by-name/zu/zuban/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zuban"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "zubanls"; repo = "zuban"; tag = "v${finalAttrs.version}"; - hash = "sha256-PuD9go5aQJh3qOjWxRX1+43SfHfRcYEulvJ2Mc1lfus="; + hash = "sha256-s2u4or9qittXMt9layFEVrtYLhNgghZQd7VdupUpxqU="; fetchSubmodules = true; }; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildAndTestSubdir = "crates/zuban"; - cargoHash = "sha256-96hcuvsrtFrQgP2CDLEdssvxXFg9Iy00v1DiJJxkdOU="; + cargoHash = "sha256-0CynAjkY1Q6IZ8yyZWL8p/MySriahql2fc3qqsNvPeI="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/development/ocaml-modules/smtml/default.nix b/pkgs/development/ocaml-modules/smtml/default.nix index 69fba965db35..2530db31841f 100644 --- a/pkgs/development/ocaml-modules/smtml/default.nix +++ b/pkgs/development/ocaml-modules/smtml/default.nix @@ -21,6 +21,7 @@ ocaml_intrinsics ? null, prelude, ppx_enumerate, + rresult, scfg, yojson, z3, @@ -31,13 +32,13 @@ buildDunePackage (finalAttrs: { pname = "smtml"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "formalsec"; repo = "smtml"; tag = "v${finalAttrs.version}"; - hash = "sha256-dWZrN0hTxxqGC2queit91GDuw/x5fyRPwHbmKxkvc/w="; + hash = "sha256-7kshzfxWpOx2LyGOs/j/eaTB4b4ba4sp5n4yztGfFV4="; }; minimalOCamlVersion = "4.14"; @@ -67,6 +68,7 @@ buildDunePackage (finalAttrs: { ocaml_intrinsics ppx_enumerate prelude + rresult scfg yojson z3 diff --git a/pkgs/development/ocaml-modules/yamlx/default.nix b/pkgs/development/ocaml-modules/yamlx/default.nix index 152c879c8ac7..15eb9a8ef564 100644 --- a/pkgs/development/ocaml-modules/yamlx/default.nix +++ b/pkgs/development/ocaml-modules/yamlx/default.nix @@ -8,11 +8,11 @@ buildDunePackage (finalAttrs: { pname = "yamlx"; - version = "0.1.0"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/mjambon/yamlx/releases/download/${finalAttrs.version}/yamlx-${finalAttrs.version}.tbz"; - hash = "sha256-Ihar37R1dUFMXSgNGEJu5z6ysFMcrg1Hd74hNLletwE="; + hash = "sha256-9pGp4XSCjMEwsUqHtwoyLBKTUdPjmYccqaU3dLkgVzg="; }; propagatedBuildInputs = [ ppx_deriving ]; diff --git a/pkgs/development/python-modules/modelscope/default.nix b/pkgs/development/python-modules/modelscope/default.nix index 45afcc95a203..db0cacdf3183 100644 --- a/pkgs/development/python-modules/modelscope/default.nix +++ b/pkgs/development/python-modules/modelscope/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "modelscope"; - version = "1.35.4"; + version = "1.36.2"; pyproject = true; src = fetchFromGitHub { owner = "modelscope"; repo = "modelscope"; tag = "v${finalAttrs.version}"; - hash = "sha256-n33vf7GC4Oucw4/dWXeXeThRrkmSCk1rfS4BWzOxl7I="; + hash = "sha256-Cf6s5AujXL5kP7OPVbYSvfkvtAYH/XQJy1BKA8f3sGs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pysequoia/default.nix b/pkgs/development/python-modules/pysequoia/default.nix index 0a42c761d278..83af787ac285 100644 --- a/pkgs/development/python-modules/pysequoia/default.nix +++ b/pkgs/development/python-modules/pysequoia/default.nix @@ -8,17 +8,17 @@ buildPythonPackage rec { pname = "pysequoia"; - version = "0.1.32"; + version = "0.1.33"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-uqWJKz5o2/RJL81LW+sQve7YCAyl6PV3JWBqgktldT8="; + hash = "sha256-BNQJ8Ufggy3IfayPg+kfYwOXWuR5D3QIEJb/Zn7/xYA="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-5TGxD3XOmi5NbTkhtxzZXExHFmveKewdlkDHSt+ZTVI="; + hash = "sha256-M3cIgvdjyzVtFspwEfFEvey4gnyZoBLT6k2ADtrxZn4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/requests-hardened/default.nix b/pkgs/development/python-modules/requests-hardened/default.nix index d1078070bfc3..45d6448958e7 100644 --- a/pkgs/development/python-modules/requests-hardened/default.nix +++ b/pkgs/development/python-modules/requests-hardened/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { pname = "requests-hardened"; - version = "1.2.0"; + version = "1.2.2"; pyproject = true; src = fetchFromGitHub { owner = "saleor"; repo = "requests-hardened"; tag = "v${version}"; - hash = "sha256-J4xQY2W5upJQ3hrA2hjkw8voLpxNPpekNwmyMKKAVAo="; + hash = "sha256-tvSS3z1fhQdcxvsj5vK//mr5xYeIrLl+6/gtnWsiETk="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/rocketchat-api/default.nix b/pkgs/development/python-modules/rocketchat-api/default.nix index 7ff29f6201b4..f3ebbed7d38e 100644 --- a/pkgs/development/python-modules/rocketchat-api/default.nix +++ b/pkgs/development/python-modules/rocketchat-api/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "rocketchat-api"; - version = "3.5.0"; + version = "3.6.0"; pyproject = true; src = fetchFromGitHub { owner = "jadolg"; repo = "rocketchat_API"; tag = version; - hash = "sha256-IbynNQLRgVCY2I9rZ3S4annJ0ogiuRKLHJ2P9qvpj4o="; + hash = "sha256-GYk3ZMAothllMxFhSFc2p4nX0wQOaWtltcrXpwK6lzE="; }; build-system = [ diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 1dcbf858aa89..9e931d62aca2 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -13,13 +13,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; - version = "2.26.3"; + version = "2.26.4"; src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb"; tag = finalAttrs.version; - hash = "sha256-2ZBra4GumVvbr2GQIM2BQ87X6TeX4LdSIUqpj203L/0="; + hash = "sha256-fCaB0LSffjmen1zDjsR/4V3FgH05gkLDHYmLqVpyTLQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 586c53211817..8fdb0586889b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -31355,10 +31355,10 @@ with self; Starman = buildPerlModule { pname = "Starman"; - version = "0.4017"; + version = "0.4018"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4017.tar.gz"; - hash = "sha256-b/q5FfMj9gCJ4+v4Urm5cH1pFyZt+K/XNw+sBL/f7k4="; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4018.tar.gz"; + hash = "sha256-bY2yl9hRFB+k/3dI3/BVG+K6j5pELtnKrGRNvMmjbt0="; }; buildInputs = [ LWP