diff options
author | aszlig <aszlig@redmoonstudios.org> | 2017-04-23 22:03:34 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2017-04-23 23:08:05 +0200 |
commit | b3d9a07086cb81e53e20837c96a3153453b0a123 (patch) | |
tree | e6c496d73203465d2ec4265d3200bf32f56362b3 | |
parent | 145a8be2b22a3a0459a46e70e8b5d8f4ecc701aa (diff) |
pkgs: Move all of my packages into pkgs/aszlig
This already has started in e0abe1dbbda54c1f048b5d38df05e1a3289216a6 with @Profpatsch putting his packages into its own namespace, so let's continue on that and move my crap into my own namespace as well. The only difference in my approach is that I'm now also using a new function called callPackageScope, which declutters pkgs/default.nix a bit and moves the individual callPackage invocations into aszlig/default.nix. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-rw-r--r-- | machines/aszlig/kzerza.nix | 2 | ||||
-rw-r--r-- | machines/aszlig/managed/brawndo.nix | 4 | ||||
-rw-r--r-- | machines/aszlig/managed/tyree.nix | 2 | ||||
-rw-r--r-- | modules/user/aszlig/profiles/workstation/lazy-packages.nix | 6 | ||||
-rw-r--r-- | modules/user/aszlig/profiles/workstation/packages.nix | 8 | ||||
-rw-r--r-- | modules/user/aszlig/services/i3/default.nix | 2 | ||||
-rw-r--r-- | modules/user/aszlig/services/vlock/default.nix | 2 | ||||
-rwxr-xr-x | pkgs/aszlig/aacolorize/aacolorize.py (renamed from pkgs/aacolorize/aacolorize.py) | 0 | ||||
-rw-r--r-- | pkgs/aszlig/aacolorize/default.nix (renamed from pkgs/aacolorize/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/aszlig/axbo/default.nix (renamed from pkgs/axbo/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/aszlig/default.nix | 14 | ||||
-rw-r--r-- | pkgs/aszlig/git-detach/default.nix (renamed from pkgs/git-detach/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/aszlig/grandpa/default.nix (renamed from pkgs/grandpa/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/aszlig/librxtx-java/default.nix (renamed from pkgs/librxtx-java/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/aszlig/lockdev/default.nix (renamed from pkgs/lockdev/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/aszlig/nixops/default.nix (renamed from pkgs/nixops/default.nix) | 2 | ||||
-rw-r--r-- | pkgs/aszlig/pvolctrl/default.nix (renamed from pkgs/pvolctrl/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/aszlig/santander/default.nix (renamed from pkgs/santander/default.nix) | 2 | ||||
-rw-r--r-- | pkgs/aszlig/santander/pipelight.patch (renamed from pkgs/santander/pipelight.patch) | 0 | ||||
-rw-r--r-- | pkgs/aszlig/santander/wine-no-unixfs.patch (renamed from pkgs/santander/wine-no-unixfs.patch) | 0 | ||||
-rw-r--r-- | pkgs/aszlig/santander/winscard.patch (renamed from pkgs/santander/winscard.patch) | 0 | ||||
-rw-r--r-- | pkgs/aszlig/tomahawk/default.nix (renamed from pkgs/tomahawk/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/default.nix | 25 |
23 files changed, 41 insertions, 28 deletions
diff --git a/machines/aszlig/kzerza.nix b/machines/aszlig/kzerza.nix index 08462ade..98b8867a 100644 --- a/machines/aszlig/kzerza.nix +++ b/machines/aszlig/kzerza.nix @@ -52,7 +52,7 @@ in { preStart = "${pkgs.kbd}/bin/chvt 7"; serviceConfig = { Type = "idle"; - ExecStart = "${pkgs.vuizvui.grandpa}/bin/grandpa"; + ExecStart = "${pkgs.vuizvui.aszlig.grandpa}/bin/grandpa"; ExecStopPost = "${pkgs.systemd}/bin/systemctl poweroff"; Restart = "on-failure"; StandardInput = "tty"; diff --git a/machines/aszlig/managed/brawndo.nix b/machines/aszlig/managed/brawndo.nix index 9042d8dd..61e7925b 100644 --- a/machines/aszlig/managed/brawndo.nix +++ b/machines/aszlig/managed/brawndo.nix @@ -56,7 +56,7 @@ in { }; environment.systemPackages = with pkgs; [ - vuizvui.axbo + vuizvui.aszlig.axbo chromium file gajim @@ -75,7 +75,7 @@ in { unfreePkgs.steam unfreeAndNonDistributablePkgs.skype thunderbird - vuizvui.tomahawk + vuizvui.aszlig.tomahawk wine xpdf youtubeDL diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix index ecc93217..7b14628c 100644 --- a/machines/aszlig/managed/tyree.nix +++ b/machines/aszlig/managed/tyree.nix @@ -10,7 +10,7 @@ environment.systemPackages = with pkgs; [ calibre cdparanoia chromium figlet gajim gimp htop inkscape thunderbird kdeApplications.gwenview kdeApplications.okular krita libreoffice mosh mpv - pciutils vlc vuizvui.tomahawk wget wine youtubeDL + pciutils vlc vuizvui.aszlig.tomahawk wget wine youtubeDL unfreeAndNonDistributablePkgs.skype ]; diff --git a/modules/user/aszlig/profiles/workstation/lazy-packages.nix b/modules/user/aszlig/profiles/workstation/lazy-packages.nix index 568e0a9f..1a4a9404 100644 --- a/modules/user/aszlig/profiles/workstation/lazy-packages.nix +++ b/modules/user/aszlig/profiles/workstation/lazy-packages.nix @@ -1,5 +1,5 @@ pkgs: with pkgs; [ - vuizvui.aacolorize + vuizvui.aszlig.aacolorize aqbanking erlang fbida @@ -24,7 +24,7 @@ pkgs: with pkgs; [ picard rtmpdump rtorrent - vuizvui.santander - vuizvui.tomahawk + vuizvui.aszlig.santander + vuizvui.aszlig.tomahawk uqm ] diff --git a/modules/user/aszlig/profiles/workstation/packages.nix b/modules/user/aszlig/profiles/workstation/packages.nix index 7f5411b1..da56177b 100644 --- a/modules/user/aszlig/profiles/workstation/packages.nix +++ b/modules/user/aszlig/profiles/workstation/packages.nix @@ -5,7 +5,7 @@ pkgs: with pkgs; [ ascii aspellDicts.de aspellDicts.en - vuizvui.axbo + vuizvui.aszlig.axbo bc beets chromium @@ -16,7 +16,7 @@ pkgs: with pkgs; [ flac gdb ghostscript - vuizvui.git-detach + vuizvui.aszlig.git-detach glxinfo gnumake gnupg1compat @@ -37,7 +37,7 @@ pkgs: with pkgs; [ netrw nix-prefetch-scripts nix-repl - vuizvui.nixops + vuizvui.aszlig.nixops nmap openssh openssl @@ -45,7 +45,7 @@ pkgs: with pkgs; [ pavucontrol posix_man_pages pulseaudioLight - vuizvui.pvolctrl + vuizvui.aszlig.pvolctrl pass python python3 diff --git a/modules/user/aszlig/services/i3/default.nix b/modules/user/aszlig/services/i3/default.nix index 1f913f64..9000efb3 100644 --- a/modules/user/aszlig/services/i3/default.nix +++ b/modules/user/aszlig/services/i3/default.nix @@ -115,7 +115,7 @@ in src = ./i3.conf; inherit (pkgs) dmenu xterm; - inherit (pkgs.vuizvui) pvolctrl; + inherit (pkgs.vuizvui.aszlig) pvolctrl; inherit (pkgs.xorg) xsetroot; inherit wsConfig barConfig; diff --git a/modules/user/aszlig/services/vlock/default.nix b/modules/user/aszlig/services/vlock/default.nix index f750ccf7..2eced029 100644 --- a/modules/user/aszlig/services/vlock/default.nix +++ b/modules/user/aszlig/services/vlock/default.nix @@ -5,7 +5,7 @@ let messageFile = pkgs.runCommand "message.cat" {} '' echo -en '\e[H\e[2J\e[?25l' > "$out" - "${pkgs.vuizvui.aacolorize}/bin/aacolorize" \ + "${pkgs.vuizvui.aszlig.aacolorize}/bin/aacolorize" \ "${./message.cat}" "${./message.colmap}" \ >> "$out" ''; diff --git a/pkgs/aacolorize/aacolorize.py b/pkgs/aszlig/aacolorize/aacolorize.py index ff19b687..ff19b687 100755 --- a/pkgs/aacolorize/aacolorize.py +++ b/pkgs/aszlig/aacolorize/aacolorize.py diff --git a/pkgs/aacolorize/default.nix b/pkgs/aszlig/aacolorize/default.nix index ef36f4e0..ef36f4e0 100644 --- a/pkgs/aacolorize/default.nix +++ b/pkgs/aszlig/aacolorize/default.nix diff --git a/pkgs/axbo/default.nix b/pkgs/aszlig/axbo/default.nix index fe503863..fe503863 100644 --- a/pkgs/axbo/default.nix +++ b/pkgs/aszlig/axbo/default.nix diff --git a/pkgs/aszlig/default.nix b/pkgs/aszlig/default.nix new file mode 100644 index 00000000..1d2a3e0b --- /dev/null +++ b/pkgs/aszlig/default.nix @@ -0,0 +1,14 @@ +{ callPackage, callPackage_i686, boost155 }: + +{ + aacolorize = callPackage ./aacolorize { }; + axbo = callPackage ./axbo { }; + git-detach = callPackage ./git-detach { }; + grandpa = callPackage ./grandpa { }; + nixops = callPackage ./nixops { }; + librxtx_java = callPackage ./librxtx-java { }; + lockdev = callPackage ./lockdev { }; + pvolctrl = callPackage ./pvolctrl { }; + santander = callPackage_i686 ./santander { }; + tomahawk = callPackage ./tomahawk { boost = boost155; }; +} diff --git a/pkgs/git-detach/default.nix b/pkgs/aszlig/git-detach/default.nix index fb20843e..fb20843e 100644 --- a/pkgs/git-detach/default.nix +++ b/pkgs/aszlig/git-detach/default.nix diff --git a/pkgs/grandpa/default.nix b/pkgs/aszlig/grandpa/default.nix index f37f6b2f..f37f6b2f 100644 --- a/pkgs/grandpa/default.nix +++ b/pkgs/aszlig/grandpa/default.nix diff --git a/pkgs/librxtx-java/default.nix b/pkgs/aszlig/librxtx-java/default.nix index 1553a146..1553a146 100644 --- a/pkgs/librxtx-java/default.nix +++ b/pkgs/aszlig/librxtx-java/default.nix diff --git a/pkgs/lockdev/default.nix b/pkgs/aszlig/lockdev/default.nix index 52e78eb5..52e78eb5 100644 --- a/pkgs/lockdev/default.nix +++ b/pkgs/aszlig/lockdev/default.nix diff --git a/pkgs/nixops/default.nix b/pkgs/aszlig/nixops/default.nix index 6cd99588..f97e3716 100644 --- a/pkgs/nixops/default.nix +++ b/pkgs/aszlig/nixops/default.nix @@ -16,7 +16,7 @@ let phases = [ "unpackPhase" "patchPhase" "installPhase" ]; postPatch = '' - sed -i -re 's!<nixpkgs([^>]*)>!${import ../../nixpkgs-path.nix}\1!g' \ + sed -i -re 's!<nixpkgs([^>]*)>!${import ../../../nixpkgs-path.nix}\1!g' \ release.nix doc/manual/default.nix doc/manual/resource.nix ''; diff --git a/pkgs/pvolctrl/default.nix b/pkgs/aszlig/pvolctrl/default.nix index 5701c19e..5701c19e 100644 --- a/pkgs/pvolctrl/default.nix +++ b/pkgs/aszlig/pvolctrl/default.nix diff --git a/pkgs/santander/default.nix b/pkgs/aszlig/santander/default.nix index 1821403c..9f6690b0 100644 --- a/pkgs/santander/default.nix +++ b/pkgs/aszlig/santander/default.nix @@ -130,7 +130,7 @@ let # Allow to use dwb for now until we have a better solution. dwb = dwb-unwrapped.override { - inherit (import (import ../../nixpkgs-path.nix) { + inherit (import (import ../../../nixpkgs-path.nix) { inherit (stdenv) system; config = { permittedInsecurePackages = [ "webkitgtk-2.4.11" ]; diff --git a/pkgs/santander/pipelight.patch b/pkgs/aszlig/santander/pipelight.patch index 3a07da72..3a07da72 100644 --- a/pkgs/santander/pipelight.patch +++ b/pkgs/aszlig/santander/pipelight.patch diff --git a/pkgs/santander/wine-no-unixfs.patch b/pkgs/aszlig/santander/wine-no-unixfs.patch index b0e6a9e9..b0e6a9e9 100644 --- a/pkgs/santander/wine-no-unixfs.patch +++ b/pkgs/aszlig/santander/wine-no-unixfs.patch diff --git a/pkgs/santander/winscard.patch b/pkgs/aszlig/santander/winscard.patch index 7dfa04ac..7dfa04ac 100644 --- a/pkgs/santander/winscard.patch +++ b/pkgs/aszlig/santander/winscard.patch diff --git a/pkgs/tomahawk/default.nix b/pkgs/aszlig/tomahawk/default.nix index ee006d46..ee006d46 100644 --- a/pkgs/tomahawk/default.nix +++ b/pkgs/aszlig/tomahawk/default.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index 4ed83914..5bb1316d 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -5,23 +5,20 @@ let callPackage = callPackageWith (pkgs // self.vuizvui); callPackage_i686 = callPackageWith (pkgs.pkgsi686Linux // self.vuizvui); - self.vuizvui = { + callPackageScope = fn: let + toplevel = pkgs // self.vuizvui; + toplevel_i686 = pkgs.pkgsi686Linux // self.vuizvui; + super = callPackageWith toplevel fn { + callPackage = callPackageWith (toplevel // super); + callPackage_i686 = callPackageWith (toplevel_i686 // super); + }; + in pkgs.recurseIntoAttrs super; + + self.vuizvui = pkgs.recurseIntoAttrs { mkChannel = callPackage ./build-support/channel.nix { }; - aacolorize = callPackage ./aacolorize { }; - axbo = callPackage ./axbo { }; - git-detach = callPackage ./git-detach { }; - grandpa = callPackage ./grandpa { }; - nixops = callPackage ./nixops { }; - librxtx_java = callPackage ./librxtx-java { }; list-gamecontrollers = callPackage ./list-gamecontrollers { }; - lockdev = callPackage ./lockdev { }; - pvolctrl = callPackage ./pvolctrl { }; - santander = callPackage_i686 ./santander { }; show-qr-code = callPackage ./show-qr-code { }; - tomahawk = callPackage ./tomahawk { - boost = pkgs.boost155; - }; games = import ./games { inherit pkgs; @@ -33,6 +30,8 @@ let stackenblocken = callPackage ./openlab/stackenblocken {}; }; + aszlig = callPackageScope ./aszlig; + profpatsch = pkgs.recurseIntoAttrs { display-infos = callPackage ./profpatsch/display-infos {}; nman = callPackage ./profpatsch/nman {}; |