remove unnecessary recursive attribute sets
This commit is contained in:
parent
36a555f807
commit
a67ca5d03b
3 changed files with 4 additions and 5 deletions
|
@ -9,7 +9,7 @@ let
|
||||||
inherit (builtins) attrValues removeAttrs;
|
inherit (builtins) attrValues removeAttrs;
|
||||||
|
|
||||||
config = hostName:
|
config = hostName:
|
||||||
lib.nixosSystem rec {
|
lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
|
|
||||||
specialArgs.usr = { inherit utils; };
|
specialArgs.usr = { inherit utils; };
|
||||||
|
|
|
@ -5,7 +5,7 @@ let
|
||||||
inherit (builtins) readFile toFile;
|
inherit (builtins) readFile toFile;
|
||||||
|
|
||||||
init = toFile "init.sh" "${readFile ./init.sh}";
|
init = toFile "init.sh" "${readFile ./init.sh}";
|
||||||
in buildRustPackage rec {
|
in buildRustPackage {
|
||||||
pname = "purs";
|
pname = "purs";
|
||||||
version = "0.1.0";
|
version = "0.1.0";
|
||||||
|
|
||||||
|
|
|
@ -13,9 +13,8 @@
|
||||||
# Patch libvirt to use ebtables-legacy
|
# Patch libvirt to use ebtables-legacy
|
||||||
libvirt = if prev.libvirt.version <= "5.4.0" && prev.ebtables.version
|
libvirt = if prev.libvirt.version <= "5.4.0" && prev.ebtables.version
|
||||||
> "2.0.10-4" then
|
> "2.0.10-4" then
|
||||||
prev.libvirt.overrideAttrs (oldAttrs: rec {
|
prev.libvirt.overrideAttrs
|
||||||
EBTABLES_PATH = "${final.ebtables}/bin/ebtables-legacy";
|
(oldAttrs: { EBTABLES_PATH = "${final.ebtables}/bin/ebtables-legacy"; })
|
||||||
})
|
|
||||||
else
|
else
|
||||||
prev.libvirt;
|
prev.libvirt;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue