public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "split release.nix into helpers and the jobs themselves".

Browse Source 
Change r32480 was made due to a misunderstanding.

svn path=/nixos/trunk/; revision=32512
This commit is contained in:
Peter Simons
2012-02-23 12:00:05 +00:00
parent f0dfd7d06a
commit d16fdad9fd
2 changed files with 86 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
lib/release-helpers.nix
View File

@@ -1,72 +0,0 @@
{ nixpkgs ? ../../nixpkgs }:
{
makeIso =
{ module, type, description ? type, maintainers ? ["eelco"] }:
{ nixosSrc ? {outPath = ./.; rev = 1234;}
, officialRelease ? false
, system ? "i686-linux"
}:
with import nixpkgs {inherit system;};
let
version = builtins.readFile ../VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
versionModule =
{ system.nixosVersion = version;
isoImage.isoBaseName = "nixos-${type}";
};
config = (import ./eval-config.nix {
inherit system nixpkgs;
modules = [ module versionModule ];
}).config;
iso = config.system.build.isoImage;
in
# Declare the ISO as a build product so that it shows up in Hydra.
runCommand "nixos-iso-${version}"
{ meta = {
description = "NixOS installation CD (${description}) - ISO image for ${system}";
maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
};
inherit iso;
passthru = { inherit config; };
}
''
ensureDir $out/nix-support
echo "file iso" $iso/iso/*.iso* >> $out/nix-support/hydra-build-products
''; # */
makeSystemTarball =
{ module, maintainers ? ["viric"]}:
{ nixosSrc ? {outPath = ./.; rev = 1234;}
, officialRelease ? false
, system ? "i686-linux"
}:
with import nixpkgs {inherit system;};
let
version = builtins.readFile ../VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
versionModule = { system.nixosVersion = version; };
config = (import ./eval-config.nix {
inherit system nixpkgs;
modules = [ module versionModule ];
}).config;
tarball = config.system.build.tarball;
in
tarball //
{ meta = {
description = "NixOS system tarball for ${system} - ${stdenv.platform.name}";
maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
};
inherit config;
};
}