shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-02-01 09:47:48 +03:00
Code Releases Activity

NIX: Resolve issues with fedora-release and kernel-modules-extra.

Browse Source
This commit is contained in:
Petr Rockai 2015-02-11 14:22:05 +01:00
parent 727c7ff85d
commit df28c4d912
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nix/default.nix
View File

@ -207,7 +207,7 @@ let
}; };
urlPrefix = centos_url version arch; urlPrefix = centos_url version arch;
archs = ["noarch" arch] ++ (if eqStrings arch "i386" then ["i586" "i686"] else []); archs = ["noarch" arch] ++ (if eqStrings arch "i386" then ["i586" "i686"] else []);
packages = [ "centos-release" ] ++ pkgs.vmTools.commonFedoraPackages; packages = pkgs.vmTools.commonCentOSPackages;
}; };
fedora = { version, sha, arch }: rec { fedora = { version, sha, arch }: rec {
name = "fedora-${version}-${arch}"; name = "fedora-${version}-${arch}";
@ -218,7 +218,7 @@ let
}; };
urlPrefix = fedora_url version arch; urlPrefix = fedora_url version arch;
archs = ["noarch" arch] ++ (if eqStrings arch "i386" then ["i586" "i686"] else []); archs = ["noarch" arch] ++ (if eqStrings arch "i386" then ["i586" "i686"] else []);
packages = [ "fedora-release" ] ++ pkgs.vmTools.commonFedoraPackages; packages = pkgs.vmTools.commonFedoraPackages;
unifiedSystemDir = true; unifiedSystemDir = true;
}; };
rawhide = version: arch: repodata: import (pkgs.runCommand "rawhide-${version}-${arch}.nix" {} '' rawhide = version: arch: repodata: import (pkgs.runCommand "rawhide-${version}-${arch}.nix" {} ''
@ -303,20 +303,19 @@ let
"perl-GD" # for lcov "perl-GD" # for lcov
"kernel" "kernel"
]; ];
fedora_common = [ "fedora-release" "dlm-devel" "corosynclib-devel" ];
centos63 = [ "clusterlib-devel" "openaislib-devel" "cman" "libudev-devel" "valgrind-devel" ]; centos63 = [ "clusterlib-devel" "openaislib-devel" "cman" "libudev-devel" "valgrind-devel" ];
centos64 = centos63; centos64 = centos63;
centos65 = centos64; centos65 = centos64;
centos70 = fedora20; centos70 = [ "dlm-devel" "dlm" "corosynclib-devel" "perl-Digest-MD5" "systemd-devel"
"procps-ng" "valgrind-devel" ];
fedora17 = fedora18 ++ [ "libudev-devel" ]; fedora17 = fedora18 ++ [ "libudev-devel" ];
fedora18 = [ "fedora-release" "dlm-devel" "corosynclib-devel" "device-mapper-persistent-data" fedora18 = [ "dlm-devel" "corosynclib-devel" "device-mapper-persistent-data"
"dlm" "systemd-devel" "perl-Digest-MD5" ]; "dlm" "systemd-devel" "perl-Digest-MD5" "kernel-modules-extra" ];
fedora18u = fedora18; fedora18u = fedora18;
fedora19 = [ "fedora-release" "dlm-devel" "dlm" "corosynclib-devel" "perl-Digest-MD5" "systemd-devel" fedora19 = centos70 + [ "kernel-modules-extra" ];
"procps-ng" "valgrind-devel" ];
fedora19u = fedora19; fedora19u = fedora19;
fedora20 = fedora19; fedora20 = fedora19;