summaryrefslogtreecommitdiff
path: root/release.nix
diff options
context:
space:
mode:
authorKjetil Orbekk <kjetil.orbekk@gmail.com>2017-05-20 13:01:32 -0400
committerKjetil Orbekk <kjetil.orbekk@gmail.com>2017-05-20 13:01:32 -0400
commitba2b7009dd7c42517afccfc5b1b841f0f41a96f9 (patch)
tree303db7e549aaa98f7e236dcd9097d612c556e4cc /release.nix
parentd455a5d6db973a490192e713e1e8f5d66bb6a0b4 (diff)
release.nix: Fix pkgs import.
Diffstat (limited to 'release.nix')
-rw-r--r--release.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/release.nix b/release.nix
index 4fd73d8..51c453f 100644
--- a/release.nix
+++ b/release.nix
@@ -1,5 +1,5 @@
{ nixpkgs ? (import <nixpkgs> {}) }:
-with nixpkgs.pkgs;
+with nixpkgs;
let
pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l;
@@ -27,7 +27,7 @@ let
{ object = config.system.build.toplevel + "/init";
symlink = "/init";
}
- ] ++ (pkgs2storeContents [ pkgs.stdenv ]);
+ ] ++ (pkgs2storeContents [ stdenv ]);
# Some container managers like lxc need these
extraCommands = writeScript "setup.sh" ''
@@ -48,7 +48,7 @@ in
containerTarball = (import <nixpkgs/nixos/release.nix> {})
.containerTarball.x86_64-linux;
- orbekkContainerTarball = makeSystemTarball {
+ kjContainerTarball = makeSystemTarball {
module = ./machines/generic-container.nix;
system = "x86_64-linux";
};