nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-10-31 22:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Fix the NixOS jobset.

Browse Source 
svn path=/nixos/trunk/; revision=32783
This commit is contained in:
Eelco Dolstra 2012-03-04 20:57:34 +00:00
parent 7d964498b8
commit 0d4eb37e16
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/installer/cd-dvd/installation-cd-base.nix
View File

@ -22,7 +22,7 @@ let
nixosTarball = makeTarball "nixos.tar.bz2" (cleanSource ../../..);
# Put Nixpkgs in a tarball.
nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (cleanSource pkgs.path);
nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (cleanSource <nixpkgs>);
includeSources = true;

16
release.nix
View File

@ -1,5 +1,3 @@
{ nixpkgs ? ../nixpkgs }:
let
@ -10,7 +8,7 @@ let
, system ? "i686-linux"
}:
with import nixpkgs {inherit system;};
with <nixpkgs> {inherit system;};
let
@ -22,7 +20,7 @@ let
};
config = (import lib/eval-config.nix {
inherit system nixpkgs;
inherit system;
modules = [ module versionModule ];
}).config;
@ -51,14 +49,14 @@ let
, system ? "i686-linux"
}:
with import nixpkgs {inherit system;};
with import <nixpkgs> {inherit system;};
let
version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
versionModule = { system.nixosVersion = version; };
config = (import lib/eval-config.nix {
inherit system nixpkgs;
inherit system;
modules = [ module versionModule ];
}).config;
@ -81,7 +79,7 @@ let
, officialRelease ? false
}:
with import nixpkgs {};
with import <nixpkgs> {};
releaseTools.makeSourceTarball {
name = "nixos-tarball";
@ -109,10 +107,9 @@ let
}:
(import "${nixosSrc}/doc/manual" {
pkgs = import nixpkgs {};
pkgs = import <nixpkgs> {};
options =
(import lib/eval-config.nix {
inherit nixpkgs;
modules = [ { fileSystems = []; } ];
}).options;
revision =
@ -162,7 +159,6 @@ let
tests =
let
t = import ./tests {
inherit nixpkgs;
system = "i686-linux";
};
in {