diff options
Diffstat (limited to '')
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | hosts/arrakis/default.nix | 2 | ||||
| -rw-r--r-- | hosts/arrakis/services.nix | 5 | ||||
| -rw-r--r-- | hosts/caladan/default.nix | 2 | ||||
| -rw-r--r-- | hosts/common/optional/multimedia.nix | 2 | ||||
| -rw-r--r-- | overlays/default.nix | 6 |
6 files changed, 11 insertions, 10 deletions
@@ -36,7 +36,7 @@ # per https://nixos-and-flakes.thiscute.world/nixos-with-flakes/downgrade-or-upgrade-packages #my-nixpkgs.url = "github:nipsy/nixpkgs/update_reaper_7.61"; #nixpkgs-67e692392.url = "github:nixos/nixpkgs/67e69239226f37168d1adb8d29bd61150756a03e"; - nixpkgs-pr540730.url = "github:rnhmjoj/nixpkgs/pr-fix-mkvtoolnix"; + nixpkgs-pr545346.url = "github:JamieMagee/nixpkgs/python3Packages.ct3"; #nixpkgs-wine9_22.url = "github:nixos/nixpkgs/dea5930f0ed8c29d3758d5ade9898b4e99d80b74"; nvidia-patch = { @@ -59,7 +59,7 @@ nixos-hardware, nixpkgs-kerneol, nixpkgs-master, - nixpkgs-pr540730, + nixpkgs-pr545346, nixpkgs-stable, #nixpkgs-staging, #nixpkgs-wine9_22, diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index fa0ccba..856ab3a 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -252,7 +252,7 @@ outputs.overlays.kerneol-packages outputs.overlays.master-packages outputs.overlays.modifications - outputs.overlays.pr540730-packages + outputs.overlays.pr545346-packages outputs.overlays.stable-packages #outputs.overlays.wine9_22-packages ]; diff --git a/hosts/arrakis/services.nix b/hosts/arrakis/services.nix index 697c25b..b8e8f2a 100644 --- a/hosts/arrakis/services.nix +++ b/hosts/arrakis/services.nix @@ -280,10 +280,11 @@ printing.enable = true; sabnzbd = { + configFile = "/home/nipsy/.sabnzbd/sabnzbd.ini"; enable = true; - user = "nipsy"; group = "nipsy"; - configFile = "/home/nipsy/.sabnzbd/sabnzbd.ini"; + package = pkgs.pr545346.sabnzbd; + user = "nipsy"; }; samba = { diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix index a507c0c..fdb34b9 100644 --- a/hosts/caladan/default.nix +++ b/hosts/caladan/default.nix @@ -149,7 +149,7 @@ outputs.overlays.kerneol-packages outputs.overlays.master-packages #outputs.overlays.my-nixpkgs-packages - outputs.overlays.pr540730-packages + #outputs.overlays.pr545346-packages outputs.overlays.stable-packages #outputs.overlays.staging-packages #outputs.overlays.wine9_22-packages diff --git a/hosts/common/optional/multimedia.nix b/hosts/common/optional/multimedia.nix index 68bd404..8e820b1 100644 --- a/hosts/common/optional/multimedia.nix +++ b/hosts/common/optional/multimedia.nix @@ -6,7 +6,7 @@ pkgs.lame pkgs.mangohud pkgs.mpv - pkgs.pr540730.mkvtoolnix-cli + pkgs.mkvtoolnix-cli pkgs.vlc pkgs.x265 ]; diff --git a/overlays/default.nix b/overlays/default.nix index 0cacee0..520e405 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -8,7 +8,7 @@ # outputs.overlays.kerneol-packages # outputs.overlays.master-packages # outputs.overlays.my-nixpkgs -# outputs.overlays.pr540730-packages +# outputs.overlays.pr545346-packages # outputs.overlays.stable-packages # outputs.overlays.staging-packages # outputs.overlays.wine9_22-packages @@ -99,8 +99,8 @@ # }; #}; - pr540730-packages = final: _prev: { - pr540730 = import inputs.nixpkgs-pr540730 { + pr545346-packages = final: _prev: { + pr545346 = import inputs.nixpkgs-pr545346 { inherit (final); config.allowUnfree = true; localSystem = final.stdenv.hostPlatform; |