summaryrefslogtreecommitdiffstats
path: root/release.nix
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2009-03-02 13:50:26 (GMT)
committerEelco Dolstra <e.dolstra@tudelft.nl>2009-03-02 13:50:26 (GMT)
commit0bc577f03368fb1a7824d5468bb668ab780c7561 (patch)
tree26bdbb20add99e63f4e73a43c87175c6de2a3d9f /release.nix
parent77847c443e1750936b18d4d669ee9acd8fb7af0b (diff)
downloadpatchelf-0bc577f03368fb1a7824d5468bb668ab780c7561.zip
patchelf-0bc577f03368fb1a7824d5468bb668ab780c7561.tar.gz
patchelf-0bc577f03368fb1a7824d5468bb668ab780c7561.tar.bz2
* Put the current version in a separate file so that it can be used in
the release expression.
Diffstat (limited to 'release.nix')
-rw-r--r--release.nix13
1 files changed, 8 insertions, 5 deletions
diff --git a/release.nix b/release.nix
index 7d619c9..db820ec 100644
--- a/release.nix
+++ b/release.nix
@@ -14,13 +14,14 @@ let
releaseTools.makeSourceTarball {
name = "patchelf-tarball";
+ version = builtins.readFile ./version;
src = patchelfSrc;
inherit officialRelease;
};
coverage =
- { tarball ? {path = jobs.tarball {};}
+ { tarball ? jobs.tarball {}
, nixpkgs ? {path = ../nixpkgs;}
}:
@@ -34,7 +35,7 @@ let
build =
- { tarball ? {path = jobs.tarball {};}
+ { tarball ? jobs.tarball {}
, nixpkgs ? {path = ../nixpkgs;}
, system ? "i686-linux"
}:
@@ -56,6 +57,8 @@ let
rpm_fedora10i386 = makeRPM_i686 (diskImages: diskImages.fedora10i386) 40;
rpm_fedora10x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora10x86_64) 40;
rpm_opensuse103i386 = makeRPM_i686 (diskImages: diskImages.opensuse103i386) 40;
+ rpm_opensuse110i386 = makeRPM_i686 (diskImages: diskImages.opensuse110i386) 40;
+ rpm_opensuse110x86_64 = makeRPM_x86_64 (diskImages: diskImages.opensuse110x86_64) 40;
deb_debian40i386 = makeDeb_i686 (diskImages: diskImages.debian40i386) 40;
@@ -76,14 +79,14 @@ let
makeRPM =
system: diskImageFun: prio:
- { tarball ? {path = jobs.tarball {};}
+ { tarball ? jobs.tarball {}
, nixpkgs ? {path = ../nixpkgs;}
}:
with import nixpkgs.path {inherit system;};
releaseTools.rpmBuild rec {
- name = "patchelf-rpm-${diskImage.name}";
+ name = "patchelf-rpm";
src = tarball;
diskImage = diskImageFun vmTools.diskImages;
meta = { schedulingPriority = toString prio; };
@@ -95,7 +98,7 @@ let
makeDeb =
system: diskImageFun: prio:
- { tarball ? {path = jobs.tarball {};}
+ { tarball ? jobs.tarball {}
, nixpkgs ? {path = ../nixpkgs;}
}: