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

Move nixpartHetzner into hetzner-nixops-installer. 

This should keep all Hetzner/NixOps specific stuff in one place.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2013-07-09 07:42:34 +02:00
parent 2fd13d8fca
commit d58a5eb572
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/misc/hetzner-nixops-installer/default.nix
View File

@ -1,6 +1,11 @@
{ stdenv, perl, gnutar, pathsFromGraph, nix, pythonPackages }: { stdenv, perl, gnutar, pathsFromGraph, nix, pythonPackages }:
let let
nixpart = pythonPackages.nixpart.override {
useNixUdev = false;
udevSoMajor = 0;
};
base = stdenv.mkDerivation { base = stdenv.mkDerivation {
name = "hetzner-nixops-base"; name = "hetzner-nixops-base";
@ -15,7 +20,7 @@ in stdenv.mkDerivation {
exportReferencesGraph = [ exportReferencesGraph = [
"refs-base" base "refs-base" base
"refs-nixpart" pythonPackages.nixpartHetzner "refs-nixpart" nixpart
]; ];
buildCommand = '' buildCommand = ''
@ -31,7 +36,7 @@ in stdenv.mkDerivation {
done done
# Only a symlink that is goint to be put into the Tar file. # Only a symlink that is goint to be put into the Tar file.
ln -ns "${pythonPackages.nixpartHetzner}/bin/nixpart" usr/bin/nixpart ln -ns "${nixpart}/bin/nixpart" usr/bin/nixpart
base_storepaths="$("${perl}/bin/perl" "${pathsFromGraph}" refs-base)" base_storepaths="$("${perl}/bin/perl" "${pathsFromGraph}" refs-base)"
base_registration="$(printRegistration=1 \ base_registration="$(printRegistration=1 \

4
pkgs/top-level/python-packages.nix
View File

@ -66,10 +66,6 @@ pythonPackages = python.modules // rec {
}); });
nixpart = callPackage ../tools/filesystems/nixpart { }; nixpart = callPackage ../tools/filesystems/nixpart { };
nixpartHetzner = nixpart.override {
useNixUdev = false;
udevSoMajor = 0;
};
pil = import ../development/python-modules/pil { pil = import ../development/python-modules/pil {
inherit (pkgs) fetchurl stdenv libjpeg zlib freetype; inherit (pkgs) fetchurl stdenv libjpeg zlib freetype;