diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-06 15:23:42 (GMT) |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-06 15:23:42 (GMT) |
| commit | c9e3ba482a2b9475c984b6cf5c581de78ed320cc (patch) | |
| tree | 47d85af6fe35a214f5a1a83ddc2d307d2162ac77 /release.nix | |
| parent | 21828ee8cc22f36232b28cf3f381a32f31d524a6 (diff) | |
| download | patchelf-c9e3ba482a2b9475c984b6cf5c581de78ed320cc.zip patchelf-c9e3ba482a2b9475c984b6cf5c581de78ed320cc.tar.gz patchelf-c9e3ba482a2b9475c984b6cf5c581de78ed320cc.tar.bz2 | |
release.nix: Use separate jobs for each platform
E.g. "build.x86_64-linux" instead of "build". Also, by not using a
Hydra input "system" anymore, the set of platforms to build on becomes
declarative.
See https://github.com/NixOS/hydra/issues/60
Diffstat (limited to 'release.nix')
| -rw-r--r-- | release.nix | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/release.nix b/release.nix index 7ee1680..dc56eab 100644 --- a/release.nix +++ b/release.nix @@ -4,10 +4,10 @@ let - pkgs = import <nixpkgs> {}; + pkgs = import <nixpkgs> { }; - jobs = { + jobs = rec { tarball = @@ -27,21 +27,20 @@ let coverage = pkgs.releaseTools.coverageAnalysis { name = "patchelf-coverage"; - src = jobs.tarball; + src = tarball; lcovFilter = ["*/tests/*"]; }; - build = - { system ? "i686-linux" }: + build = pkgs.lib.genAttrs [ "x86_64-linux" "i686-linux" "x86_64-freebsd" "i686-freebsd" "x86_64-darwin" "i686-solaris" "i686-cygwin" ] (system: - with import <nixpkgs> {inherit system;}; + with import <nixpkgs> { inherit system; }; releaseTools.nixBuild { name = "patchelf"; - src = jobs.tarball; - doCheck = system != "i686-darwin" && system != "i686-cygwin" && system != "i686-solaris"; - }; + src = tarball; + doCheck = system != "i686-cygwin" && system != "i686-solaris"; + }); rpm_fedora5i386 = makeRPM_i686 (diskImages: diskImages.fedora5i386) 10; @@ -101,7 +100,7 @@ let makeRPM = system: diskImageFun: prio: - with import <nixpkgs> {inherit system;}; + with import <nixpkgs> { inherit system; }; releaseTools.rpmBuild rec { name = "patchelf-rpm"; @@ -117,7 +116,7 @@ let makeDeb = system: diskImageFun: prio: - with import <nixpkgs> {inherit system;}; + with import <nixpkgs> { inherit system; }; releaseTools.debBuild { name = "patchelf-deb"; |