diff options
author | Profpatsch <mail@profpatsch.de> | 2017-04-26 22:25:01 +0200 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2017-04-26 22:32:31 +0200 |
commit | 83cde9698284e8f75ac046af8a65be9ae1a99d92 (patch) | |
tree | 79ce9cd789f0b95a62c260027e619b23961d6777 /machines/profpatsch | |
parent | 0f98e6789f3d1038e48a85ff9a9eebee3b80871c (diff) |
machines/katara: add nix-gen and modified searx
Diffstat (limited to 'machines/profpatsch')
-rw-r--r-- | machines/profpatsch/katara.nix | 1 | ||||
-rw-r--r-- | machines/profpatsch/pkgs.nix | 32 |
2 files changed, 19 insertions, 14 deletions
diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix index a7364e66..0013df14 100644 --- a/machines/profpatsch/katara.nix +++ b/machines/profpatsch/katara.nix @@ -185,6 +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 ]; in systemPkgs ++ xPkgs ++ guiPkgs ++ programmingTools ++ documentation diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix index debed121..dac8745d 100644 --- a/machines/profpatsch/pkgs.nix +++ b/machines/profpatsch/pkgs.nix @@ -64,23 +64,27 @@ let xmpp-client = pkgs.callPackage (import ./xmpp-client.nix myLib.philip.home "irc/xmppOla.wtf") { inherit (pkgs) xmpp-client; }; - pythonPackagesMod = pkgs.pythonPackages.override { - overrides = self: super: { - searx = super.searx.overrideAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pythonPackages.pyxdg ]; - patches = old.patches or [] ++ [ - ./patches/searx-secret-key.patch - ./patches/searx-rm-soundcloud.patch - ]; - }); - }; - }; - + searx = pkgs.pythonPackages.searx.overrideAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pythonPackages.pyxdg ]; + patches = old.patches or [] ++ [ + ./patches/searx-secret-key.patch + ./patches/searx-rm-soundcloud.patch + ]; + }); # 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 ]; + }; + in { inherit taffybar sent mpv beets poezio vim - fast-init xmpp-client saneGhci; - inherit (pythonPackagesMod) searx; } + fast-init xmpp-client saneGhci nix-gen searx; } |