From 04b7c6074816ed6c3ef63c48668dc23f1e75037b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 23 Apr 2017 22:50:46 +0200
Subject: 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
---
 machines/profpatsch/katara.nix           |  6 +++---
 pkgs/default.nix                         |  1 -
 pkgs/profpatsch/default.nix              |  1 +
 pkgs/profpatsch/show-qr-code/default.nix | 28 ++++++++++++++++++++++++++++
 pkgs/show-qr-code/default.nix            | 28 ----------------------------
 5 files changed, 32 insertions(+), 32 deletions(-)
 create mode 100644 pkgs/profpatsch/show-qr-code/default.nix
 delete mode 100644 pkgs/show-qr-code/default.nix

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/profpatsch/show-qr-code/default.nix b/pkgs/profpatsch/show-qr-code/default.nix
new file mode 100644
index 00000000..17d9847a
--- /dev/null
+++ b/pkgs/profpatsch/show-qr-code/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, writeScriptBin, gtkdialog, qrencode }:
+
+let script = writeScriptBin "show-qr-code" ''
+  #!/bin/sh
+  TMP=$(mktemp)
+  ${qrencode}/bin/qrencode -s 8 -o "$TMP" -t PNG "$1"
+
+  export DIALOG='
+  <vbox>
+      <pixmap>
+          <input file>'$TMP'</input>
+      </pixmap>
+  </vbox>
+  '
+
+  ${gtkdialog}/bin/gtkdialog --program=DIALOG > /dev/null &
+
+  sleep 0.2
+
+  rm "$TMP"
+
+  '';
+
+in script // {
+  meta = {
+    description = "Show the given string as qr code in a gtk window";
+  };
+}
diff --git a/pkgs/show-qr-code/default.nix b/pkgs/show-qr-code/default.nix
deleted file mode 100644
index 17d9847a..00000000
--- a/pkgs/show-qr-code/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, writeScriptBin, gtkdialog, qrencode }:
-
-let script = writeScriptBin "show-qr-code" ''
-  #!/bin/sh
-  TMP=$(mktemp)
-  ${qrencode}/bin/qrencode -s 8 -o "$TMP" -t PNG "$1"
-
-  export DIALOG='
-  <vbox>
-      <pixmap>
-          <input file>'$TMP'</input>
-      </pixmap>
-  </vbox>
-  '
-
-  ${gtkdialog}/bin/gtkdialog --program=DIALOG > /dev/null &
-
-  sleep 0.2
-
-  rm "$TMP"
-
-  '';
-
-in script // {
-  meta = {
-    description = "Show the given string as qr code in a gtk window";
-  };
-}
-- 
cgit 1.4.1