diff options
author | aszlig <aszlig@redmoonstudios.org> | 2017-04-23 22:50:46 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2017-04-23 23:08:13 +0200 |
commit | 04b7c6074816ed6c3ef63c48668dc23f1e75037b (patch) | |
tree | e1095cfbdd8b916eac22f4243901b987b1783d6e | |
parent | d9ff4eb2a99c9b1c0551752cf8bf98f413f5ab8e (diff) |
pkgs/show-qr-code: Move into pkgs/profpatsch
Tested evaluation using: nix-instantiate pkgs -A vuizvui.profpatsch.show-qr-code Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @Profpatsch
-rw-r--r-- | machines/profpatsch/katara.nix | 6 | ||||
-rw-r--r-- | pkgs/default.nix | 1 | ||||
-rw-r--r-- | pkgs/profpatsch/default.nix | 1 | ||||
-rw-r--r-- | pkgs/profpatsch/show-qr-code/default.nix (renamed from pkgs/show-qr-code/default.nix) | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix index 9391bd1e..a46b7303 100644 --- a/machines/profpatsch/katara.nix +++ b/machines/profpatsch/katara.nix @@ -160,9 +160,9 @@ in { youtube-dl # download videos zathura # pdf viewer ]; - userScripts = with pkgs.vuizvui; [ - profpatsch.display-infos # show time & battery - show-qr-code # display a QR code + userScripts = with pkgs.vuizvui.profpatsch; [ + display-infos # show time & battery + show-qr-code # display a QR code ]; mailPkgs = [ elinks # command line browser diff --git a/pkgs/default.nix b/pkgs/default.nix index 23e4bf98..8303e0a5 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -34,7 +34,6 @@ let mkChannel = callPackage ./build-support/channel.nix { }; list-gamecontrollers = callPackage ./list-gamecontrollers { }; - show-qr-code = callPackage ./show-qr-code { }; games = import ./games { inherit pkgs; diff --git a/pkgs/profpatsch/default.nix b/pkgs/profpatsch/default.nix index d5b57628..51927fba 100644 --- a/pkgs/profpatsch/default.nix +++ b/pkgs/profpatsch/default.nix @@ -6,6 +6,7 @@ warpspeed = callPackage ./warpspeed { inherit (haskellPackages) ghcWithPackages; }; + show-qr-code = callPackage ./show-qr-code { }; jmtpfs = jmtpfs.override { libmtp = libmtp.overrideDerivation (old: { diff --git a/pkgs/show-qr-code/default.nix b/pkgs/profpatsch/show-qr-code/default.nix index 17d9847a..17d9847a 100644 --- a/pkgs/show-qr-code/default.nix +++ b/pkgs/profpatsch/show-qr-code/default.nix |