From 655ca6b13ed99edf8913021d168fcb7e844a1c13 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 25 Jun 2018 20:46:36 +0200
Subject: pkgs.profpatsch: add nix-gen

---
 machines/profpatsch/katara.nix       |  2 +-
 machines/profpatsch/pkgs.nix         | 11 -----------
 pkgs/profpatsch/default.nix          |  2 ++
 pkgs/profpatsch/utils-hs/default.nix | 22 ++++++++++++++++++++++
 4 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/profpatsch/utils-hs/default.nix

diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix
index f9b7bc5b..2c1db1be 100644
--- a/machines/profpatsch/katara.nix
+++ b/machines/profpatsch/katara.nix
@@ -204,7 +204,7 @@ in {
         redshift   # increases screen warmth at night (so i don’t have to feel cold)
         # on remove keep pdfjam!
         (texlive.combine { inherit (texlive) scheme-medium latexmk IEEEtran needspace; })
-        # myPkgs.nix-gen
+        pkgs.vuizvui.profpatsch.nix-gen
       ];
     in systemPkgs ++ xPkgs ++ guiPkgs
     ++ programmingTools ++ documentation
diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix
index 9bf91dfe..4bb7066c 100644
--- a/machines/profpatsch/pkgs.nix
+++ b/machines/profpatsch/pkgs.nix
@@ -86,16 +86,6 @@ let
   # A ghci with some sane default packages in scope, & hoogle
   saneGhci = haskellPackages.ghcWithHoogle (h: with h; [ protolude pretty-show ]);
 
-  # # not upstream-compatible yet
-  # nix-gen = haskellPackages.mkDerivation {
-  #   pname = "nix-gen";
-  #   version = "0.0.1";
-  #   license = lib.licenses.gpl3;
-  #   isExecutable = true;
-  #   src = /home/philip/code/nix/nix-gen;
-  #   buildDepends = with haskellPackages; [ hnix ansi-wl-pprint protolude data-fix ];
-  # };
-
   pyrnotify =
     let src = pkgs.fetchFromGitHub {
           owner = "arnottcr";
@@ -123,7 +113,6 @@ in
     fast-init
     xmpp-client
     saneGhci
-    /*nix-gen*/
     /*searx*/
     pyrnotify
     ;
diff --git a/pkgs/profpatsch/default.nix b/pkgs/profpatsch/default.nix
index 1897b7ae..ec5cce01 100644
--- a/pkgs/profpatsch/default.nix
+++ b/pkgs/profpatsch/default.nix
@@ -10,6 +10,8 @@
     inherit (haskellPackages) ghcWithPackages;
   };
 
+  inherit (callPackage ./utils-hs {})
+    nix-gen;
 
   # patched version of droopy, with javascript user-enhancement
   droopy = droopy.overrideDerivation (old: {
diff --git a/pkgs/profpatsch/utils-hs/default.nix b/pkgs/profpatsch/utils-hs/default.nix
new file mode 100644
index 00000000..38e3e1de
--- /dev/null
+++ b/pkgs/profpatsch/utils-hs/default.nix
@@ -0,0 +1,22 @@
+{ lib, fetchFromGitHub, haskellPackages }:
+
+let
+  utilsSrc = fetchFromGitHub {
+    owner = "Profpatsch";
+    repo = "utils.hs";
+    rev = "7a790aff83659bc4da8f9dc5ffb9881036b80d08";
+    sha256 = "0dnsy2zcvifkl6a6l022rmxdd0mpv6qk50cd2jzgia0j90cng0ms";
+  };
+
+  nix-gen = haskellPackages.mkDerivation {
+    pname = "nix-gen";
+    version = "0.0.1";
+    src = "${utilsSrc}/nix-gen";
+    license = lib.licenses.gpl3;
+    isExecutable = true;
+    buildDepends = with haskellPackages; [ hnix ansi-wl-pprint protolude data-fix ];
+  };
+
+in {
+  inherit nix-gen;
+}
-- 
cgit 1.4.1