about summary refs log tree commit diff
path: root/machines
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2018-06-25 20:46:36 +0200
committerProfpatsch <mail@profpatsch.de>2018-06-25 20:46:36 +0200
commit655ca6b13ed99edf8913021d168fcb7e844a1c13 (patch)
treee9a63383512265ceab0006aab7b624687fe69753 /machines
parent5ad6cd2fe58661ad5404da8e7a0eb77d24b834c8 (diff)
pkgs.profpatsch: add nix-gen
Diffstat (limited to 'machines')
-rw-r--r--machines/profpatsch/katara.nix2
-rw-r--r--machines/profpatsch/pkgs.nix11
2 files changed, 1 insertions, 12 deletions
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
     ;