NixOS · Nov 26, 2020 · Nov 26, 2020
Showing with 53 additions and 125 deletions.

+3 −0 default.nix

+50 −7 flake.nix

+0 −118 release.nix
diff --git a/default.nix b/default.nix
@@ -0,0 +1,3 @@
+(import (fetchTarball https://github.com/edolstra/flake-compat/archive/master.tar.gz) {
+  src = ./.;
+}).defaultNix
diff --git a/flake.nix b/flake.nix
@@ -8,26 +8,69 @@
     let
       supportedSystems = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
       forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system);
+
+      nixpkgsFor = forAllSystems (system:
+        import nixpkgs {
+          inherit system;
+          overlays = [ self.overlay ];
+        }
+      );
+
+      pkgs = nixpkgsFor.${"x86_64-linux"};
+
     in
 
-    rec {
+    {
 
       overlay = final: prev: {
 
         patchelf-new = final.stdenv.mkDerivation {
-          name = "patchelf-${hydraJobs.tarball.version}";
-          src = "${hydraJobs.tarball}/tarballs/*.tar.bz2";
+          name = "patchelf-${self.hydraJobs.tarball.version}";
+          src = "${self.hydraJobs.tarball}/tarballs/*.tar.bz2";
         };
 
       };
 
-      hydraJobs = import ./release.nix {
-        patchelfSrc = self;
-        nixpkgs = nixpkgs;
+      hydraJobs = {
+
+        tarball =
+          pkgs.releaseTools.sourceTarball rec {
+            name = "patchelf-tarball";
+            version = builtins.readFile ./version
+                      + "." + builtins.substring 0 8 self.lastModifiedDate
+                      + "." + (self.shortRev or "dirty");
+            versionSuffix = ""; # obsolete
+            src = self;
+            preAutoconf = "echo ${version} > version";
+            postDist = ''
+              cp README.md $out/
+              echo "doc readme $out/README.md" >> $out/nix-support/hydra-build-products
+            '';
+          };
+
+        coverage =
+          pkgs.releaseTools.coverageAnalysis {
+            name = "patchelf-coverage";
+            src = self.hydraJobs.tarball;
+            lcovFilter = ["*/tests/*"];
+          };
+
+        build = forAllSystems (system: nixpkgsFor.${system}.patchelf-new);
+
+        release = pkgs.releaseTools.aggregate
+          { name = "patchelf-${self.hydraJobs.tarball.version}";
+            constituents =
+              [ self.hydraJobs.tarball
+                self.hydraJobs.build.x86_64-linux
+                self.hydraJobs.build.i686-linux
+              ];
+            meta.description = "Release-critical builds";
+          };
+
       };
 
       checks = forAllSystems (system: {
-        build = hydraJobs.build.${system};
+        build = self.hydraJobs.build.${system};
       });
 
       defaultPackage = forAllSystems (system:

diff --git a/release.nix b/release.nix