aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2026-05-30 19:43:50 +0200
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2026-05-30 19:43:50 +0200
commit431505d7ad824e2e34eb421810136d44f3d7314f (patch)
treea2bdc7cf5951e6774b564080b4b0d14f08400de1
parentflake: Update to nixos-26.05 (diff)
downloadnixos-server-431505d7ad824e2e34eb421810136d44f3d7314f.zip
treewide: Replace usages of `pkgsUnstable` with `pkgs`
With the new nixos release, the stuff that was only in `pkgsUnstable` is now also in `pkgs`.
Diffstat (limited to '')
-rw-r--r--modules/by-name/in/invidious-router/module.nix4
-rw-r--r--modules/by-name/sh/sharkey/module.nix3
-rw-r--r--tests/by-name/sh/sharkey-cpu/test.nix2
-rw-r--r--tests/by-name/ta/taskchampion-sync/test.nix3
4 files changed, 5 insertions, 7 deletions
diff --git a/modules/by-name/in/invidious-router/module.nix b/modules/by-name/in/invidious-router/module.nix
index f85a06c..750f852 100644
--- a/modules/by-name/in/invidious-router/module.nix
+++ b/modules/by-name/in/invidious-router/module.nix
@@ -1,7 +1,7 @@
{
config,
lib,
- pkgsUnstable,
+ pkgs,
...
}: let
cfg = config.vhack.invidious-router;
@@ -21,7 +21,7 @@ in {
config = lib.mkIf cfg.enable {
services.invidious-router = {
enable = true;
- package = pkgsUnstable.invidious-router;
+ package = pkgs.invidious-router;
settings = {
app = {
listen = "127.0.0.1:8050";
diff --git a/modules/by-name/sh/sharkey/module.nix b/modules/by-name/sh/sharkey/module.nix
index 18bf394..186fed2 100644
--- a/modules/by-name/sh/sharkey/module.nix
+++ b/modules/by-name/sh/sharkey/module.nix
@@ -2,7 +2,6 @@
config,
lib,
pkgs,
- pkgsUnstable,
...
}: let
cfg = config.vhack.sharkey;
@@ -19,7 +18,7 @@ in {
package = lib.mkOption {
type = lib.types.package;
- default = pkgsUnstable.sharkey;
+ default = pkgs.sharkey;
defaultText = lib.literalExpression "vhackPackages.sharkey";
description = "Sharkey package to use.";
};
diff --git a/tests/by-name/sh/sharkey-cpu/test.nix b/tests/by-name/sh/sharkey-cpu/test.nix
index 6082806..47c16ff 100644
--- a/tests/by-name/sh/sharkey-cpu/test.nix
+++ b/tests/by-name/sh/sharkey-cpu/test.nix
@@ -42,7 +42,7 @@ nixos-lib.runTest {
# Test that sharkey's hardening still allows access to the CPUs.
sharkey.serviceConfig.ExecStart = let
- nodejs = pkgs.lib.getExe pkgsUnstable.nodejs;
+ nodejs = pkgs.lib.getExe pkgs.nodejs;
script = pkgs.writeTextFile {
name = "script.js";
text = ''
diff --git a/tests/by-name/ta/taskchampion-sync/test.nix b/tests/by-name/ta/taskchampion-sync/test.nix
index cdbe062..4bca4e0 100644
--- a/tests/by-name/ta/taskchampion-sync/test.nix
+++ b/tests/by-name/ta/taskchampion-sync/test.nix
@@ -20,8 +20,7 @@ nixos-lib.runTest {
};
nodes = let
- # The feature flag is only in version 3.2 and upwards. Stable is still on 3.1
- taskwarriorPackage = pkgsUnstable.taskwarrior3.overrideAttrs (final: prev: {
+ taskwarriorPackage = pkgs.taskwarrior3.overrideAttrs (final: prev: {
cmakeFlags = (prev.cmakeFlags or []) ++ ["-DENABLE_TLS_NATIVE_ROOTS=true"];
});
in {