movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 20:55:31 +03:00
Code Issues Projects Releases Packages 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
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 ../../..); nixosTarball = makeTarball "nixos.tar.bz2" (cleanSource ../../..);
# Put Nixpkgs in a tarball. # Put Nixpkgs in a tarball.
nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (cleanSource pkgs.path); nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (cleanSource <nixpkgs>);
includeSources = true; includeSources = true;

16
release.nix
View file

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