From d22d1069d8adf8116b68fb679ecac68b485d862c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 29 Apr 2015 07:21:07 +0200
Subject: release.nix: Provide a name to patchedNixpkgs.

Yeah, probably will work a bit better without evaluation errors ;-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 release.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'release.nix')

diff --git a/release.nix b/release.nix
index 288dfd76..7a320e2f 100644
--- a/release.nix
+++ b/release.nix
@@ -6,9 +6,11 @@
 let
   nixpkgsRevCount = nixpkgsSrc.revCount or 12345;
   nixpkgsShortRev = nixpkgsSrc.shortRev or "abcdefg";
+  nixpkgsVersion = "pre${toString nixpkgsRevCount}.${nixpkgsShortRev}-vuizvui";
 
   nixpkgs = let
     patchedNixpkgs = (import nixpkgsSrc {}).stdenv.mkDerivation {
+      name = "nixpkgs-${nixpkgsVersion}";
       src = nixpkgsSrc;
       phases = [ "unpackPhase" "installPhase" ];
       installPhase = ''
@@ -44,11 +46,11 @@ in with pkgsUpstream.lib; with builtins; {
     mkChannel = attrs: root.pkgs.mkChannel (rec {
       name = "vuizvui-channel-${attrs.name or "generic"}-${version}";
       version = "${toString vuizvui.revCount}.${vuizvui.shortRev}";
-      pkgsVer = "pre${toString nixpkgsRevCount}.${nixpkgsShortRev}-vuizvui";
+      inherit nixpkgsVersion;
       src = vuizvui;
       patchPhase = ''
         cp -r --no-preserve=mode,ownership "${nixpkgs}/" nixpkgs
-        echo -n "$pkgsVer" > nixpkgs/.version-suffix
+        echo -n "$nixpkgsVersion" > nixpkgs/.version-suffix
         echo -n ${nixpkgs.rev or nixpkgsShortRev} > nixpkgs/.git-revision
         echo './nixpkgs' > nixpkgs-path.nix
         touch .update-on-nixos-rebuild
-- 
cgit 1.4.1