axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

remove unnecessary recursive attribute sets

Browse source
This commit is contained in:
Timothy DeHerrera 2020-02-01 21:10:09 -07:00
parent 36a555f807
commit a67ca5d03b
No known key found for this signature in database
GPG key ID: 8985725DB5B0C122
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hosts/default.nix
View file

@ -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; };

2
pkgs/shells/zsh/purs/default.nix
View file

@ -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";

5
profiles/virt/default.nix
View file

@ -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;
}; };