From a67ca5d03bc59fed89491bc167a41d8dec367f89 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Sat, 1 Feb 2020 21:10:09 -0700 Subject: [PATCH] remove unnecessary recursive attribute sets --- hosts/default.nix | 2 +- pkgs/shells/zsh/purs/default.nix | 2 +- profiles/virt/default.nix | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hosts/default.nix b/hosts/default.nix index 4f90a2d..0338666 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -9,7 +9,7 @@ let inherit (builtins) attrValues removeAttrs; config = hostName: - lib.nixosSystem rec { + lib.nixosSystem { inherit system; specialArgs.usr = { inherit utils; }; diff --git a/pkgs/shells/zsh/purs/default.nix b/pkgs/shells/zsh/purs/default.nix index 5b254d1..7dfda6b 100644 --- a/pkgs/shells/zsh/purs/default.nix +++ b/pkgs/shells/zsh/purs/default.nix @@ -5,7 +5,7 @@ let inherit (builtins) readFile toFile; init = toFile "init.sh" "${readFile ./init.sh}"; -in buildRustPackage rec { +in buildRustPackage { pname = "purs"; version = "0.1.0"; diff --git a/profiles/virt/default.nix b/profiles/virt/default.nix index aea426b..f6d7f9c 100644 --- a/profiles/virt/default.nix +++ b/profiles/virt/default.nix @@ -13,9 +13,8 @@ # Patch libvirt to use ebtables-legacy libvirt = if prev.libvirt.version <= "5.4.0" && prev.ebtables.version > "2.0.10-4" then - prev.libvirt.overrideAttrs (oldAttrs: rec { - EBTABLES_PATH = "${final.ebtables}/bin/ebtables-legacy"; - }) + prev.libvirt.overrideAttrs + (oldAttrs: { EBTABLES_PATH = "${final.ebtables}/bin/ebtables-legacy"; }) else prev.libvirt; };