diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-21T14·30+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-21T14·30+0100 |
| commit | 81628a6ccc6ce496735b22492bee15c9ad46f072 (patch) | |
| tree | d1ec18b84514d2f44700082f8d800efb929a7678 /release.nix | |
| parent | b1db599dd05e86f65e73dc40584913e6e78c2bac (diff) | |
| parent | 5ef8508a92997dbd7f8aa501b64fd283fb1c7bb8 (diff) | |
Merge branch 'master' into make
Conflicts: src/libexpr/eval.cc
Diffstat (limited to 'release.nix')
| -rw-r--r-- | release.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/release.nix b/release.nix index 11ed7a1c30cc..67087190942f 100644 --- a/release.nix +++ b/release.nix @@ -6,7 +6,7 @@ let pkgs = import <nixpkgs> {}; - systems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ]; + systems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" /* "x86_64-freebsd" "i686-freebsd" */ ]; jobs = rec { @@ -23,7 +23,7 @@ let inherit officialRelease; buildInputs = - [ curl bison flex2535 perl libxml2 libxslt w3m bzip2 + [ curl bison flex perl libxml2 libxslt w3m bzip2 tetex dblatex nukeReferences pkgconfig sqlite git ]; @@ -175,6 +175,8 @@ let rpm_fedora18x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora18x86_64) 60; rpm_fedora19i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora19i386) 70; rpm_fedora19x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora19x86_64) 70; + rpm_fedora20i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora20i386) 70; + rpm_fedora20x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora20x86_64) 70; deb_debian60i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.debian60i386) 50; @@ -212,15 +214,15 @@ let meta.description = "Release-critical builds"; constituents = [ tarball - build.i686-freebsd + #build.i686-freebsd build.i686-linux build.x86_64-darwin - build.x86_64-freebsd + #build.x86_64-freebsd build.x86_64-linux - binaryTarball.i686-freebsd + #binaryTarball.i686-freebsd binaryTarball.i686-linux binaryTarball.x86_64-darwin - binaryTarball.x86_64-freebsd + #binaryTarball.x86_64-freebsd binaryTarball.x86_64-linux deb_debian7i386 deb_debian7x86_64 @@ -230,6 +232,8 @@ let deb_ubuntu1310x86_64 rpm_fedora19i386 rpm_fedora19x86_64 + rpm_fedora20i386 + rpm_fedora20x86_64 tests.remote_builds tests.nix_copy_closure ]; |