From 4b1141bbfe53a349820cd70152d0067dedb355a8 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Thu, 27 Apr 2017 01:13:13 +0200 Subject: machines/katara: maybe not nix-gen yet --- machines/profpatsch/katara.nix | 2 +- machines/profpatsch/pkgs.nix | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix index 0013df14..9a9cbb30 100644 --- a/machines/profpatsch/katara.nix +++ b/machines/profpatsch/katara.nix @@ -185,7 +185,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 + # myPkgs.nix-gen ]; in systemPkgs ++ xPkgs ++ guiPkgs ++ programmingTools ++ documentation diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix index dac8745d..50d49693 100644 --- a/machines/profpatsch/pkgs.nix +++ b/machines/profpatsch/pkgs.nix @@ -75,16 +75,16 @@ 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 ]; - }; + # # 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 ]; + # }; in { inherit taffybar sent mpv beets poezio vim - fast-init xmpp-client saneGhci nix-gen searx; } + fast-init xmpp-client saneGhci /*nix-gen*/ searx; } -- cgit 1.4.1