summaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
authorPetr Rockai <prockai@redhat.com>2015-02-05 14:21:31 +0100
committerPetr Rockai <prockai@redhat.com>2015-02-05 14:21:31 +0100
commit43d6b44a9fac5809bf73a88a7a6a106e302b4fe4 (patch)
tree69b5c5de40ba7ab0fd4b9bc46a43ca0d0e138789 /nix
parentb9a017d94cb5ad432c51df861242f42cc4f01ba3 (diff)
downloadlvm2-43d6b44a9fac5809bf73a88a7a6a106e302b4fe4.tar.gz
NIX: Request {fedora,centos}-release packages explicitly.
Diffstat (limited to 'nix')
-rw-r--r--nix/default.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/nix/default.nix b/nix/default.nix
index f9f025fb6..0a45babc7 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -207,8 +207,7 @@ let
};
urlPrefix = centos_url version arch;
archs = ["noarch" arch] ++ (if eqStrings arch "i386" then ["i586" "i686"] else []);
- packages = filter (n: !(eqStrings n "fedora-release")) pkgs.vmTools.commonFedoraPackages ++
- [ "centos-release" ];
+ packages = [ "centos-release" ] ++ pkgs.vmTools.commonFedoraPackages;
};
fedora = { version, sha, arch }: rec {
name = "fedora-${version}-${arch}";
@@ -219,7 +218,7 @@ let
};
urlPrefix = fedora_url version arch;
archs = ["noarch" arch] ++ (if eqStrings arch "i386" then ["i586" "i686"] else []);
- packages = pkgs.vmTools.commonFedoraPackages;
+ packages = [ "fedora-release" ] ++ pkgs.vmTools.commonFedoraPackages;
unifiedSystemDir = true;
};
rawhide = version: arch: repodata: import (pkgs.runCommand "rawhide-${version}-${arch}.nix" {} ''