summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2019-09-04 20:17:56 +0200
committertv <tv@krebsco.de>2019-09-04 20:28:01 +0200
commit856ee03a203722722fb646c62c36e4b6aabadaee (patch)
tree50c4757cb928c784ec4c4b3719ee920219cd7e50
parent38bf02df0aedd219d70be49c363ccac4da2d09ca (diff)
treewide: use packageName
-rw-r--r--lass/2configs/br.nix9
-rw-r--r--makefu/2configs/default.nix3
-rw-r--r--tv/2configs/br.nix9
-rw-r--r--tv/2configs/hw/AO753.nix2
-rw-r--r--tv/2configs/hw/w110er.nix9
-rw-r--r--tv/2configs/xp-332.nix2
6 files changed, 19 insertions, 15 deletions
diff --git a/lass/2configs/br.nix b/lass/2configs/br.nix
index ad307c797..e4ccffe23 100644
--- a/lass/2configs/br.nix
+++ b/lass/2configs/br.nix
@@ -5,10 +5,11 @@ with import <stockholm/lib>;
<nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix>
];
- krebs.nixpkgs.allowUnfreePredicate = pkg: any (flip hasPrefix pkg.name) [
- "brother-udev-rule-type1-"
- "brscan4-"
- "mfcl2700dnlpr-"
+ krebs.nixpkgs.allowUnfreePredicate = pkg: any (eq (packageName pkg)) [
+ "brother-udev-rule-type1"
+ "brscan4"
+ "brscan4-etc-files"
+ "mfcl2700dnlpr"
];
hardware.sane = {
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 177114a49..5faf3ce93 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -31,7 +31,8 @@ with import <stockholm/lib>;
boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
- nixpkgs.config.allowUnfreePredicate = (pkg: pkgs.lib.hasPrefix "unrar-" pkg.name);
+ nixpkgs.config.allowUnfreePredicate = pkg: packageName pkg == "unrar";
+
krebs = {
enable = true;
diff --git a/tv/2configs/br.nix b/tv/2configs/br.nix
index d660ebc35..e6a46e903 100644
--- a/tv/2configs/br.nix
+++ b/tv/2configs/br.nix
@@ -5,10 +5,11 @@ with import <stockholm/lib>;
<nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix>
];
- krebs.nixpkgs.allowUnfreePredicate = pkg: any (flip hasPrefix pkg.name) [
- "brother-udev-rule-type1-"
- "brscan4-"
- "mfcl2700dnlpr-"
+ krebs.nixpkgs.allowUnfreePredicate = pkg: any (eq (packageName pkg)) [
+ "brother-udev-rule-type1"
+ "brscan4"
+ "brscan4-etc-files"
+ "mfcl2700dnlpr"
];
hardware.sane = {
diff --git a/tv/2configs/hw/AO753.nix b/tv/2configs/hw/AO753.nix
index 4df5e097a..d5b755cef 100644
--- a/tv/2configs/hw/AO753.nix
+++ b/tv/2configs/hw/AO753.nix
@@ -39,5 +39,5 @@ with import <stockholm/lib>;
HandleSuspendKey=ignore
'';
- krebs.nixpkgs.allowUnfreePredicate = pkg: hasPrefix "broadcom-sta-" pkg.name;
+ krebs.nixpkgs.allowUnfreePredicate = pkg: packageName pkg == "broadcom-sta";
}
diff --git a/tv/2configs/hw/w110er.nix b/tv/2configs/hw/w110er.nix
index 55e9482d4..7d837eabc 100644
--- a/tv/2configs/hw/w110er.nix
+++ b/tv/2configs/hw/w110er.nix
@@ -10,10 +10,11 @@ with import <stockholm/lib>;
#hardware.bumblebee.enable = true;
#hardware.bumblebee.group = "video";
#hardware.enableRedistributableFirmware= true;
- #krebs.nixpkgs.allowUnfreePredicate = pkg:
- # hasPrefix "nvidia-x11-" pkg.name ||
- # hasPrefix "nvidia-persistenced-" pkg.name ||
- # hasPrefix "nvidia-settings-" pkg.name;
+ #krebs.nixpkgs.allowUnfreePredicate = pkg: any (eq (packageName pkg)) [
+ # "nvidia-x11"
+ # "nvidia-persistenced"
+ # "nvidia-settings"
+ #];
}
];
diff --git a/tv/2configs/xp-332.nix b/tv/2configs/xp-332.nix
index 4a0b0ae16..a66b884c8 100644
--- a/tv/2configs/xp-332.nix
+++ b/tv/2configs/xp-332.nix
@@ -16,7 +16,7 @@ with import <stockholm/lib>;
};
krebs.nixpkgs.allowUnfreePredicate = pkg:
- elem (parseDrvName pkg.name).name [ "imagescan-plugin-networkscan" ];
+ packageName pkg == "imagescan-plugin-networkscan";
nixpkgs.overlays = singleton (self: super: {
utsushi-customized = self.utsushi.override {