diff options
Diffstat (limited to 'release.nix')
| -rw-r--r-- | release.nix | 67 |
1 files changed, 30 insertions, 37 deletions
diff --git a/release.nix b/release.nix index 1b6c67c..2cf9181 100644 --- a/release.nix +++ b/release.nix @@ -1,10 +1,11 @@ { patchelfSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdef"; } +, nixpkgs ? builtins.fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-19.03.tar.gz , officialRelease ? false }: let - pkgs = import <nixpkgs> { }; + pkgs = import nixpkgs { system = builtins.currentSystem or "x86_64-linux"; }; jobs = rec { @@ -13,13 +14,19 @@ let tarball = pkgs.releaseTools.sourceTarball rec { name = "patchelf-tarball"; - version = builtins.readFile ./version + (if officialRelease then "" else "pre${toString patchelfSrc.revCount}_${patchelfSrc.shortRev}"); + version = builtins.readFile ./version + + (if officialRelease then "" else + "." + + ((if patchelfSrc ? lastModifiedDate + then builtins.substring 0 8 patchelfSrc.lastModifiedDate + else toString patchelfSrc.revCount or 0) + + "." + patchelfSrc.shortRev)); versionSuffix = ""; # obsolete src = patchelfSrc; preAutoconf = "echo ${version} > version"; postDist = '' - cp README $out/ - echo "doc readme $out/README" >> $out/nix-support/hydra-build-products + cp README.md $out/ + echo "doc readme $out/README.md" >> $out/nix-support/hydra-build-products ''; }; @@ -32,39 +39,27 @@ let }; - build = pkgs.lib.genAttrs [ "x86_64-linux" "i686-linux" /* "x86_64-freebsd" "i686-freebsd" "x86_64-darwin" "i686-solaris" "i686-cygwin" */ ] (system: + build = pkgs.lib.genAttrs [ "x86_64-linux" "i686-linux" "aarch64-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 = tarball; doCheck = !stdenv.isDarwin && system != "i686-cygwin" && system != "i686-solaris"; buildInputs = lib.optionals stdenv.isLinux [ acl attr ]; - isReproducible = true; + isReproducible = system != "aarch64-linux"; # ARM machines are still on Nix 1.11 }); + /* + rpm_fedora27x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora27x86_64); - rpm_fedora20i386 = makeRPM_i686 (diskImages: diskImages.fedora20i386); - rpm_fedora20x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora20x86_64); - rpm_fedora21i386 = makeRPM_i686 (diskImages: diskImages.fedora21i386); - rpm_fedora21x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora21x86_64); - rpm_fedora23i386 = makeRPM_i686 (diskImages: diskImages.fedora23i386); - rpm_fedora23x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora23x86_64); + deb_debian9i386 = makeDeb_i686 (diskImages: diskImages.debian9i386); + deb_debian9x86_64 = makeDeb_x86_64 (diskImages: diskImages.debian9x86_64); - deb_debian7i386 = makeDeb_i686 (diskImages: diskImages.debian7i386); - deb_debian7x86_64 = makeDeb_x86_64 (diskImages: diskImages.debian7x86_64); - deb_debian8i386 = makeDeb_i686 (diskImages: diskImages.debian8i386); - deb_debian8x86_64 = makeDeb_x86_64 (diskImages: diskImages.debian8x86_64); - - deb_ubuntu1404i386 = makeDeb_i686 (diskImages: diskImages.ubuntu1404i386); - deb_ubuntu1404x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu1404x86_64); - deb_ubuntu1410i386 = makeDeb_i686 (diskImages: diskImages.ubuntu1410i386); - deb_ubuntu1410x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu1410x86_64); - deb_ubuntu1504i386 = makeDeb_i686 (diskImages: diskImages.ubuntu1504i386); - deb_ubuntu1504x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu1504x86_64); - deb_ubuntu1510i386 = makeDeb_i686 (diskImages: diskImages.ubuntu1510i386); - deb_ubuntu1510x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu1510x86_64); + deb_ubuntu1804i386 = makeDeb_i686 (diskImages: diskImages.ubuntu1804i386); + deb_ubuntu1804x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu1804x86_64); + */ release = pkgs.releaseTools.aggregate @@ -73,15 +68,13 @@ let [ tarball build.x86_64-linux build.i686-linux - #build.x86_64-freebsd - #build.i686-freebsd - #build.x86_64-darwin - rpm_fedora23i386 - rpm_fedora23x86_64 - deb_debian8i386 - deb_debian8x86_64 - deb_ubuntu1510i386 - deb_ubuntu1510x86_64 + /* + rpm_fedora27x86_64 + deb_debian9i386 + deb_debian9x86_64 + deb_ubuntu1804i386 + deb_ubuntu1804x86_64 + */ ]; meta.description = "Release-critical builds"; }; @@ -95,7 +88,7 @@ let makeRPM = system: diskImageFun: - with import <nixpkgs> { inherit system; }; + with import nixpkgs { inherit system; }; releaseTools.rpmBuild rec { name = "patchelf-rpm"; @@ -111,7 +104,7 @@ let makeDeb = system: diskImageFun: - with import <nixpkgs> { inherit system; }; + with import nixpkgs { inherit system; }; releaseTools.debBuild { name = "patchelf-deb"; |