diff --git a/doc/languages-frameworks/octave.section.md b/doc/languages-frameworks/octave.section.md index 55c5d511581d..44b241c4fc0a 100644 --- a/doc/languages-frameworks/octave.section.md +++ b/doc/languages-frameworks/octave.section.md @@ -76,6 +76,17 @@ See [Symbolic](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/oct `requiredOctavePackages` : This is a special dependency that ensures the specified Octave packages are dependent on others, and are made available simultaneously when loading them in Octave. +### Testing Octave packages {#sssec-testing-octave-packages} + +Octave packages built using the `buildOctavePackage` function do not have a `checkPhase` or `installCheckPhase`. +Instead, the tests `testOctaveBuildEnv` and `testOctavePkgTests` are added to the package's `passthru.tests`. + +`passthru.tests.testOctaveBuildEnv` tests whether the package can be used by `octave.withPackages` successfully. + +`passthru.tests.testOctavePkgTests` runs a `pkg test` command for the package. +If the package needs additional inputs to successfully run the tests, the `nativeOctavePkgTestInputs` attribute can be specified. +If the package needs environment variables to be set to successfully run the tests, ensure that `__structuredAttrs = true;` in the package, then set the environment variables you need in `octavePkgTestEnv` (which should be an attrset where the key is the name of the variable and the value is its value (as a string)). + ### Installing Octave Packages {#sssec-installing-octave-packages} By default, the `buildOctavePackage` function does _not_ install the requested package into Octave for use. diff --git a/doc/redirects.json b/doc/redirects.json index 03285903666e..862a81446182 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -695,6 +695,9 @@ "footnote-stdenv-find-inputs-location.__back.0": [ "index.html#footnote-stdenv-find-inputs-location.__back.0" ], + "sssec-testing-octave-packages": [ + "index.html#sssec-testing-octave-packages" + ], "strictflexarrays1": [ "index.html#strictflexarrays1" ], diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 68887b5cd8bb..efa1c334af24 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -22725,6 +22725,12 @@ githubId = 3302; name = "Renzo Carbonara"; }; + replicapra = { + name = "replicapra"; + github = "replicapra"; + githubId = 154707993; + email = "nixpkgs@replicapra.dev"; + }; repparw = { email = "ubritos@gmail.com"; github = "repparw"; diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix index 094a98e261ca..b28eb12b2ef1 100644 --- a/nixos/tests/incus/incus-tests.nix +++ b/nixos/tests/incus/incus-tests.nix @@ -201,33 +201,28 @@ in server.succeed("systemctl --no-pager -l status apparmor.service") server.wait_for_unit("apparmor.service") '' - + lib.optionalString cfg.feature.user ( - # python - '' - with subtest("incus-user allows restricted access for users"): - server.fail("incus project show user-1000") - server.succeed("su - testuser bash -c 'incus list'") - # a project is created dynamically for the user - server.succeed("incus project show user-1000") - # user can create an instance - server.succeed("su - testuser bash -c 'incus create --empty'") - '' - + lib.optionalString (lib.versionOlder cfg.package.version "6.21") '' - # users shouldn't be able to list storage pools - server.fail("su - testuser bash -c 'incus storage list'") - '' - + lib.optionalString (lib.versionAtLeast cfg.package.version "6.21") '' - # users shouldn't be able to read storage pools - server.succeed("su - testuser bash -c 'incus storage list'") + + + lib.optionalString cfg.feature.user + # python + '' + with subtest("incus-user allows restricted access for users"): + server.fail("incus project show user-1000") + server.succeed("su - testuser bash -c 'incus list'") + # a project is created dynamically for the user + server.succeed("incus project show user-1000") + # user can create an instance + server.succeed("su - testuser bash -c 'incus create --empty'") - # pre-check that there is a pool source - pool_source = server.succeed("incus storage get default source").strip() - assert pool_source == "/var/lib/incus/storage-pools/default", f"Expected pool source /var/lib/incus/storage-pools/default, got {pool_source}" + # users should be able to read storage pools + server.succeed("su - testuser bash -c 'incus storage list'") - # users shouldn't be able to read storage pool config - code, pool_source = server.execute("su - testuser bash -c 'incus storage get default source'") - assert pool_source.strip() == "", f"Expected empty string, got {pool_source}" - '' - ) + # pre-check that there is a pool source + pool_source = server.succeed("incus storage get default source").strip() + assert pool_source == "/var/lib/incus/storage-pools/default", f"Expected pool source /var/lib/incus/storage-pools/default, got {pool_source}" + + # users shouldn't be able to read storage pool config + code, pool_source = server.execute("su - testuser bash -c 'incus storage get default source'") + assert pool_source.strip() == "", f"Expected empty string, got {pool_source}" + '' + instanceScript; } diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix index f38479423581..9223d36b3a71 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-pce-fast"; - version = "0-unstable-2026-01-23"; + version = "0-unstable-2026-03-13"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-pce-fast-libretro"; - rev = "52675734da114a19b3705f03906b1455f3d76644"; - hash = "sha256-hITofg0UB5sGNOKAijfORz3ZtHY5CCdqFmbT4nMkmG8="; + rev = "0fa44d2500ebc9bf96d2808209be27a69006df79"; + hash = "sha256-NBL506+aaLRQh9XawvvynNRunWDPqxrt7ngy6FCmiIQ="; }; makefile = "Makefile"; diff --git a/pkgs/applications/misc/twitch-chat-downloader/default.nix b/pkgs/applications/misc/twitch-chat-downloader/default.nix index 79e6a2e6e88c..99c95666de44 100644 --- a/pkgs/applications/misc/twitch-chat-downloader/default.nix +++ b/pkgs/applications/misc/twitch-chat-downloader/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { pname = "twitch-chat-downloader"; - version = "2.5.4"; + version = "2.5.5"; format = "setuptools"; # NOTE: Using maintained fork because upstream has stopped working, and it has @@ -19,7 +19,7 @@ buildPythonApplication rec { owner = "TheDrHax"; repo = "twitch-chat-downloader"; rev = version; - hash = "sha256-mV60ygrtQa9ZkJ2CImhAV59ckCJ7vJSA9cWkYE2xo1M="; + hash = "sha256-9wIp0uttVBOdexOMb8VvpUEEdZ97SGSlZcFQ4jM/tqM="; }; postPatch = '' diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0a955519bbc0..8f100dfbe2a9 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -400,13 +400,13 @@ "vendorHash": null }, "fastly_fastly": { - "hash": "sha256-EQlK21yB1PcM74NBKnslB/Q4Y9JO1SOzvmpGZkJ74HQ=", + "hash": "sha256-qEBjalezQhcDDeAW/GGf8d70A5iWpWU4C0ABN5HZpAM=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v8.7.1", + "rev": "v8.7.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-xgIAmxi9VvPsWqBtQHchv5UvwALkayxmoMsUp0aYJVs=" + "vendorHash": "sha256-I+8Ql0/m/vYchnGsg0ADX/wpWwgH79ALN8Cl6gzcS2c=" }, "flexibleenginecloud_flexibleengine": { "hash": "sha256-yEZ9JiUSqFFbfqzOOD59ZBv4yFCeUBBKlp6aiUqDqiM=", diff --git a/pkgs/build-support/node/import-npm-lock/hooks/link-node-modules.js b/pkgs/build-support/node/import-npm-lock/hooks/link-node-modules.js index 71225738fd46..be925ca08e67 100644 --- a/pkgs/build-support/node/import-npm-lock/hooks/link-node-modules.js +++ b/pkgs/build-support/node/import-npm-lock/hooks/link-node-modules.js @@ -71,17 +71,22 @@ async function main() { // Don't unlink this file, we just wrote it. managed.delete(file); - // Link file + // No need to replace the symlink if it already points to the right target try { - await fs.promises.symlink(sourcePath, targetPath); + if (await fs.promises.readlink(targetPath) === sourcePath) { + return + } } catch (err) { - // If the target file already exists remove it and try again - if (err.code !== "EEXIST") { + // If the symlink doesn't already exist, keep going. If we get a + // different error trying to stat it, fail. + if (err.code !== "ENOENT") { throw err; } - await fs.promises.unlink(targetPath); - await fs.promises.symlink(sourcePath, targetPath); } + // Replace the link, if it exists, atomically. + const tmpPath = `${targetPath}.tmp.${process.pid}` + await fs.promises.symlink(sourcePath, tmpPath); + await fs.promises.rename(tmpPath, targetPath); }) ); diff --git a/pkgs/by-name/ac/actual-server/missing-hashes.json b/pkgs/by-name/ac/actual-server/missing-hashes.json index e85e14e76160..d4f68a3af3af 100644 --- a/pkgs/by-name/ac/actual-server/missing-hashes.json +++ b/pkgs/by-name/ac/actual-server/missing-hashes.json @@ -65,22 +65,50 @@ "@node-rs/jieba-win32-arm64-msvc@npm:1.10.4": "68146cf2b5324c461847da9fd36aa851aeb5655f94b0178a194630c80926e914b71f5fe60a6853c9197516e2b2680303bf28c405963f8655d0099d335c5178bd", "@node-rs/jieba-win32-ia32-msvc@npm:1.10.4": "38deadbf93c6ffb410a880f8938034635e2ca755b956b7cf0b751f287dbfb4b5e58a492f532f23b30e77a7b3889467055c4d9be4d76df8c4416d97f96c242f93", "@node-rs/jieba-win32-x64-msvc@npm:1.10.4": "073b499e19d211f416a604a791c7a29c99552b328d0565d8381258a49682f87014274eebdaafcc9477238a2fd555b0e18fedccb45a49715ad3332958c6f43905", - "@oxfmt/darwin-arm64@npm:0.26.0": "7935654492f237b7bd24ee1a08c6455d797a97f435e93490e9a315858b4fe3cd961bbd9c81e951de8c0383cf094b0f816b316a2ff26bd1dcec3016c53b4036f1", - "@oxfmt/darwin-x64@npm:0.26.0": "b375a2b7fe93831a1d517ce86fd275c2c67ace54b8b5de8b4195006863b17f0fe99854dd09d364000ef0a0797eaadf97476e5d30e6eb94988062851c8d3dd635", - "@oxfmt/linux-arm64-gnu@npm:0.26.0": "a5239df32f8512334652ebc271df540e48d72e3971f6d363aab76085643f2f4324a5f5ec0c2fd3ffb8c1e84b482fc1835ac481f16790f9d2c8a9c2e70494ecbc", - "@oxfmt/linux-arm64-musl@npm:0.26.0": "20365527d2d4fd48cd04858ab228ca62df0a6c43c6bc1b483ef42feb71c0ad54bf70b847b2495e4509843bbad8f0b82bad026d565b7890695e42f1872334cf46", - "@oxfmt/linux-x64-gnu@npm:0.26.0": "8a0e58fc960d350c00fed4ffbc48572bc8916ffc5c837512c4b397cf91deed916410ca8353a99536943a62e45f5afaf3ed6ec7ba286be35377906eba47064936", - "@oxfmt/linux-x64-musl@npm:0.26.0": "de6737ad58451a8203f1c5c8af797080ea9f8efdc52d00e8ad20ba3855cfdaf796cdb6840e5ac0407873aaadae680bb038313a52218332748ff470b4981e7ee5", - "@oxfmt/win32-arm64@npm:0.26.0": "d70bf0c6117170dd3ce739276352baf59907b74c91e957f0b0fe231f12c2d459eaff37cd8e15a6c9e74c6af98cb5fbec8222948a35f9536196417b74a864c2d8", - "@oxfmt/win32-x64@npm:0.26.0": "8a1dfa4ad594b174f44c9e5a37db585b29c2022c39609007eefb2c5705325268dd88b1bcd98087c87052d48b350205f4997b8a3763f532820491354036e2cfa8", - "@oxlint/darwin-arm64@npm:1.41.0": "f89cbee9ac6b471aacc5f7f9ccd83488768c962da0efffbb87f3c74cd4916744119b553435900d6370c340e0f2d26641d44f073d0394a55667b1f3dda7a4f311", - "@oxlint/darwin-x64@npm:1.41.0": "21f664015813c05f24aeeab89f1819c5b8ae732ccdce3aedf1a8e1c87db3784acd51f9c4e4a1b7368d7fe62ce22e0f5230abdbd3bbbeb01c3b9c2a0a03c5688d", - "@oxlint/linux-arm64-gnu@npm:1.41.0": "6b4f5aa8d658f46989febb54256ab23f3ac98a74d2f23607df97af405f07a62b4e734e138dec94508057937988da33d169e91a69a016b6bfc832ed5412faa311", - "@oxlint/linux-arm64-musl@npm:1.41.0": "3b35d850ed96305fdbb565bbcf065796558624107456c28dee1728230f53f6e10d39564b86c5c716b11d6056fe75614358e5c607ce186084ad077fc298336c80", - "@oxlint/linux-x64-gnu@npm:1.41.0": "d8788979fa8a7fc4dc1ceb5e382c470b2c41a0dafc75c528792b87290466abe5f26ebca4c7aa286a90ee88852dca801bd168a6756eb8fda1a08faf3443f5aff5", - "@oxlint/linux-x64-musl@npm:1.41.0": "892e3141ff0187bb0e94775dffbd9781888f771819089d7d4a01429539fc2c9e94c48a25c4998db8d426e49f84d453a108ed2c35056938ff7efd1e1f5fcafed1", - "@oxlint/win32-arm64@npm:1.41.0": "d4a8dfca1ded97ac0394636d77afeea997b1133460dd4f746dfe722827d14d98fa7a4e3a1e1dcf42d1f97654637c99c329cd051ffcec793619c46b017526097d", - "@oxlint/win32-x64@npm:1.41.0": "522705b9fda83477ca691f3cfd139d32cd0dd177b318fb4a98ca55af4ba3c120ab45104ab10194ac81d191cc575d898c768f25ff23c73604a03f4c8ee1ddc412", + "@oxfmt/binding-android-arm-eabi@npm:0.32.0": "edad7a793a30eef9d34b2d904fc50a849e8aecfcd8e2c2246cadb6fce8ae14c371100f1fa636c5b66b9118949259eefb968df4391c4047c3a92e678696697b64", + "@oxfmt/binding-android-arm64@npm:0.32.0": "e1c3eb67b295627353f0ab9874e53aca9539a35f8157fbbfc6021ccee4d2761bf27db7905b106afe30a646af9e2c802c226f4a58c85b3431df88d352d02a4e2d", + "@oxfmt/binding-darwin-arm64@npm:0.32.0": "0c4a98fb78f9984cda0f74f7f64145597beca8ba2916333bd9e6f4aaf49fdbe5f5cc99fe2aff4a202c7e64d640251997c3ed9d64eefa1b51382f92c47518723a", + "@oxfmt/binding-darwin-x64@npm:0.32.0": "b97916dd2fe96a09b387f3e950efcce3f4f9b1302c7efa5e7a9b587154929d072a7105aca9d6e4e140ab30b4901d803b1ba5657d0181cbe12a75b92d94400b42", + "@oxfmt/binding-freebsd-x64@npm:0.32.0": "5c0eb0d0e7911ee3f6e062c0bc122b92a09aba4d4d55236df331ca24eeb3e90848064c45570a44bbb1fb2cbafc0aab06ea4f85d2c07b68ff4fc1d2bac60d21a2", + "@oxfmt/binding-linux-arm-gnueabihf@npm:0.32.0": "3e76615d5369cdc639983209994c7ede0fbc5aa2e05674cf94f5bd325e290fb772f98ad7576da30bb744634e14c82bd7ba03a3715e1977c87c0204918ea7e18d", + "@oxfmt/binding-linux-arm-musleabihf@npm:0.32.0": "a4de9deb92d9582a6bce41316d14d9a0867812db561f8514e1f88d6783bb86d396cf39289c203cf1d840636e65687b8fab40ee3823459fae23579778743dc7a9", + "@oxfmt/binding-linux-arm64-gnu@npm:0.32.0": "c8d7d6011b3ea535399d40790ac89ec04211dc54c066f2bd624c131df51653be47f8ddfe499bdaebeb1ef655cf72a09ebbd58446f376eae6153ed45c8513dbad", + "@oxfmt/binding-linux-arm64-musl@npm:0.32.0": "a6d4281feb3babe222ca0c12cb837ee3f836e6c36f25f036376e8df7976c0ecd46588e202f4553d9858ceb44c277604803870ae3847cca697eef883dd16e878e", + "@oxfmt/binding-linux-ppc64-gnu@npm:0.32.0": "69d40a7e7ffe699e07d22b8581ef4f9152075a88f8ee87f83c02aea5d8666c3445d4b121125b2db0b05d533447f8f8b15a86ce10151bfb4d5a48e9ed985cd514", + "@oxfmt/binding-linux-riscv64-gnu@npm:0.32.0": "352e28463804f4f5774a7c6375314c8f66e910945da060e7129ea6f9ef4e2b05172f398825279c008ecd2df278fdf25ffe81ceb2c42c7be745dad1e8caea7176", + "@oxfmt/binding-linux-riscv64-musl@npm:0.32.0": "e108350c2ebbadd6e0c7e7193f87ec816c3175478c17d63b8eebbb8901dff5c73d14265beff33b9613fc17ffa62956831f57d74eb326defed61c9238386c99d7", + "@oxfmt/binding-linux-s390x-gnu@npm:0.32.0": "6cf9b827c188e2d2676d3e52ec5c80d07c1ec1dee8d2b8f21784e70b2f881efdc1b0566d6ff611104b62d83e880b91e253cea6f6154052a724f70e5bbe41e1b9", + "@oxfmt/binding-linux-x64-gnu@npm:0.32.0": "65308d09753a0390eb1485297d853c943b2c28fadcb11f8e566fbeb74e58ea7b977f996eb14f2f839ae58bddc1fd9fc2562dc21807aa4a50f86be5ed5f506435", + "@oxfmt/binding-linux-x64-musl@npm:0.32.0": "13fe9b607e30cce76e9600ac510035b27f387d57cb3424927853f74af1467580c5bfee6021774044ae12b817985a49793711d6f9f10eb368d762d7bc18ae709d", + "@oxfmt/binding-openharmony-arm64@npm:0.32.0": "5df994c65584856841c72097fd9bdba825446cc37b36538655f440af61511bd9a7fc54691e5fa67af116f16cfc88dfe25c2d3cd292c098165cde4e598e96ca71", + "@oxfmt/binding-win32-arm64-msvc@npm:0.32.0": "425871b575111f7738404b70d927ec99d5cea4486780371f9b7fb08165afd26988cbfd9248d6daea6a922bcfd8cbe16caa6374fdfa9d3b62b317f5cd565f83ef", + "@oxfmt/binding-win32-ia32-msvc@npm:0.32.0": "4cd056aa20632b2b40bb29d31e6f3f29b7645113339d514bcbe67fcf532ee474e357b851366177d4e333e6e9cce8008099b7c81d2098b5c2c3dc3b1c3bef7746", + "@oxfmt/binding-win32-x64-msvc@npm:0.32.0": "177af22b383015f3e4ebb46ae308e21c28df9a157b098533c45039de96008ab05b0f91f0148c159b4d5f6ca1627b8e600d71c2ce800826bda5961b9e23b4eb95", + "@oxlint-tsgolint/darwin-arm64@npm:0.13.0": "452933ef927377bf5a8339abae8480168838dcf43dbac185138dced6bcb182a82415e45bceb60176cefed270f3a6f0b25b82c51407ce47b5affa33c147b9e6e3", + "@oxlint-tsgolint/darwin-x64@npm:0.13.0": "7572222e4cc5c3fae9ba51f86f30542d9581b6e9493ebbcb54842f5321a34972e7d6d7e6cf802a096d17bafa983e000fd6a72025897e3181b64a3e5fb4440802", + "@oxlint-tsgolint/linux-arm64@npm:0.13.0": "94cc4283f9c9857778d68030ce4e2e337b258dea153e71fe4d3505b4b4c996d8c69d18c1969953ef5030e64ff2aabb49811ba5a03069d95ed9f880a22502118e", + "@oxlint-tsgolint/linux-x64@npm:0.13.0": "c2855e98f9bcf2ecc893c06518ab23dbcb661ba4c18bca60e6a48d12ed3a52737b23fed5ebe30f0c6afd4df9538a9c34330e15e42de4efb120b7eb0ebfeeba2a", + "@oxlint-tsgolint/win32-arm64@npm:0.13.0": "e46e11b10c2d2e8efdbe110e99153036e34d1f1e19d0eb111c8717602228d3bfcee4aea04f2a1d2510aa6884fdf4c47f3a533782e45a6872721cb828f5065ab9", + "@oxlint-tsgolint/win32-x64@npm:0.13.0": "d200689f40a6bc805b079230f1a731dae3b87d0747ea197ffcfaed94b2131335941c71b2e2df64df917ecf14f13cee4892195727c5fe996909d81edff499964f", + "@oxlint/binding-android-arm-eabi@npm:1.47.0": "1fe82b13b323947787a09cc095c9cefe72918886d06e46913267628d40d56852052d46df8150a1926c743b57345c85d1d975e8052592ed0689c28e103d6c299f", + "@oxlint/binding-android-arm64@npm:1.47.0": "02ad4a87cc64fa3fee178c566bdca5a529be9933c095b5fa22595f4824e2b54d5579fb309971d905f60e56e8071573ba4ac8b9f9613efcd3324c61b2fd6a5447", + "@oxlint/binding-darwin-arm64@npm:1.47.0": "519bc2385dad9e31c547735d783826ba23f1f6d3bf135e17313c5f5ba3a304ca65c991dd9a40fe31d519b7be99d4ad1231a7635e47cd85f1d851626cb7a144bf", + "@oxlint/binding-darwin-x64@npm:1.47.0": "86b116293ce19f3a71dc48bb23872a53a1a7c2b3ecf2e5ab2b839702704f6e360e57350bdb5510e42f3cdf91d29f6d092edc2816fdff400c06f056cef5ba0c91", + "@oxlint/binding-freebsd-x64@npm:1.47.0": "cb2edba0ee407462cc4d602fe707d10efde5104f0ac54674c5ba6081603f2fe9112e0f5b1098357fd5d1e7a9b47ff8994a97338223553709a3d1313cfcb8f219", + "@oxlint/binding-linux-arm-gnueabihf@npm:1.47.0": "e3534b373817510760db8f780185155596084baecd7fb30cdd61a6e6cb8d828b8ad2290f59675893eadabdd61466adc48e6bde2f08cad112fce1386cbb46d5a1", + "@oxlint/binding-linux-arm-musleabihf@npm:1.47.0": "842f447947ad42351d0cab63eb8b1568b2389298a16a5410d8f6dca1870c299fb058853297869320e1911cffeed0676d628773c88c166da4e3c71c674b14318f", + "@oxlint/binding-linux-arm64-gnu@npm:1.47.0": "1c42d827c2faad069ce8bc9ba1710b4e00a3c920617dffb77ca74b1f0b1b1a81dc67aed04f8cc0d53853b9ae847fde8f95ddb2021555c7b5d060d05ecc2039cb", + "@oxlint/binding-linux-arm64-musl@npm:1.47.0": "224a2d0f716e18f651aa8bffc1e91941229a311742aa1687cd0ca4844d3c4d9ce94ca459b3d2250e386c0965e3c15baa05789ce2864e770516efe70ac81375c1", + "@oxlint/binding-linux-ppc64-gnu@npm:1.47.0": "5be589bce11d156ad8ea25a651d3910f4cc0cef7b00ddd8e87db1db007d7d1aa62d665740cc76509368ed734a440c8bf8282a7e851bef5a9a4147d69f45f0d12", + "@oxlint/binding-linux-riscv64-gnu@npm:1.47.0": "35e1582bf13c2907192af9fd1852dd35e647ee3e04a304dcb9b5235e929731f1925920965090722624648b0ae3f6f9d3f5feabfc4913ef261cadd3751894e25c", + "@oxlint/binding-linux-riscv64-musl@npm:1.47.0": "355ea8587334e1f24c4ed0fcf76a453061e44bde1bf27a3d5fff28217bc9b0f5e79f0ecbaf0e25b5aa454cd777283a037157f482a9ad9eb164571956c26eec5f", + "@oxlint/binding-linux-s390x-gnu@npm:1.47.0": "3bb53f7cc220a1a07722f4fa034d23ee0eb7640d4763fc42a513c3f4774c063a7cd50e7960b87f63685f470d9cd48e0dc51ab70a0617ddaa262a808a5881f6cf", + "@oxlint/binding-linux-x64-gnu@npm:1.47.0": "6a37061689e582ffbabd0cd0909ab80580e336460c222ad3b97826b8e417b5825b2437a049d98917bcc50f57636094ecaca3fc9b5cc0d97ec4172c2109dd72bd", + "@oxlint/binding-linux-x64-musl@npm:1.47.0": "4d4907fd33ebe28bc244abadb22be33d45ad9203507b802d26edff461a8217e867bf1167b1fcd50d6e35e4f35e1a235931d7bf2b5e04724ee2585af8b58b01a1", + "@oxlint/binding-openharmony-arm64@npm:1.47.0": "58add856ee91d1454ddc433b7110799374b0fe9e3ed4d39edcffd68d263bca4933d6b8f9f08ce0ebd85318066bece1f41f9083654317e13905a78f4170a0678f", + "@oxlint/binding-win32-arm64-msvc@npm:1.47.0": "9991e2a52d4b1537f13d4897e99264d5649f3819d766fdd33be2c99bc72d77557c55b7575d661d34de36a0d07cc4168a9df10601729fab7aea462a62c0e02293", + "@oxlint/binding-win32-ia32-msvc@npm:1.47.0": "48a2ba7e9c82933cfc45579e4a8adc3611db8b98da644cb204253b88b9b3cdce20cfc9380592cbecb6143d3aaa6885b58bbdf285ac51b6524b3771d2b0224292", + "@oxlint/binding-win32-x64-msvc@npm:1.47.0": "0be3f7d47412c8fc5d516e60e50980a9f90824f5e5ab602f93ab096b12b3dac4ebd1d9079ea8c8bbf07a28e44d31aa8632fcc4ed46cb6882fffb84e97bccf5c5", "@parcel/watcher-android-arm64@npm:2.5.1": "e9c94ede3bd5c5d999d117d22ac8032a17f8ebc72db3eff04ccb2b4e6718db19f24bf29a66a610e03f4ee95e2cd7b2d30c15b1845eb897b971fec75dbdd76141", "@parcel/watcher-darwin-arm64@npm:2.5.1": "0cab55a55c128ac5742388fc8dbfeb9877018509943801ce8a52b57bb6dca24189d025d38684b1e482cb7816368a52c6434dfe45d3997e2fd2509276f48774ea", "@parcel/watcher-darwin-x64@npm:2.5.1": "bf07b8ca9a435fb885fb0ca6565204d2f2098d7f632faf26a6478bb39f538c73b50afca17c193dc189a80a864d85e40f924ec7f21a0e7ad7d0de6f97f7154134", @@ -114,16 +142,16 @@ "@rollup/rollup-win32-arm64-msvc@npm:4.40.1": "d4c9002b95c4b6ee842faaa5087582a0772578c0969c9ee470697a6d3fd251845481285f5a4027bc8c0524bf277f3437844cae9936c5f96ca753dcca61e2f47f", "@rollup/rollup-win32-ia32-msvc@npm:4.40.1": "446e3ce5b037d1847af84e9a2b52734ae9f5425937fec2558d26ffb5c253dd8925dc35591abd78b0d43f7154222e47ee9aaeb3b167b3d69627805a97c5147185", "@rollup/rollup-win32-x64-msvc@npm:4.40.1": "39fe3c6b86ef880fb1d1261f6096d19707584c628271d6ae01f5a5f50d8a24ef62128b5929064c0aed4390c7c0c0b7cc9590e300fa5f10ed624816748da2fbb2", - "@swc/core-darwin-arm64@npm:1.15.8": "4458d26f6682bdbf88565d548a04f6e8ed81ea05691204703a511adf4d4ef1889883da727349b5e492b2e53a4f2969fd06ea34f84e32cc5a963ac25194d6caa1", - "@swc/core-darwin-x64@npm:1.15.8": "4075f73359b4cda8d7bcc68a636fbff60db3dea0ef4813b7e1a5ebdaa2c1197b4f888f7565a411f77ee5e8fe2398e3f1c27dfe06b2b087e7004009aeefac2019", - "@swc/core-linux-arm-gnueabihf@npm:1.15.8": "6b82976fd35007ac7be41a7d8529dbb0c93bfa858e532c6a8d3fd899c41ecc9976fa40746f6005cd48d82340fcdf0a426296bef248ac7b77334c3744141fa823", - "@swc/core-linux-arm64-gnu@npm:1.15.8": "ed3a8f363bc589886d44db58dabe6d53ce23d2cb8fe93a80fd05dd1ff46ebf438d2f1d38cf4144f4d5b89504dc73d15bd84540ac23b20d4aeb4f463de99c416a", - "@swc/core-linux-arm64-musl@npm:1.15.8": "b063f086e3e92f622fd8fb1585bf0cf0b49eb910361844a4bdb0d0165fdb906fe53051cfbcd92ccfcbfb13ae6c0d85f2c12e373a01df5a4136b513ae94d7f626", - "@swc/core-linux-x64-gnu@npm:1.15.8": "7028720f8aa475896f0468dcd77cc2512362082357e4e89d6e31ec559c87d25f0f9d7fc1702d59766217ea4ee7cfc0d1de817fde56958537f8f3ed9259673b55", - "@swc/core-linux-x64-musl@npm:1.15.8": "be913db41e70ae8b9553a759f7a9cc80e50c4f521f058672471a182938c3789605c2122c77c32579d2b739ba4f91fa7e8beb8be31f87858e9b52e199c6644e0c", - "@swc/core-win32-arm64-msvc@npm:1.15.8": "7047d7250e10577921b9250985c8e4408767fca73963b594f1e747f64e77eb5e2a4d2067a58debca9d33b2fd69385fd56410d5dca0e15bb6957aec9475909809", - "@swc/core-win32-ia32-msvc@npm:1.15.8": "4992c3c2fe8fc0dd870319080b806e965278a07d23d0463b16b2c95d0299c0b2e03a1b7bb84c7da41002556b8a71f86b721037e743648321c2186d68bd2b4e32", - "@swc/core-win32-x64-msvc@npm:1.15.8": "4faf5a9cbbe7e7afc038aa26ec658e41614c06116265be1a938e91839b027e1a847a0a767d9821165693f84fb98700032ad92830fee875164b672ac2024a035f", + "@swc/core-darwin-arm64@npm:1.15.11": "5ab85440e42aef149a895e75e6c3574d3e29fcdd4ad76c0dbef4aaa903472cce82457239105d1a43bffaf6d1d4ede967e6a498e7c02946a7a3d713f89eab4c66", + "@swc/core-darwin-x64@npm:1.15.11": "368d7ee0a3624327f2452c7b307d702b677bdf0cf97b86c783b20a8f2083af31eaaba880bf2aee2729e16aecb8b246d51df6473b6b78493b07033528c8f34ef7", + "@swc/core-linux-arm-gnueabihf@npm:1.15.11": "679c4e43f25710e1a51a543e32f1142e906597c06862bb202c2a677f6aaee2dfeba6903c1c63c7d34c63b9ab73a610e47680a44d023f7a213b97377e904082b8", + "@swc/core-linux-arm64-gnu@npm:1.15.11": "c1347763e73fd8c26757ed90f55f805fead5a045b8e5ef08a2393c31dc79e704a3a768631e7db3fa5c97937acbe42dd4039a15eb90b9bdf691fff5b2dbf055bd", + "@swc/core-linux-arm64-musl@npm:1.15.11": "95135575cfb9dc708add3c238dc16f72ff9fbcb98f52d36b078b06e7183b9e3e56eb8324d84a47d5e222c71e403503eab36c365d7d60c46f323bb8c2599c8377", + "@swc/core-linux-x64-gnu@npm:1.15.11": "2d6569466096c7b2e79283ae771bce075f29f50a09f333656983d616e1a92975fc744a37ef6facc229839d121479004498c08738f8a01f6d23dbe2e417793aa3", + "@swc/core-linux-x64-musl@npm:1.15.11": "9115262bfabe0dcb3064506a3ba7b7583a383b550b0ce69aa1d7224ac98e1fd77702b9b039e6bce3827c0781f4111113d19fca01a36d0a5755c5185938b758a0", + "@swc/core-win32-arm64-msvc@npm:1.15.11": "66d61ad408757f20f5a98e1c85f9ae84863ea68ca80bb29822e1c23c423698db466e41f139226c0ff30b471531644f91085e84355531964165cfdf41c5453151", + "@swc/core-win32-ia32-msvc@npm:1.15.11": "9ac651bec3106cceb2f97d443f1ed3cafa30bbfae0574a4c3023eeeb4d20bdb1192203c673e5140c43889e15d5a163d42b7c379a04b6cc6e6c656ced0832f175", + "@swc/core-win32-x64-msvc@npm:1.15.11": "e7f412c2cf9532464b9ebeec7af8c1caa95ec569b89d7eb004315ab65661a2c66056f85869a11758cba4497ac432322d14cc904bfe6c09d2ff71b36da63a011e", "dmg-license@npm:1.0.11": "36c0a7b030801b91216affa9b2bb00caa345b2327f298accb2263a80a0320ca305f90b99da68007d187c830c543410d58a0a2bbc229e8d169b0e1d1652ff42aa", "glob-hasher-darwin-arm64@npm:1.4.2": "1abc74c6f6c6251b8bea6e412090eff4e4918f3489a371971840ee81534344b9f9e62a610efb98157970fc46561161bf23382c8572578da98a7e884d6fb6853e", "glob-hasher-darwin-x64@npm:1.4.2": "44110045f0b2e0b3abaf4f70f917a3c57b9b0c6ee56e5d02932e1772cc63a36b066fb3bc1e6a275c40978b3b2d2ad62752e899bcd966930d4df8884b1d554764", @@ -131,4 +159,4 @@ "glob-hasher-win32-arm64-msvc@npm:1.4.2": "809cd80c3e3e6e7bb82e2fc2ba917ce3ca91287a83faaa7b63cf0a1fcb14c228e974baffb731fa82c34dd8a9236622ab2b5238e21b62f8b0267adaa2da7b4de6", "glob-hasher-win32-x64-msvc@npm:1.4.2": "1ab2a78b788b21754f656cae706fa2e1db34185ffef79a6b85d3f24e169bc01e1faadc6a2588eef5fde5a1fe6ced68acfb815c7b03024c0a746e7c5631b0959e", "iconv-corefoundation@npm:1.1.7": "0189733ef51a9f481379202cb1919f2677efc44aa014ba662a6fd99e47993e350eab0ff724ed18cda8011c9b78c4702b2d374f732955f1def3fd2a14a29d25c0" -} \ No newline at end of file +} diff --git a/pkgs/by-name/ac/actual-server/package.nix b/pkgs/by-name/ac/actual-server/package.nix index 6465f9c292ef..ef1e664a7551 100644 --- a/pkgs/by-name/ac/actual-server/package.nix +++ b/pkgs/by-name/ac/actual-server/package.nix @@ -13,13 +13,13 @@ let nodejs = nodejs_22; yarn-berry = yarn-berry_4.override { inherit nodejs; }; - version = "26.2.1"; + version = "26.3.0"; src = fetchFromGitHub { name = "actualbudget-actual-source"; owner = "actualbudget"; repo = "actual"; tag = "v${version}"; - hash = "sha256-8cRt1WKa4Yp6rE2Jzko0rKJoCp7+KSzVdtKcv/aKK8o="; + hash = "sha256-V7dysdY5m5b96aPEqD7xsNhvZrfm1FnX9I2D6+d/uAg="; }; translations = fetchFromGitHub { name = "actualbudget-translations-source"; @@ -27,8 +27,8 @@ let repo = "translations"; # Note to updaters: this repo is not tagged, so just update this to the Git # tip at the time the update is performed. - rev = "3917dc0ea36608c3a1857518f0205d8ab4011d69"; - hash = "sha256-g4GI+zIKZ63lL+NC+EMEk01GVlbUDVGey0UgqO6Fk+8="; + rev = "d65b77cf33d4456f037605215d1be64b8b0644c0"; + hash = "sha256-xVokghZuM/q0meTeK3sKYVNQcCgJnhq6htvwPYhQ3Go="; }; in @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-7ZZGtwQM9+odozLi95MFshNjde3oFTgWkgimj8Ei2W8="; + hash = "sha256-wdOIUYtiLbAkLngl+hIB/TlMLuX/YWZ9dt+a4qm+Fp8="; }; pname = "actual-server"; @@ -139,8 +139,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://actualbudget.org/"; mainProgram = "actual-server"; license = lib.licenses.mit; - # https://github.com/NixOS/nixpkgs/issues/403846 - broken = stdenv.hostPlatform.isDarwin; maintainers = [ lib.maintainers.oddlama lib.maintainers.patrickdag diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index 66d2041d5bff..1e275362345f 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -8,17 +8,17 @@ buildGoModule (finalAttrs: { pname = "aliyun-cli"; - version = "3.2.12"; + version = "3.3.1"; src = fetchFromGitHub { owner = "aliyun"; repo = "aliyun-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-RY6d3JaiRKaht8MAg0IETwFZVvoDHmaXpg9XcLlE0DM="; + hash = "sha256-yCHxFJyh4TpQ4Me/WR5YKc7ff7m+qidIWQyKOC8umI0="; fetchSubmodules = true; }; - vendorHash = "sha256-hDgwZiXRjcuQOo7ezjtGS1DawtOffllW64gsGKnTFQM="; + vendorHash = "sha256-smlPjS2kda0ij+3Jch/FKRHm820Zux6vWXooqhm6fCA="; subPackages = [ "main" ]; diff --git a/pkgs/by-name/ar/aribb25/package.nix b/pkgs/by-name/ar/aribb25/package.nix index 1e7acc40b713..1ed554b00be6 100644 --- a/pkgs/by-name/ar/aribb25/package.nix +++ b/pkgs/by-name/ar/aribb25/package.nix @@ -48,6 +48,11 @@ stdenv.mkDerivation { }) ]; + postPatch = '' + substituteInPlace src/td.c \ + --replace-fail 'static void show_usage();' 'static void show_usage(int exit_code);' + ''; + meta = { description = "Sample implementation of the ARIB STD-B25 standard"; homepage = "https://code.videolan.org/videolan/aribb25"; diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix index 22000b6064ad..341d843a2df2 100644 --- a/pkgs/by-name/ar/arkade/package.nix +++ b/pkgs/by-name/ar/arkade/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "arkade"; - version = "0.11.86"; + version = "0.11.88"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; tag = finalAttrs.version; - hash = "sha256-w8Z6gGWS9M0n98XGJ7pQ7zsrImPKKYyiSYlep5p1oGc="; + hash = "sha256-ISito/qTolDRyYSn3z/J6Zc07RlaKWm7t1ugUt3bDkI="; }; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index 50d95ad67b82..672bc93211d3 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "automatic-timezoned"; - version = "2.0.122"; + version = "2.0.123"; src = fetchFromGitHub { owner = "maxbrunet"; repo = "automatic-timezoned"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-jUmcAAh4gp4uAtwle4GdnVvV82tCyOVLddDKB6IH+gA="; + sha256 = "sha256-Czewvy/IJluulgvfnSQDA+FKiHD/13fE5i2wz0AaVxs="; }; - cargoHash = "sha256-vbOlpFUYbHxG397wqiD9ZqmLshhX9lkkdIsFQ7hIX88="; + cargoHash = "sha256-C5HT5u4Z7kJm550VfApr2IfMNk4Lhw8nQCNlZzqYeKk="; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/ba/bazel-watcher/package.nix b/pkgs/by-name/ba/bazel-watcher/package.nix index 3421a3f2f0b5..70b750242073 100644 --- a/pkgs/by-name/ba/bazel-watcher/package.nix +++ b/pkgs/by-name/ba/bazel-watcher/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "bazel-watcher"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${finalAttrs.version}"; - hash = "sha256-zbZhV1IjFW4USdj3MGdyfPabfCPUmAAaGBaguXqmcnY="; + hash = "sha256-4pM7z1GAhLxvCLwtHBcteRMQwtdvOFtRu8eF+H6UJBE="; }; vendorHash = "sha256-u1Zg/M9DSkwscy49qtPQygk1gyxKaPbhlFDYNtBQ9NY="; diff --git a/pkgs/by-name/ba/bazel_8/package.nix b/pkgs/by-name/ba/bazel_8/package.nix index ea2bedb6d8bc..7ea81a4c92d3 100644 --- a/pkgs/by-name/ba/bazel_8/package.nix +++ b/pkgs/by-name/ba/bazel_8/package.nix @@ -208,6 +208,11 @@ stdenv.mkDerivation rec { usrBinEnv = "${coreutils}/bin/env"; }) + # Bazel tries to run "/bin/true" to test if linux-sandbox works. + (replaceVars ./patches/linux_sandbox.patch { + binTrue = "${coreutils}/bin/true"; + }) + # Provide default JRE for Bazel process by setting --server_javabase= # in a new default system bazelrc file (replaceVars ./patches/bazel_rc.patch { diff --git a/pkgs/by-name/ba/bazel_8/patches/linux_sandbox.patch b/pkgs/by-name/ba/bazel_8/patches/linux_sandbox.patch new file mode 100644 index 000000000000..033f06a77403 --- /dev/null +++ b/pkgs/by-name/ba/bazel_8/patches/linux_sandbox.patch @@ -0,0 +1,13 @@ +diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java +index dc188b4ce2..46d338c9af 100644 +--- a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java ++++ b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java +@@ -106,7 +106,7 @@ final class LinuxSandboxedSpawnRunner extends AbstractSandboxSpawnRunner { + ImmutableList linuxSandboxArgv = + LinuxSandboxCommandLineBuilder.commandLineBuilder(linuxSandbox) + .setTimeout(options.getLocalSigkillGraceSeconds()) +- .buildForCommand(ImmutableList.of("/bin/true")); ++ .buildForCommand(ImmutableList.of("@binTrue@")); + ImmutableMap env = ImmutableMap.of(); + Path execRoot = cmdEnv.getExecRoot(); + File cwd = execRoot.getPathFile(); diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index 049a6aa34f5c..3fb3d27aaf79 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -135,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: { pykakasi pyqt-builder pyqt6 + pystache python regex sip diff --git a/pkgs/by-name/ca/cargo-mobile2/package.nix b/pkgs/by-name/ca/cargo-mobile2/package.nix index ecb7bddbd8fc..52119f73c8d3 100644 --- a/pkgs/by-name/ca/cargo-mobile2/package.nix +++ b/pkgs/by-name/ca/cargo-mobile2/package.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-mobile2"; - version = "0.22.2"; + version = "0.22.3"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "cargo-mobile2"; rev = "cargo-mobile2-v${finalAttrs.version}"; - hash = "sha256-pSp7w823Jjjg0PEnCc7jVLBbOgvR7JAjtD8OK5voC0A="; + hash = "sha256-rPLGh7/lGsmoidtr+UNrxzUgqtiHvkqZs2/la4L6zQM="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 # sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-aci1QF/O2J6Yix4UkxPCVW+c+xoqm7AvdhlkF7y1GqA="; + cargoHash = "sha256-ht9ofFa4H/Ux6a31vMNdKNhrX48yoYM1qAPoxCjude0="; buildInputs = [ openssl ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/cl/cliamp/package.nix b/pkgs/by-name/cl/cliamp/package.nix index db3432b6a44b..a9315a5e65c9 100644 --- a/pkgs/by-name/cl/cliamp/package.nix +++ b/pkgs/by-name/cl/cliamp/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "cliamp"; - version = "1.20.1"; + version = "1.21.5"; src = fetchFromGitHub { owner = "bjarneo"; repo = "cliamp"; tag = "v${finalAttrs.version}"; - hash = "sha256-jT9nc2oBsQxJfDgncdnf668IzkUsvXI2G8DZNGQcWr0="; + hash = "sha256-xqiFtMw5kFRAnc4CSkc7/RcAejWxlJAoGFkQ2f5Z3bc="; }; vendorHash = "sha256-UMDCpfSGfvJmI+sImaFzgZpLNaLMgEnmGCqERwPokHM="; diff --git a/pkgs/by-name/cl/clpeak/package.nix b/pkgs/by-name/cl/clpeak/package.nix index b8498fba0ae6..52128f629a47 100644 --- a/pkgs/by-name/cl/clpeak/package.nix +++ b/pkgs/by-name/cl/clpeak/package.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "clpeak"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "krrishnarraj"; repo = "clpeak"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-cRsQo+yOXwMfyppjSapb7nwdCmyFgm5WvFZEZ4tfLko="; + hash = "sha256-TvlO2/teOoTCQ5uMBw/Pc4uQZ5O0bnwZFBdC/ZzQ6wc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/co/commons-logging/package.nix b/pkgs/by-name/co/commons-logging/package.nix index a1f5961e687f..ef720f191cd1 100644 --- a/pkgs/by-name/co/commons-logging/package.nix +++ b/pkgs/by-name/co/commons-logging/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "commons-logging"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { url = "mirror://apache/commons/logging/binaries/commons-logging-${finalAttrs.version}-bin.tar.gz"; - sha256 = "sha256-4s/DfNYp/CXSIAtUAUHC2GReQrmlhpN8tRwvpHmB2G0="; + sha256 = "sha256-7+wHpv5x63E2u4KEStKz17DIOfqokYzwp/Q1/tBOBxE="; }; installPhase = '' diff --git a/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix b/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix index fd7d87d0c0b4..f449467c8a0e 100644 --- a/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix +++ b/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage { pname = "cosmic-ext-applet-weather"; - version = "0-unstable-2026-03-05"; + version = "0-unstable-2026-03-11"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "cosmic-ext-applet-weather"; - rev = "a657afea4abb484384e0ca6fc57724d9825a65c1"; - hash = "sha256-Q0U0cUmcUQZYKJ6yK/iPNWbBKSGyWMxO1705q3qVQsY="; + rev = "d63918979b5208a49a6da2e7e338d706248fdae4"; + hash = "sha256-OswoiPq27efi8lIrW3BnsVGkfFLMpasmHEXWSLIxNu4="; }; - cargoHash = "sha256-tj0skQNt0p6UMUnU6HXw6ZAjEkCuuF4vg1aoWytqCos="; + cargoHash = "sha256-4n8NC7IAhANT9FnzBJzzpsKyw8clJw2uqN1Ie2PK+eE="; nativeBuildInputs = [ libcosmicAppHook diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix index 38eea3929d42..23ab29a16dfc 100644 --- a/pkgs/by-name/cp/cpuinfo/package.nix +++ b/pkgs/by-name/cp/cpuinfo/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cpuinfo"; - version = "0-unstable-2026-02-18"; + version = "0-unstable-2026-03-12"; src = fetchFromGitHub { owner = "pytorch"; repo = "cpuinfo"; - rev = "7364b490b5f78d58efe23ea76e74210fd6c3c76f"; - hash = "sha256-lB6e5zcw5UiwTOf+a+B35apXP5t1bxI6yOMiEeFwIwY="; + rev = "7607ca500436b37ad23fb8d18614bec7796b68a7"; + hash = "sha256-LnLtCMMRg+DwB7MijBdt/tmCKD/zN5y2oTgXlYw3hTg="; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "cpu-info"; maintainers = with lib.maintainers; [ pawelchcki ]; pkgConfigModules = [ "libcpuinfo" ]; - # https://github.com/pytorch/cpuinfo/blob/7364b490b5f78d58efe23ea76e74210fd6c3c76f/CMakeLists.txt#L98 + # https://github.com/pytorch/cpuinfo/blob/7607ca500436b37ad23fb8d18614bec7796b68a7/CMakeLists.txt#L98 platforms = lib.platforms.x86 ++ lib.platforms.aarch ++ lib.platforms.riscv; }; }) diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix index 2e389f2f9d00..4ee726670030 100644 --- a/pkgs/by-name/cu/cubeb/package.nix +++ b/pkgs/by-name/cu/cubeb/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cubeb"; - version = "0-unstable-2026-01-23"; + version = "0-unstable-2026-03-14"; src = fetchFromGitHub { owner = "mozilla"; repo = "cubeb"; - rev = "484857522c73318c06f18ba0a3e17525fa98c608"; - hash = "sha256-Uq+UINIXc3uuqS7MwbTQ5pL72KmknM33/3CLH21Od/Y="; + rev = "1b7de400134aac33d9c6b59ac1be9ddbf86d16eb"; + hash = "sha256-wRk0b+86YgbUUklWLTz2xlR8cQrNycI1YOxrrpz75pM="; }; outputs = [ diff --git a/pkgs/by-name/dy/dyff/package.nix b/pkgs/by-name/dy/dyff/package.nix index 6b2283b2d385..703e10522595 100644 --- a/pkgs/by-name/dy/dyff/package.nix +++ b/pkgs/by-name/dy/dyff/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "dyff"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "homeport"; repo = "dyff"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-+z9AaoSu7FNRI+jPwW6s0qRHz2roPXq4/CTNDOQW77Y="; + sha256 = "sha256-3zfKEyVVqbzlqQ0GMjIgrIUFtsKEgu+/EEYhSGu9Fgs="; }; - vendorHash = "sha256-vpmgSQKmnvaos4ZVuk4R419doAdULjtg95y5ORRwhZg="; + vendorHash = "sha256-hxDDfxLCGov0IYYy9wn5bub7qiGUdjsNfFbvuWAgHH4="; subPackages = [ "cmd/dyff" diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index cb4d94d12a88..c811a9fd43f8 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,16 +17,16 @@ }: let - version = "0.302.1"; + version = "0.303.1"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-pqm8amG+jeSgWCTsOLOui+8v4RyHYgX2h2e4HKhR5l4="; + hash = "sha256-D7Rm+UWAW8/QHJ2BQcvwL+yIYlXENJOrmBXKuoDEoAY="; }; - vendorHash = "sha256-t70o3VWfypvWOLMCqC4I8GXywzrDgNKUi5yAaB0NdZw="; + vendorHash = "sha256-lcSCMLOijqcug6RZGd2W3wjJxTWRlag3gz5bQoKglWg="; commonMeta = { license = lib.licenses.mit; @@ -52,7 +52,7 @@ buildGo126Module rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-lHbFy2iddAitNz9qxAnhKrhFKPn/w9yeyuNqaBCALEk="; + hash = "sha256-LvSANb1ehVqYHwIRujR3pgSdEhX4FaRzbji+fW64GtA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gh/gh-enhance/package.nix b/pkgs/by-name/gh/gh-enhance/package.nix new file mode 100644 index 000000000000..4491492d7ff4 --- /dev/null +++ b/pkgs/by-name/gh/gh-enhance/package.nix @@ -0,0 +1,50 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + installShellFiles, + stdenv, + writableTmpDirAsHomeHook, +}: +buildGoModule (finalAttrs: { + pname = "gh-enhance"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "dlvhdr"; + repo = "gh-enhance"; + rev = "v${finalAttrs.version}"; + hash = "sha256-IHtI8wnPLMkqxdBFXqkt6inYMOIqKjdTKdZbTxIhPzo="; + }; + + vendorHash = "sha256-rgql0vsHAzWeubw4EYBu/yPmm2QeADsIeACWsbcWtSk="; + + ldflags = [ + "-s" + "-w" + "-X github.com/dlvhdr/gh-enhance/cmd.Version=${finalAttrs.version}" + ]; + + checkFlags = [ + # requires network + "-skip=TestFullOutput" + ]; + + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + doInstallCheck = true; + nativeBuildInputs = [ installShellFiles ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd gh-enhance \ + --bash <($out/bin/gh-enhance completion bash) \ + --fish <($out/bin/gh-enhance completion fish) \ + --zsh <($out/bin/gh-enhance completion zsh) + ''; + meta = { + changelog = "https://github.com/dlvhdr/gh-enhance/releases/tag/${finalAttrs.src.rev}"; + description = "Terminal UI for GitHub Actions"; + homepage = "https://www.gh-dash.dev/enhance"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ replicapra ]; + mainProgram = "gh-enhance"; + }; +}) diff --git a/pkgs/by-name/go/google-clasp/package.nix b/pkgs/by-name/go/google-clasp/package.nix index 71117e6a036d..bb216343bc6b 100644 --- a/pkgs/by-name/go/google-clasp/package.nix +++ b/pkgs/by-name/go/google-clasp/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "clasp"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "google"; repo = "clasp"; tag = "v${version}"; - hash = "sha256-JLfkGxUHvde5RXlIWH+raBvTwqvpHOR/ul4yArLFj28="; + hash = "sha256-6HHkGcWzzrfIjQUPycSkF4pM/vrOo9rvWUnhHrA4LJ8="; }; - npmDepsHash = "sha256-dT0HA21wvU+wP5/9juMYinY60Fq5ngWl5dgj0JJi9hM="; + npmDepsHash = "sha256-zQt+diejFiG1oEkXxN5/X9rh33wHenk+iWeHsack/kY="; # `npm run build` tries installing clasp globally npmBuildScript = [ "compile" ]; diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix index 4f720d19ee72..dccaba214f4c 100644 --- a/pkgs/by-name/gr/grafana-loki/package.nix +++ b/pkgs/by-name/gr/grafana-loki/package.nix @@ -12,14 +12,14 @@ }: buildGoModule (finalAttrs: { - version = "3.6.6"; + version = "3.6.7"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${finalAttrs.version}"; - hash = "sha256-Mdopa7Nhdcwn4VBz/R5zI3Zccuht2hIdnAeCsAS6B+0="; + hash = "sha256-Gg86aV/7/VoLHGLO40kxng6tYOMpbmSCwV1BRlrW+qc="; }; vendorHash = null; diff --git a/pkgs/by-name/hy/hyprlax/package.nix b/pkgs/by-name/hy/hyprlax/package.nix index b5070b95dd4e..0c4fb11efe8d 100644 --- a/pkgs/by-name/hy/hyprlax/package.nix +++ b/pkgs/by-name/hy/hyprlax/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprlax"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "sandwichfarm"; repo = "hyprlax"; tag = "v${finalAttrs.version}"; - hash = "sha256-VlSJ5pM2h6+dqU4N0zAvm55pZNbKCyqAWxz6i5gf5KE="; + hash = "sha256-nBJkVBaeT2GIGWVYGEWRCQ14UznplKE2zm+4HyEfq3M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/in/incus/generic.nix b/pkgs/by-name/in/incus/generic.nix index 06eb4b16fd16..c3844851bc86 100644 --- a/pkgs/by-name/in/incus/generic.nix +++ b/pkgs/by-name/in/incus/generic.nix @@ -113,14 +113,10 @@ buildGoModule (finalAttrs: { # add our lxc location to incus's acceptable rootFsPaths # this is necessary for tmpfs/tmpfs-overlay to work - postPatch = - if (lib.versionAtLeast finalAttrs.version "6.16") then - '' - substituteInPlace internal/server/device/disk.go \ - --replace-fail '"/opt/incus/lib/lxc/rootfs/"' '"${lxc}/lib/lxc/rootfs/"' - '' - else - null; + postPatch = '' + substituteInPlace internal/server/device/disk.go \ + --replace-fail '"/opt/incus/lib/lxc/rootfs/"' '"${lxc}/lib/lxc/rootfs/"' + ''; postBuild = '' # build docs @@ -172,16 +168,9 @@ buildGoModule (finalAttrs: { --zsh <($out/bin/incus completion zsh) mkdir -p $agent_loader/bin $agent_loader/etc/systemd/system $agent_loader/lib/udev/rules.d - '' - + lib.optionalString (lib.versionOlder finalAttrs.version "6.18") '' - cp internal/server/instance/drivers/agent-loader/incus-agent{,-setup} $agent_loader/bin/ - '' - + lib.optionalString (lib.versionAtLeast finalAttrs.version "6.18") '' # the agent_loader output is used by virtualisation.incus.agent cp internal/server/instance/drivers/agent-loader/incus-agent-linux $agent_loader/bin/incus-agent cp internal/server/instance/drivers/agent-loader/incus-agent-setup-linux $agent_loader/bin/incus-agent-setup - '' - + '' chmod +x $agent_loader/bin/incus-agent{,-setup} patchShebangs $agent_loader/bin/incus-agent{,-setup} cp internal/server/instance/drivers/agent-loader/systemd/incus-agent.service $agent_loader/etc/systemd/system/ diff --git a/pkgs/by-name/in/incus/lts.nix b/pkgs/by-name/in/incus/lts.nix index cc21599605ef..010656a0c411 100644 --- a/pkgs/by-name/in/incus/lts.nix +++ b/pkgs/by-name/in/incus/lts.nix @@ -1,20 +1,11 @@ import ./generic.nix { - hash = "sha256-Sg3+399EgwEcZ8fp9cb2KEWQtBpYr5PkwTdnGl/AdfA"; - version = "6.0.5-unstable-2026-01-23"; - rev = "f8da60633e493bb5c0521981fa031bc909988c95"; - vendorHash = "sha256-KOJqPvp+w7G505ZMJ1weRD2SATmfq1aeyCqmbJ6WMAY="; + hash = "sha256-DgPSH5t1Zx2X9T8dbpz54M5nXNcCJbdfcq9AEd8kmYo="; + version = "6.0.6"; + vendorHash = "sha256-bVJwg9VaiSgfpKo+e2oMsYgmaKk42dktq0pahcfbjp0="; patches = [ # qemu 9.1 compat, remove when added to LTS ./572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch ./0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch - # post 6.0.5 patches, remove >= 6.0.6 - # ./c5359c809836c0f3b1e6022bf0528bb90ce06ad7.patch - # ./57096066959c843e1c413c4a97f64077b95cb397.patch - # ./f3dc9c0e6b77bb8765b347564702e026c2a8f9c6.patch - # ./d6a1ea3912938dae740cf821cd070e66e7a623ff.patch - # ./d6f0a77dd26df4c1ced80ffa63848279fd4330cc.patch - # ./92ac6ac999a4928cfdb92c485a048e4d51f471d0.patch - # ./f8da60633e493bb5c0521981fa031bc909988c95,patch ]; lts = true; nixUpdateExtraArgs = [ diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix index fde782d02e58..2a2fd4cf09c2 100644 --- a/pkgs/by-name/in/intel-compute-runtime/package.nix +++ b/pkgs/by-name/in/intel-compute-runtime/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "intel-compute-runtime"; - version = "26.05.37020.3"; + version = "26.09.37435.1"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; tag = finalAttrs.version; - hash = "sha256-V5PoGvUJtNL9Y7RkFWqhpYEbpiqv3Gj4GB1uBUKOvNg="; + hash = "sha256-FKqsyjkxOcqtVv+chGTFn9dhYwkWaDomWdFQlF85RDM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ju/just-lsp/package.nix b/pkgs/by-name/ju/just-lsp/package.nix index a2d68e8400e5..93f9db9c619f 100644 --- a/pkgs/by-name/ju/just-lsp/package.nix +++ b/pkgs/by-name/ju/just-lsp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "just-lsp"; - version = "0.3.4"; + version = "0.4.0"; src = fetchFromGitHub { owner = "terror"; repo = "just-lsp"; tag = finalAttrs.version; - hash = "sha256-5tjyn27PhxVmWPesoFJXoF5yq1j4LUqaF8+XyR1PWfY="; + hash = "sha256-Ic/IRJhyKBqniQUeEME0z2ywUFqLXTWg9XtnkQbGi8U="; }; - cargoHash = "sha256-8Jz7neEcmTDag2GaJqWHsZ8IPF/zIwU47vQ+0sPI9w8="; + cargoHash = "sha256-dskTlKEEekfutV8WPJ3XOIszMSShzjPbRPxSEN3jbgQ="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ku/kubevirt/package.nix b/pkgs/by-name/ku/kubevirt/package.nix index 4dccf07ad152..24e4d9d50543 100644 --- a/pkgs/by-name/ku/kubevirt/package.nix +++ b/pkgs/by-name/ku/kubevirt/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "kubevirt"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${finalAttrs.version}"; - hash = "sha256-fG+iIWAbvgrtrUfDEXFWbxoJdNuQFN9grp4JHzSjlYs="; + hash = "sha256-Bx2DzuKNcDkFnkyiEay9WosM6qZ4vnDLrz2NwNn5J3E="; }; vendorHash = null; diff --git a/pkgs/by-name/li/libtar/package.nix b/pkgs/by-name/li/libtar/package.nix index 9045a2c5d3cd..3611ddf6ae6e 100644 --- a/pkgs/by-name/li/libtar/package.nix +++ b/pkgs/by-name/li/libtar/package.nix @@ -49,6 +49,16 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook ]; + # libtar/Makefile.in hardcodes `INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s`, + # which runs bare `strip` during `make install`. This fails in cross builds + # where only the prefixed strip (e.g. aarch64-unknown-linux-gnu-strip) is + # available. Nix's fixup phase handles stripping with the correct tool, so + # just remove the flag. + postPatch = '' + substituteInPlace libtar/Makefile.in \ + --replace-fail '@INSTALL_PROGRAM@ -s' '@INSTALL_PROGRAM@' + ''; + meta = { description = "C library for manipulating POSIX tar files"; mainProgram = "libtar"; diff --git a/pkgs/by-name/li/lightning-loop/package.nix b/pkgs/by-name/li/lightning-loop/package.nix index a23f867e1889..953148101a7f 100644 --- a/pkgs/by-name/li/lightning-loop/package.nix +++ b/pkgs/by-name/li/lightning-loop/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "lightning-loop"; - version = "0.31.5-beta"; + version = "0.32.1-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "loop"; rev = "v${finalAttrs.version}"; - hash = "sha256-pmZturc7b3wd+qgSQPNzeY0LoMTF82dqUgOe8NfPeZw="; + hash = "sha256-gITl33H7fxF1YbJZJJBQk/V4wgbV5BtzBkLRvzVelmU="; }; - vendorHash = "sha256-X/+yi04FkN8hauqeFytagIdfigb6EGTvv8tVrlm7MGw="; + vendorHash = "sha256-ZFh21v8X/Bdrumpt2+u8lJgbQgNSX+PWRRsjr++C4/U="; subPackages = [ "cmd/loop" diff --git a/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix b/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix index 07619db5a043..45b22e7ea2bd 100644 --- a/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix +++ b/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix @@ -7,10 +7,10 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai-tc"; - version = "1.521"; + version = "1.522"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKaiTC/releases/download/v${version}/lxgw-wenkai-tc-v${version}.tar.gz"; - hash = "sha256-secUl91sR6AgHD1ac96ka4BtaMjdQYUPnzVM7jgv5n4="; + hash = "sha256-E2Z13IOaWwdsAPnHFsYQ2B/d3dhXP4duvdaYO/4PCfg="; }; nativeBuildInputs = [ installFonts ]; diff --git a/pkgs/by-name/lx/lxgw-wenkai/package.nix b/pkgs/by-name/lx/lxgw-wenkai/package.nix index 96fa62eb3632..1d54f9892e43 100644 --- a/pkgs/by-name/lx/lxgw-wenkai/package.nix +++ b/pkgs/by-name/lx/lxgw-wenkai/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai"; - version = "1.521"; + version = "1.522"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/lxgw-wenkai-v${version}.tar.gz"; - hash = "sha256-4GWCSMl+gdxnEPa8JPz7c+bWmxP7HaZHj+D0yUDqgVc="; + hash = "sha256-aBp31dACF146nhrw/G+iIBZMya1sFPHoQqU5h4584aQ="; }; nativeBuildInputs = [ installFonts ]; diff --git a/pkgs/by-name/mt/mtprotoproxy/package.nix b/pkgs/by-name/mt/mtprotoproxy/package.nix index 75b4d1aa41eb..8fc8194abeba 100644 --- a/pkgs/by-name/mt/mtprotoproxy/package.nix +++ b/pkgs/by-name/mt/mtprotoproxy/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mtprotoproxy"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "alexbers"; repo = "mtprotoproxy"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-tQ6e1Y25V4qAqBvhhKdirSCYzeALfH+PhNtcHTuBurs="; + sha256 = "sha256-/T3NtjDHnEOc/90mCp7NF9J+Bvd1YOTknkq73MQ9KxU="; }; nativeBuildInputs = with python3Packages; [ wrapPython ]; diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix index 080cacb0f99f..ceacf343dc40 100644 --- a/pkgs/by-name/nt/ntpd-rs/package.nix +++ b/pkgs/by-name/nt/ntpd-rs/package.nix @@ -29,6 +29,28 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellFiles ]; + # These fail based on timestamp issues with bundled certificates + # See https://github.com/NixOS/nixpkgs/issues/497682 & https://github.com/pendulum-project/ntpd-rs/pull/2133 + checkFlags = [ + "--skip=daemon::keyexchange::tests::key_exchange_connection_limiter" + "--skip=daemon::keyexchange::tests::key_exchange_roundtrip_with_port_server" + "--skip=daemon::ntp_source::tests::test_deny_stops_poll" + "--skip=daemon::ntp_source::tests::test_timeroundtrip" + "--skip=daemon::server::tests::test_server_serves" + "--skip=nts::tests::test_key_exchange_roundtrip_no_cookies" + "--skip=nts::tests::test_keyexchange_fixed_key_no_permission" + "--skip=nts::tests::test_keyexchange_roundtrip_fixed_key" + "--skip=nts::tests::test_keyexchange_roundtrip_fixed_key_keep_alive" + "--skip=nts::tests::test_keyexchange_roundtrip_fixed_key_no_permit" + "--skip=nts::tests::test_keyexchange_roundtrip_no_proto_overlap" + "--skip=nts::tests::test_keyexchange_roundtrip_no_upgrade_possible" + "--skip=nts::tests::test_keyexchange_roundtrip_supports" + "--skip=nts::tests::test_keyexchange_roundtrip_upgrading" + "--skip=nts::tests::test_keyexchange_roundtrip_v4" + "--skip=nts::tests::test_keyexchange_roundtrip_v5" + "--skip=nts::tests::test_keyexchange_supports_no_permission" + ]; + postPatch = '' substituteInPlace utils/generate-man.sh \ --replace-fail 'utils/pandoc.sh' 'pandoc' diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix index 399411a9c28e..8d1fe9e9473f 100644 --- a/pkgs/by-name/nu/nu_scripts/package.nix +++ b/pkgs/by-name/nu/nu_scripts/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "nu_scripts"; - version = "0-unstable-2026-03-09"; + version = "0-unstable-2026-03-12"; src = fetchFromGitHub { owner = "nushell"; repo = "nu_scripts"; - rev = "33ea2a5271a3b9d5f2722ebeebc26e4159068a76"; - hash = "sha256-JDepNHHj0aKnLPBDuLNjvNLKsTcp84WeYqoASTl1Gvs="; + rev = "196d94338d382561e7bacb29948ffcfa5ff1b2a1"; + hash = "sha256-5FKqphXxVSgqGXbqOL3aiZEGFSr5SMjMVIWzB0dA/+I="; }; installPhase = '' diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index 21bccb1bdd51..9648411c4756 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "oxlint"; - version = "1.55.0"; + version = "1.56.0"; src = fetchFromGitHub { owner = "oxc-project"; repo = "oxc"; tag = "oxlint_v${finalAttrs.version}"; - hash = "sha256-A2cq1WgZg8csNGB3yFNo21450f46n4ZVblke1yqlBCc="; + hash = "sha256-AgOfOuZRzT/sq1LpdiH8p6ib5+dDTs6FnQIiehC2Iic="; }; - cargoHash = "sha256-Oz9u2+5lq+z9A81BEn2T4jvVMqf1uNXip+OH4AxiTG0="; + cargoHash = "sha256-n8i3zF0WnLAenFU3NbUla3pVYxxr5r2IPwRTGCxSCAI="; nativeBuildInputs = [ cmake diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/by-name/pi/pipelight/package.nix similarity index 87% rename from pkgs/tools/misc/pipelight/default.nix rename to pkgs/by-name/pi/pipelight/package.nix index fc02f9e2a040..d0b4c77d26e6 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/by-name/pi/pipelight/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + stdenv_32bit, fetchurl, bash, cabextract, @@ -9,23 +9,25 @@ libx11, libGLU, libGL, - wine-staging, + pkgsi686Linux, }: let - wine_custom = wine-staging; + wine_custom = pkgsi686Linux.wine-staging; mozillaPluginPath = "/lib/mozilla/plugins"; + stdenv' = stdenv_32bit; + in -stdenv.mkDerivation rec { +stdenv'.mkDerivation (finalAttrs: { version = "0.2.8.2"; pname = "pipelight"; src = fetchurl { - url = "https://bitbucket.org/mmueller2012/pipelight/get/v${version}.tar.gz"; + url = "https://bitbucket.org/mmueller2012/pipelight/get/v${finalAttrs.version}.tar.gz"; sha256 = "1kyy6knkr42k34rs661r0f5sf6l1s2jdbphdg89n73ynijqmzjhk"; }; @@ -90,4 +92,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "pipelight-plugin"; }; -} +}) diff --git a/pkgs/tools/misc/pipelight/pipelight.patch b/pkgs/by-name/pi/pipelight/pipelight.patch similarity index 100% rename from pkgs/tools/misc/pipelight/pipelight.patch rename to pkgs/by-name/pi/pipelight/pipelight.patch diff --git a/pkgs/tools/misc/pipelight/wine-6.13-new-args.patch b/pkgs/by-name/pi/pipelight/wine-6.13-new-args.patch similarity index 100% rename from pkgs/tools/misc/pipelight/wine-6.13-new-args.patch rename to pkgs/by-name/pi/pipelight/wine-6.13-new-args.patch diff --git a/pkgs/tools/misc/pipelight/wine-7.10-ControlMask.patch b/pkgs/by-name/pi/pipelight/wine-7.10-ControlMask.patch similarity index 100% rename from pkgs/tools/misc/pipelight/wine-7.10-ControlMask.patch rename to pkgs/by-name/pi/pipelight/wine-7.10-ControlMask.patch diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix index 2928b09e3499..7c421ec7bb64 100644 --- a/pkgs/by-name/po/podman-tui/package.nix +++ b/pkgs/by-name/po/podman-tui/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "podman-tui"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-6o4ugQcVoy4HSDxxoe+5hx4C24CIDm7+am+4VRqJXl8="; + hash = "sha256-tOwiRzRxf8KSGSjEeMLN3DcDbOFwss4BvfwegDnOdLg="; }; vendorHash = null; diff --git a/pkgs/by-name/ra/railway-wallet/package.nix b/pkgs/by-name/ra/railway-wallet/package.nix index d21f4a4149b4..c1df803e7887 100644 --- a/pkgs/by-name/ra/railway-wallet/package.nix +++ b/pkgs/by-name/ra/railway-wallet/package.nix @@ -5,11 +5,11 @@ }: appimageTools.wrapType2 rec { pname = "railway-wallet"; - version = "5.24.13"; + version = "5.24.16"; src = fetchurl { url = "https://github.com/Railway-Wallet/Railway-Wallet/releases/download/v${version}/Railway.linux.x86_64.AppImage"; - hash = "sha256-e1itj0wxlX2WqyDynxBeLi06bzxwz2/cR9RuOfCLxF8="; + hash = "sha256-D0lrLFLY2v92DXblGMk644He6kKFrJ8HFVFRxYTsdBM="; }; meta = { diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix index 6cb07150be5b..d2c74f507905 100644 --- a/pkgs/by-name/rq/rqlite/package.nix +++ b/pkgs/by-name/rq/rqlite/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "rqlite"; - version = "9.4.3"; + version = "9.4.5"; src = fetchFromGitHub { owner = "rqlite"; repo = "rqlite"; tag = "v${finalAttrs.version}"; - hash = "sha256-DHOhTI/JNdYDrqVngk4QZSG8IRplZyqPZYhVJufdjaQ="; + hash = "sha256-jvqmRmURAvo0bNrwgft95oHupRf8FJaB3XRgnU43wRo="; }; vendorHash = "sha256-PPmX/KbNO/LEwGlw8bziek4uDd5sgDo3+wNlBJm/qA4="; diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index a42d10453e71..2999eda5dab1 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rust-analyzer-unwrapped"; - version = "2026-03-09"; + version = "2026-03-16"; cargoHash = "sha256-osoNyx4UEbq0J2fx7WMJBfIRV3mhsO+OSBNrvu060IM="; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "rust-lang"; repo = "rust-analyzer"; rev = finalAttrs.version; - hash = "sha256-cxHbp8na0qO5U3SPGkSLzg3g9C81gJEG/7WbYPktD6o="; + hash = "sha256-CKmkYqUi2pI1uDGDfpK0mkZbRLyjUKCpYDU3eMHtmks="; }; cargoBuildFlags = [ diff --git a/pkgs/by-name/sb/sbom4python/package.nix b/pkgs/by-name/sb/sbom4python/package.nix index 6a812c564450..8358572d2340 100644 --- a/pkgs/by-name/sb/sbom4python/package.nix +++ b/pkgs/by-name/sb/sbom4python/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "sbom4python"; - version = "0.12.4"; + version = "0.12.5"; pyproject = true; src = fetchFromGitHub { owner = "anthonyharrison"; repo = "sbom4python"; tag = "v${finalAttrs.version}"; - hash = "sha256-eiizZEc5OIBfyGlSCer2zcrEFd2qpxmMjxV8e9W3gdk="; + hash = "sha256-0+7NsnM2ovYKX5ngFKrQ5lGj9gTrK87B81XSVEnmBWA="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix index 45bde9110857..be32ce877082 100644 --- a/pkgs/by-name/se/sendme/package.nix +++ b/pkgs/by-name/se/sendme/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sendme"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = "sendme"; rev = "v${finalAttrs.version}"; - hash = "sha256-zh0YYJoljcOQz0ltAk+UBScSGZhsoSqIa+F0Qm4/3iw="; + hash = "sha256-Yi0GM9gNQ1lEuuwS49asbhA1b2iUfBDnT06sPX7UuKM="; }; - cargoHash = "sha256-G7b1BBlVMPtfEWfIXIMH4N+Avt9vtEcCG1ctrja5Ttc="; + cargoHash = "sha256-Nkr/8KoNZCTPWcpnqdfB+D3VpL4ABRlvi5nxhMuCw1U="; # The tests require contacting external servers. doCheck = false; diff --git a/pkgs/by-name/sq/sqlite3-to-mysql/package.nix b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix index 688412aa6593..8ff3ff9c4542 100644 --- a/pkgs/by-name/sq/sqlite3-to-mysql/package.nix +++ b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "sqlite3-to-mysql"; - version = "2.5.1"; + version = "2.5.6"; pyproject = true; src = fetchFromGitHub { owner = "techouse"; repo = "sqlite3-to-mysql"; tag = "v${finalAttrs.version}"; - hash = "sha256-2SoLiqOLuGcB4IV2CPud+mjc5s8mqobD72kkx0WCwVU="; + hash = "sha256-6WIGQVZZBWVGP8nr7Gxvd3j9wrt08EcCmb9ljRMkUgc="; }; build-system = with python3Packages; [ @@ -39,6 +39,7 @@ python3Packages.buildPythonApplication (finalAttrs: { packaging mysql80 python-dateutil + sqlglot ]; pythonRelaxDeps = [ diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index 84feafaea4d4..ccea6230ea7b 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule (finalAttrs: { pname = "stackit-cli"; - version = "0.55.0"; + version = "0.56.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-dq6354WDaP3r9gE5llXQkgXPNqMXfchJyjeCuG/NGyA="; + hash = "sha256-4//JuIlGbYUPGr8Zc3fgDl4AMhWZoLYuBSvGhn3Ev5w="; }; - vendorHash = "sha256-KHixmVUCZIw2VJECI2LPC8vdmiasmZEQ69r7Z+D63RY="; + vendorHash = "sha256-IW0pWghQ4GHwanGciCCZ+2/9xUtMUbgHJE8KAOU/k04="; subPackages = [ "." ]; diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index 96851b60b614..67bfc17284fd 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/pkgs/by-name/te/telegraf/package.nix @@ -10,7 +10,7 @@ buildGoModule (finalAttrs: { pname = "telegraf"; - version = "1.38.0"; + version = "1.38.1"; subPackages = [ "cmd/telegraf" ]; @@ -18,10 +18,10 @@ buildGoModule (finalAttrs: { owner = "influxdata"; repo = "telegraf"; rev = "v${finalAttrs.version}"; - hash = "sha256-y5SmQ6e0pySB8w34w82jy2bFkXfHsFEJTW2WAoIbPuA="; + hash = "sha256-DKDKEYKm4vlyamGHLE1kPFYBgsZDvkzCGEmqBQ6/VIE="; }; - vendorHash = "sha256-2R7hxIprCzpB6iAnZzF7SBiqnGXR9Gy9KmrCkQ3kvso="; + vendorHash = "sha256-1fsyqCsxABDB4ZBAjshRo+GPtG70CEVu/mWzMoDjhjc="; proxyVendor = true; ldflags = [ diff --git a/pkgs/by-name/te/terraform-backend-git/package.nix b/pkgs/by-name/te/terraform-backend-git/package.nix index d8bef4da1f02..fb3cecfee56e 100644 --- a/pkgs/by-name/te/terraform-backend-git/package.nix +++ b/pkgs/by-name/te/terraform-backend-git/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "terraform-backend-git"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "plumber-cd"; repo = "terraform-backend-git"; rev = "v${finalAttrs.version}"; - hash = "sha256-qLQJETtysOaz5fEHmZg5//+O3TgfAAvXNIx8Kt8DUr0="; + hash = "sha256-V7J/lSizWYjuhN4FcRJYhsPYa+Yct1BsXY1g5Dqk1kk="; }; vendorHash = "sha256-c1gf1qrxZ2rjB4GOh214vrtFBVo5nHJj5tesdiJxbjw="; diff --git a/pkgs/by-name/ti/tinyauth/package.nix b/pkgs/by-name/ti/tinyauth/package.nix index 65e28ee19ad5..434490b60a87 100644 --- a/pkgs/by-name/ti/tinyauth/package.nix +++ b/pkgs/by-name/ti/tinyauth/package.nix @@ -29,8 +29,8 @@ buildGoModule (finalAttrs: { ldflags = [ "-s" "-w" - "-X tinyauth/internal/config.Version=v${finalAttrs.version}" - "-X tinyauth/internal/config.CommitHash=${finalAttrs.src.rev}" + "-X github.com/steveiliop56/tinyauth/internal/config.Version=v${finalAttrs.version}" + "-X github.com/steveiliop56/tinyauth/internal/config.CommitHash=${finalAttrs.src.rev}" ]; preBuild = '' diff --git a/pkgs/by-name/tr/triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix index b8072db53644..38cc399601c4 100644 --- a/pkgs/by-name/tr/triton-llvm/package.nix +++ b/pkgs/by-name/tr/triton-llvm/package.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "LLVM_INCLUDE_DOCS" (buildDocs || buildMan)) (lib.cmakeBool "MLIR_INCLUDE_DOCS" (buildDocs || buildMan)) (lib.cmakeBool "LLVM_BUILD_DOCS" (buildDocs || buildMan)) + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) # Way too slow, only uses one core # (lib.cmakeBool "LLVM_ENABLE_DOXYGEN" (buildDocs || buildMan)) (lib.cmakeBool "LLVM_ENABLE_SPHINX" (buildDocs || buildMan)) diff --git a/pkgs/by-name/wh/whatsapp-for-mac/package.nix b/pkgs/by-name/wh/whatsapp-for-mac/package.nix index 51035aa11c27..d9cef26bc0db 100644 --- a/pkgs/by-name/wh/whatsapp-for-mac/package.nix +++ b/pkgs/by-name/wh/whatsapp-for-mac/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "whatsapp-for-mac"; - version = "2.26.9.17"; + version = "2.26.10.18"; src = fetchzip { extension = "zip"; name = "WhatsApp.app"; url = "https://web.whatsapp.com/desktop/mac_native/release/?version=${finalAttrs.version}&extension=zip&configuration=Release&branch=master"; - hash = "sha256-bba22HBnIeio4M92mckiOa1IQpRUfx/I7OkfA4hO6rU="; + hash = "sha256-cQB2AF/emNHtSpf1DrjCV+yds8kbD2Lv9UTkAo7CZlM="; }; dontConfigure = true; diff --git a/pkgs/development/interpreters/octave/build-octave-package.nix b/pkgs/development/interpreters/octave/build-octave-package.nix index 66bab3c03b14..ba60b3872902 100644 --- a/pkgs/development/interpreters/octave/build-octave-package.nix +++ b/pkgs/development/interpreters/octave/build-octave-package.nix @@ -46,6 +46,11 @@ # requiredOctavePackages are ALSO installed into octave. requiredOctavePackages ? [ ], + # Dependencies and `env` for octave package tests, + # which are run with .passthru.tests.testOctavePkgTests + nativeOctavePkgTestInputs ? [ ], + octavePkgTestEnv ? { }, + preBuild ? "", meta ? { }, @@ -74,6 +79,7 @@ let # itself, causing everything to fail. attrs' = removeAttrs attrs [ "nativeBuildInputs" + "nativeOctavePkgTestInputs" "passthru" ]; in @@ -143,7 +149,9 @@ stdenv.mkDerivation ( testOctaveBuildEnv = (octave.withPackages (os: [ finalAttrs.finalPackage ])).overrideAttrs (old: { name = "${finalAttrs.name}-pkg-install"; }); - testOctavePkgTests = callPackage ./run-pkg-test.nix { } finalAttrs.finalPackage; + testOctavePkgTests = callPackage ./run-pkg-test.nix { + inherit nativeOctavePkgTestInputs octavePkgTestEnv; + } finalAttrs.finalPackage; } // passthru.tests or { }; }; diff --git a/pkgs/development/interpreters/octave/run-pkg-test.nix b/pkgs/development/interpreters/octave/run-pkg-test.nix index 4665fc92f527..fccf397b41db 100644 --- a/pkgs/development/interpreters/octave/run-pkg-test.nix +++ b/pkgs/development/interpreters/octave/run-pkg-test.nix @@ -1,6 +1,8 @@ { octave, runCommand, + nativeOctavePkgTestInputs, + octavePkgTestEnv, }: package: @@ -8,7 +10,10 @@ runCommand "${package.name}-pkg-test" { nativeBuildInputs = [ (octave.withPackages (os: [ package ])) - ]; + ] + ++ nativeOctavePkgTestInputs; + + env = octavePkgTestEnv; } '' { octave-cli --eval 'pkg test ${package.pname}' || touch FAILED_ERRCODE; } \ diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index a98d7a5e085c..1fcfcaffccdd 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -7,14 +7,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "2.8.1"; + version = "2.9"; pname = "ocaml${ocaml.version}-camlpdf"; src = fetchFromGitHub { owner = "johnwhitington"; repo = "camlpdf"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZExQtcFBPiS7c6v+WEjZYQ6zXtqRTNLV0hYzYSB/eLE="; + hash = "sha256-8xBna7GDFbFf48069/ct71uFxLJU0eBfKVRWDnyYocs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index 7b4141113d60..8c46a09ca583 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ocaml${ocaml.version}-cpdf"; - version = "2.8.1"; + version = "2.9"; src = fetchFromGitHub { owner = "johnwhitington"; repo = "cpdf-source"; tag = "v${finalAttrs.version}"; - hash = "sha256-MK48ajZmpXibbaJ4x2vaHhh2N+OBRqj7zT8eaVenxDY="; + hash = "sha256-b6fGKFM9Q2YxW8FoyewGNTkF9XBtjdq0Bur6KgVi5T4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/octave-modules/image/default.nix b/pkgs/development/octave-modules/image/default.nix index 37e42d34adfb..4f424e3a4f94 100644 --- a/pkgs/development/octave-modules/image/default.nix +++ b/pkgs/development/octave-modules/image/default.nix @@ -2,6 +2,10 @@ buildOctavePackage, lib, fetchurl, + mesa, + gnuplot, + makeFontsConf, + writableTmpDirAsHomeHook, }: buildOctavePackage rec { @@ -13,6 +17,16 @@ buildOctavePackage rec { sha256 = "sha256-pYY8E5LZd+pPNwzFVH4EsXY8K3fXs6Hyz2zYweXkmRk="; }; + nativeOctavePkgTestInputs = [ + mesa + gnuplot + writableTmpDirAsHomeHook + ]; + + octavePkgTestEnv.FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + + __structuredAttrs = true; + meta = { homepage = "https://gnu-octave.github.io/packages/image/"; license = lib.licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix index db8d20c3810b..54047e831363 100644 --- a/pkgs/development/python-modules/aiohomeconnect/default.nix +++ b/pkgs/development/python-modules/aiohomeconnect/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "aiohomeconnect"; - version = "0.31.0"; + version = "0.32.0"; pyproject = true; src = fetchFromGitHub { owner = "MartinHjelmare"; repo = "aiohomeconnect"; tag = "v${finalAttrs.version}"; - hash = "sha256-93IyTpetxFSD1fcX2sWBfvoYzm3xRiczsONoFxKJRts="; + hash = "sha256-fantj1npAPikWarJ+5zTBSLJfGW2JvM0N49np4eUHqM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiotankerkoenig/default.nix b/pkgs/development/python-modules/aiotankerkoenig/default.nix index 3158dde61dee..979dfe936e41 100644 --- a/pkgs/development/python-modules/aiotankerkoenig/default.nix +++ b/pkgs/development/python-modules/aiotankerkoenig/default.nix @@ -14,21 +14,21 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiotankerkoenig"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; src = fetchFromGitHub { owner = "jpbede"; repo = "aiotankerkoenig"; - tag = "v${version}"; - hash = "sha256-TpSVRo8FWltZF5ZQx9kZ3mlJ1bEHVWmIdLVSyaKjj04="; + tag = "v${finalAttrs.version}"; + hash = "sha256-LpaJyx5w0htbvWJ8kL8BlyMdlLOKlR6p+XW7qWMhXZo="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' ''; build-system = [ hatchling ]; @@ -53,8 +53,8 @@ buildPythonPackage rec { meta = { description = "Python module for interacting with tankerkoenig.de"; homepage = "https://github.com/jpbede/aiotankerkoenig"; - changelog = "https://github.com/jpbede/aiotankerkoenig/releases/tag/v${version}"; + changelog = "https://github.com/jpbede/aiotankerkoenig/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/aiowebdav2/default.nix b/pkgs/development/python-modules/aiowebdav2/default.nix index 45a1a2c945c4..6b557be078ee 100644 --- a/pkgs/development/python-modules/aiowebdav2/default.nix +++ b/pkgs/development/python-modules/aiowebdav2/default.nix @@ -4,9 +4,9 @@ aioresponses, buildPythonPackage, fetchFromGitHub, + hatchling, lib, lxml, - poetry-core, pytest-asyncio, pytest-cov-stub, pytestCheckHook, @@ -16,17 +16,17 @@ buildPythonPackage rec { pname = "aiowebdav2"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; src = fetchFromGitHub { owner = "jpbede"; repo = "aiowebdav2"; tag = "v${version}"; - hash = "sha256-xByCfzIxHPo7yDvv14c91FNipKv6TkPvtaFmb2fG/5A="; + hash = "sha256-W3TdumweNyGz2qDFgSGu+ZPnEpLvWQQ216jER6e4k18="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ aiofiles diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 346907d999b6..aaad0fe471a5 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "2.4.2"; + version = "2.4.3"; pyproject = true; src = fetchFromGitHub { owner = "ansible"; repo = "ansible-runner"; tag = version; - hash = "sha256-aO7AcDtPbbmTsY+39oZYdPABYFy6bK3ZR1jatLTb7O4="; + hash = "sha256-kKG6Jn0RRa6rglUrE8fJmXj+nbeKNUbL/GVWqT20Hfk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/json-timeseries/default.nix b/pkgs/development/python-modules/json-timeseries/default.nix new file mode 100644 index 000000000000..654b3d559933 --- /dev/null +++ b/pkgs/development/python-modules/json-timeseries/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + python-dateutil, + setuptools, + setuptools-scm, +}: + +buildPythonPackage { + pname = "json-timeseries"; + version = "0.1.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "slaxor505"; + repo = "json-timeseries-py"; + # asked upstream for tags + # https://github.com/slaxor505/json-timeseries-py/issues/2 + rev = "d5a4f6307ce38f790c2594c3eae0f64bbc7c353e"; + hash = "sha256-5+eS+e6d61CBIqBXFaIQta95nenF5XK2mA9pQ+Rj0vQ="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ python-dateutil ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "json_timeseries" ]; + + meta = { + description = "JSON Time Series (JTS) spec Python library"; + homepage = "https://github.com/slaxor505/json-timeseries-py"; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix index 7150513cbb98..902243a36a17 100644 --- a/pkgs/development/python-modules/oelint-data/default.nix +++ b/pkgs/development/python-modules/oelint-data/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "oelint-data"; - version = "1.4.5"; + version = "1.4.6"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-data"; tag = finalAttrs.version; - hash = "sha256-QEzpNnDcubQnZbGOgJlSZQfQg8rZH0A2SFm3qViFL5c="; + hash = "sha256-VlipDL74RlBokbVYNC+aM3QQ2IBUwMeMkL4ZQsBCirE="; }; build-system = [ diff --git a/pkgs/development/python-modules/openplantbook-sdk/default.nix b/pkgs/development/python-modules/openplantbook-sdk/default.nix new file mode 100644 index 000000000000..b4c6ae569bd5 --- /dev/null +++ b/pkgs/development/python-modules/openplantbook-sdk/default.nix @@ -0,0 +1,59 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + json-timeseries, + numpy, + pandas, + pytestCheckHook, + pyyaml, + setuptools, + setuptools-scm, +}: + +buildPythonPackage { + pname = "openplantbook-sdk"; + version = "0.6.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "slaxor505"; + repo = "openplantbook-sdk-py"; + rev = "097ccfbd5cee6a271c79c923f1761249eca4bda1"; + hash = "sha256-udzm8Efl3QX2jrvfzA/oCvk2kjQEFFOZCOFqKNzUUu8="; + }; + + patches = [ + # https://github.com/slaxor505/openplantbook-sdk-py/pull/2 + ./update-test.patch + ]; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + aiohttp + json-timeseries + ]; + + nativeBuildInputs = [ + numpy + pandas + pyyaml + pytestCheckHook + ]; + + enabledTestPaths = [ + "tests/offline" + ]; + + meta = { + description = "SDK to integrate with Open Plantbook API"; + homepage = "https://github.com/slaxor505/openplantbook-sdk-py"; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/openplantbook-sdk/update-test.patch b/pkgs/development/python-modules/openplantbook-sdk/update-test.patch new file mode 100644 index 000000000000..0ad2dff91a1c --- /dev/null +++ b/pkgs/development/python-modules/openplantbook-sdk/update-test.patch @@ -0,0 +1,32 @@ +commit b5c20736ca6270b6ac20ee24e4788cfc656815cb +Author: Sandro Jäckel +Date: Tue, 10 Mar 2026 02:42:27 +0100 + + Update tests + +diff --git a/tests/offline/test_async_plant_detail_lang.py b/tests/offline/test_async_plant_detail_lang.py +index 3d460fb..75e4018 100644 +--- a/tests/offline/test_async_plant_detail_lang.py ++++ b/tests/offline/test_async_plant_detail_lang.py +@@ -75,7 +75,7 @@ def test_forwards_lang_param_when_provided(self): + self.assertIn("Authorization", sess.headers) + self.assertTrue(sess.headers["Authorization"].startswith("Bearer ")) + # Assert that the request URL targets the expected endpoint +- self.assertTrue(sess.last_get_url.endswith("/plant/detail/abelia chinensis")) ++ self.assertTrue(sess.last_get_url.endswith("/plant/detail/abelia chinensis/")) + # Critical assertion: 'lang' param is forwarded + self.assertEqual(sess.last_get_params, {"lang": "de"}) + +diff --git a/tests/offline/test_pass_through_params.py b/tests/offline/test_pass_through_params.py +index 62c2443..0ea36a9 100644 +--- a/tests/offline/test_pass_through_params.py ++++ b/tests/offline/test_pass_through_params.py +@@ -118,7 +118,7 @@ def test_detail_merges_and_overrides_lang_and_kwargs(self): + self.assertIn("Authorization", sess.headers) + self.assertTrue(sess.headers["Authorization"].startswith("Bearer ")) + # Request URL targets the expected endpoint +- self.assertTrue(sess.last_get_url.endswith("/plant/detail/abelia chinensis")) ++ self.assertTrue(sess.last_get_url.endswith("/plant/detail/abelia chinensis/")) + # 'lang' from explicit arg overrides value in params; other params are preserved + self.assertEqual(sess.last_get_params, {"lang": "de", "page": "2"}) + # request_kwargs forwarded to session.get diff --git a/pkgs/development/python-modules/pan-os-python/default.nix b/pkgs/development/python-modules/pan-os-python/default.nix index d36e61a9312a..23b1f9e0f7fd 100644 --- a/pkgs/development/python-modules/pan-os-python/default.nix +++ b/pkgs/development/python-modules/pan-os-python/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pan-os-python"; - version = "1.12.4"; + version = "1.12.5"; pyproject = true; src = fetchPypi { pname = "pan_os_python"; inherit version; - hash = "sha256-j7+FvpH5bfSEdMUMrCYREcJW2QLVRrq46oS+CUCtHfk="; + hash = "sha256-Zea0WMdFkZLEZi2aqU9woXFA3aAQBEYhf+D7s5ZaOro="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pepit/default.nix b/pkgs/development/python-modules/pepit/default.nix index 73209de67941..9326ceb91816 100644 --- a/pkgs/development/python-modules/pepit/default.nix +++ b/pkgs/development/python-modules/pepit/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pepit"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "PerformanceEstimation"; repo = "PEPit"; tag = version; - hash = "sha256-JwJGJhBC7fS10D6cUkQwhwoT932Pi4oPTtNLNwyM3Q4="; + hash = "sha256-PCWYfJ1h4P0X4KLNdIivLrPVAR7205K1Ii5ROuGHULo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index 50d0c294bf44..745d577be944 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -22,14 +22,14 @@ buildPythonPackage (finalAttrs: { pname = "posthog"; - version = "7.9.8"; + version = "7.9.12"; pyproject = true; src = fetchFromGitHub { owner = "PostHog"; repo = "posthog-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-iVtAQHhl48cR+Rh3voNBDzpalvqL11R9H4uYmw+0Zgc="; + hash = "sha256-RW6klOCYJMyuiPniMfQDNwYAP0Qkjy9m0ztljoPmC0w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ppscore/default.nix b/pkgs/development/python-modules/ppscore/default.nix index b7b3e7b4e405..7f949bfd6bb4 100644 --- a/pkgs/development/python-modules/ppscore/default.nix +++ b/pkgs/development/python-modules/ppscore/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "ppscore"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "8080labs"; repo = "ppscore"; tag = version; - hash = "sha256-gJStsL8fN17kvXO8EH/NHGIBelPknJzYw5WEvHsFooU="; + hash = "sha256-GhmyVWNWpEMNqXW808UhBHk1r6vOVibxKHVv5wWshLE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index ad02c2a20961..f36f84862809 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "xsdata"; - version = "26.1"; + version = "26.2"; pyproject = true; src = fetchFromGitHub { owner = "tefra"; repo = "xsdata"; tag = "v${version}"; - hash = "sha256-cMXLRk74y+yHYyIQqlUcMZawNfMXa5L17qhVkTpgEsk="; + hash = "sha256-h5VGXGXQSG4o8H+Q+Z0SN9rw4mFI8EORNtB+4VAKg/k="; }; patches = [ diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 565694bf71c1..c72903c8ee71 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -979,12 +979,12 @@ in tmux-session-manager = mkTmuxPlugin rec { pluginName = "tmux-session-manager"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "PhilVoel"; repo = "tmux-session-manager"; tag = "v${version}"; - hash = "sha256-WzzqfMRAF8vxrnYnudD6CZVn52bZyCSRaByQRRRK9X8="; + hash = "sha256-3uXl9N0LkS1txjaG8I+i1ACAW55tSNFzv358i3aRd/U="; }; rtpFilePath = "session_manager.tmux"; meta = { diff --git a/pkgs/servers/home-assistant/custom-components/openplantbook/package.nix b/pkgs/servers/home-assistant/custom-components/openplantbook/package.nix new file mode 100644 index 000000000000..59a98e805ddf --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/openplantbook/package.nix @@ -0,0 +1,45 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + json-timeseries, + openplantbook-sdk, + pytest-homeassistant-custom-component, + pytestCheckHook, +}: + +buildHomeAssistantComponent rec { + owner = "olen"; + domain = "openplantbook"; + version = "1.3.3"; + + src = fetchFromGitHub { + inherit owner; + repo = "home-assistant-openplantbook"; + tag = "v${version}"; + hash = "sha256-t4ZyY6zodCRJZTIqu7Rcfr7sRUmo5QarZU8y0lCKmWE="; + }; + + postPatch = '' + substituteInPlace custom_components/openplantbook/manifest.json \ + --replace-fail "==" ">=" + ''; + + dependencies = [ + json-timeseries + openplantbook-sdk + ]; + + nativeCheckInputs = [ + pytest-homeassistant-custom-component + pytestCheckHook + ]; + + meta = { + description = "Integration to search and fetch data from Openplantbook.io"; + homepage = "https://github.com/Olen/home-assistant-openplantbook"; + changelog = "https://github.com/Olen/home-assistant-openplantbook/releases/tag/${src.tag}"; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + license = lib.licenses.gpl3Only; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/plant/package.nix b/pkgs/servers/home-assistant/custom-components/plant/package.nix new file mode 100644 index 000000000000..46a6c3e5e30b --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/plant/package.nix @@ -0,0 +1,38 @@ +{ + lib, + async-timeout, + buildHomeAssistantComponent, + fetchFromGitHub, + pytest-homeassistant-custom-component, + pytestCheckHook, +}: + +buildHomeAssistantComponent rec { + owner = "olen"; + domain = "plant"; + version = "2026.2.1"; + + src = fetchFromGitHub { + inherit owner; + repo = "homeassistant-plant"; + tag = "v${version}"; + hash = "sha256-nWZFywMTw3seEAERekzMeLRPceqMl1s7VXujNz0+6zI="; + }; + + dependencies = [ + async-timeout + ]; + + nativeCheckInputs = [ + pytest-homeassistant-custom-component + pytestCheckHook + ]; + + meta = { + description = "Alternative Plant component of home assistant"; + homepage = "https://github.com/Olen/homeassistant-plant"; + changelog = "https://github.com/Olen/homeassistant-plant/releases/tag/${src.tag}"; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/battery-state-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/battery-state-card/package.nix new file mode 100644 index 000000000000..dcd9a31316e2 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/battery-state-card/package.nix @@ -0,0 +1,40 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage (finalAttrs: { + pname = "battery-state-card"; + version = "3.3.0"; + + src = fetchFromGitHub { + owner = "maxwroc"; + repo = "battery-state-card"; + tag = "v${finalAttrs.version}"; + hash = "sha256-/oFW80zCp4vnRc3ZKVJtvNH11UPrdustFDktZdnFiQM="; + }; + + npmDepsHash = "sha256-TYiUTzNsaEwy9Y5O0UyFXCGFJ/jdjTek3B5CVvac+p8="; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + }; + + installPhase = '' + runHook preInstall + + install ./dist/battery-state-card.js -Dt $out + + runHook postInstall + ''; + + meta = { + description = "Battery state card for Home Assistant"; + homepage = "https://github.com/maxwroc/battery-state-card"; + changelog = "https://github.com/maxwroc/battery-state-card/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/flower-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/flower-card/package.nix new file mode 100644 index 000000000000..6115a2cc6be1 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/flower-card/package.nix @@ -0,0 +1,37 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage (finalAttrs: { + pname = "flower-card"; + version = "2026.2.0"; + + src = fetchFromGitHub { + owner = "olen"; + repo = "lovelace-flower-card"; + tag = "v${finalAttrs.version}"; + hash = "sha256-EPahVDglhKjtPwIdu5HfUZ6KhMtTu/9YfY4VdsN+vyc="; + }; + + npmDepsHash = "sha256-XGKGoFdbeUIx12ZGP8o2oSTJHVa+PZ6jwYSWiqjtSuM="; + + installPhase = '' + runHook preInstall + + mkdir $out + cp flower-card.js $out + + runHook postInstall + ''; + + meta = { + description = "Lovelace Flower Card to match the custom plant integration"; + homepage = "https://github.com/Olen/lovelace-flower-card"; + changelog = "https://github.com/Olen/lovelace-flower-card/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 93debddba8a1..bf841bb60e44 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -215,6 +215,23 @@ rec { mkDerivationFromStdenv = extendMkDerivationArgs old (_: extraAttrs); }); + /* + Modify a stdenv so as to extend `mkDerivation`'s arguments. + A stronger version of `addAttrsToDerivation`. + + Example: + requireCcache = + overrideMkDerivationArgs + (oldAttrs: { + requiredSystemFeatures = oldAttrs.requiredSystemFeatures or [ ] ++ [ "ccache" ]; + }); + */ + overrideMkDerivationArgs = + extension: stdenv: + stdenv.override (old: { + mkDerivationFromStdenv = extendMkDerivationArgs old extension; + }); + /* Use the trace output to report all processed derivations with their license name. diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index 32e44cd9e39c..61bacf78be73 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -18,6 +18,7 @@ clangStdenv, nixpkgs-review, nixpkgs-reviewFull, + nil, nix-direnv, nix-fast-build, haskell, @@ -111,6 +112,10 @@ let nixpkgs-review = self.nixpkgs-review; }; + nil = nil.override { + nix = self.lix; + }; + nix-direnv = nix-direnv.override { nix = self.lix; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8131a05ff3c..dd08197c8c87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7224,11 +7224,6 @@ with pkgs; physfs ; - pipelight = callPackage ../tools/misc/pipelight { - stdenv = stdenv_32bit; - wine-staging = pkgsi686Linux.wine-staging; - }; - place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at; podofo = podofo_1_0; diff --git a/pkgs/top-level/octave-packages.nix b/pkgs/top-level/octave-packages.nix index e9a8a13608ec..e440e979d5ce 100644 --- a/pkgs/top-level/octave-packages.nix +++ b/pkgs/top-level/octave-packages.nix @@ -116,7 +116,14 @@ makeScope newScope ( inherit (pkgs) gsl; }; - image = callPackage ../development/octave-modules/image { }; + image = callPackage ../development/octave-modules/image { + inherit (pkgs) + mesa + gnuplot + makeFontsConf + writableTmpDirAsHomeHook + ; + }; image-acquisition = callPackage ../development/octave-modules/image-acquisition { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d4a565752b0e..77057d4a054f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7919,6 +7919,8 @@ self: super: with self; { json-stream-rs-tokenizer = callPackage ../development/python-modules/json-stream-rs-tokenizer { }; + json-timeseries = callPackage ../development/python-modules/json-timeseries { }; + json-tricks = callPackage ../development/python-modules/json-tricks { }; json2html = callPackage ../development/python-modules/json2html { }; @@ -11576,6 +11578,8 @@ self: super: with self; { openpaperwork-gtk = callPackage ../applications/office/paperwork/openpaperwork-gtk.nix { }; + openplantbook-sdk = callPackage ../development/python-modules/openplantbook-sdk { }; + openpyxl = callPackage ../development/python-modules/openpyxl { }; openrazer = callPackage ../development/python-modules/openrazer/pylib.nix { };