diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-02-10T10·33+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-02-10T10·33+0100 |
| commit | 5d9cd27dce30e1f221815f3f888203414e12a167 (patch) | |
| tree | 857c679774970d5176fc2e709d5dafe63f9ce042 | |
| parent | a596c525ad3ca86226cdb8094b91a578b23c1dae (diff) | |
Add Fedora 21 build
Fixes #467.
| -rw-r--r-- | release.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/release.nix b/release.nix index 5b6ff22844fc..3eff28b00d30 100644 --- a/release.nix +++ b/release.nix @@ -181,8 +181,10 @@ let }; - rpm_fedora20i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora20i386); - rpm_fedora20x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora20x86_64); + rpm_fedora20i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora20i386) []; + rpm_fedora20x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora20x86_64) []; + rpm_fedora21i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora21i386) [ "libsodium-devel" ]; + rpm_fedora21x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora21x86_64) [ "libsodium-devel" ]; deb_debian7i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.debian7i386); @@ -264,7 +266,7 @@ let makeRPM_x86_64 = makeRPM "x86_64-linux"; makeRPM = - system: diskImageFun: + system: diskImageFun: extraPackages: with import <nixpkgs> { inherit system; }; @@ -272,7 +274,9 @@ let name = "nix-rpm"; src = jobs.tarball; diskImage = (diskImageFun vmTools.diskImageFuns) - { extraPackages = [ "perl-DBD-SQLite" "perl-devel" "sqlite" "sqlite-devel" "bzip2-devel" "emacs" "perl-WWW-Curl" ]; }; + { extraPackages = + [ "perl-DBD-SQLite" "perl-devel" "sqlite" "sqlite-devel" "bzip2-devel" "emacs" "perl-WWW-Curl" ] + ++ extraPackages; }; memSize = 1024; meta.schedulingPriority = 50; postRPMInstall = "cd /tmp/rpmout/BUILD/nix-* && make installcheck"; |