about summary refs log tree commit diff
path: root/release.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2017-11-12 17:37:53 +0100
committeraszlig <aszlig@nix.build>2017-11-12 17:49:31 +0100
commit2a09a44a4494e54a03ce891e9c92cc6542f74227 (patch)
treeee9325462fa7fda37e1e46cfeb8008b08eb28e97 /release.nix
parentfa56aefe3944ab484d1da82f42e9cdb5352541c7 (diff)
pkgs: Remove the vuizvui namespace
It's a bit weird to need to write something like this:

nix-build pkgs -A vuizvui.aszlig.vim

We're already within vuizvui, and the filesystem paths are already
structured in a way so that the above is in pkgs/aszlig/vim, so the need
to add the vuizvui attribute to that seems quite pointless and
unnatural.

I have tested this by evaluating a few machines, tests and packages.

Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'release.nix')
-rw-r--r--release.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/release.nix b/release.nix
index b71ad0c3..08ff74c8 100644
--- a/release.nix
+++ b/release.nix
@@ -51,7 +51,7 @@ let
     noGames = flip removeAttrs [ "games" ];
     releaseLib = import "${nixpkgs}/pkgs/top-level/release-lib.nix" {
       inherit supportedSystems;
-      packageSet = attrs: noGames (import vuizvui attrs).pkgs.vuizvui;
+      packageSet = attrs: noGames (import vuizvui attrs).pkgs;
     };
 
     packagePlatforms = mapAttrs (name: value: let
@@ -111,7 +111,7 @@ in with pkgsUpstream.lib; with builtins; {
   inherit pkgs;
 
   channels = let
-    mkChannel = attrs: root.pkgs.vuizvui.mkChannel (rec {
+    mkChannel = attrs: root.pkgs.mkChannel (rec {
       name = "vuizvui-channel-${attrs.name or "generic"}-${vuizvuiVersion}";
       src = vuizvui;
       patchPhase = ''