treewide: use packageName
This commit is contained in:
parent
38bf02df0a
commit
856ee03a20
|
@ -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 = {
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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 = {
|
||||
|
|
|
@ -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";
|
||||
}
|
||||
|
|
|
@ -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"
|
||||
#];
|
||||
}
|
||||
];
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue