From 39b44ec679d09c5473a3defab227bf8766248671 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 18 Mar 2016 22:17:58 +0100 Subject: machines/katara: misc programs --- machines/profpatsch/katara.nix | 5 +++-- machines/profpatsch/pkgs.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'machines/profpatsch') diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix index ab3eba8f..8c864465 100644 --- a/machines/profpatsch/katara.nix +++ b/machines/profpatsch/katara.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: let - myPkgs = import ./pkgs.nix { inherit pkgs; }; + myPkgs = import ./pkgs.nix { inherit pkgs lib; }; # mytexlive = with pkgs.texlive; combine { inherit minted; }; # inherit scheme-medium minted units collection-bibtexextra; }; @@ -80,6 +80,7 @@ in { manpages # system manpages (not included by default) mkpasswd # UNIX password creator mosh # ssh with stable connections + nfs-utils # the filesystem of the future for 20 years (nmap.override { graphicalSupport = true; }) # stats about clients in the network stow # dotfile management tmux # detachable terminal multiplexer @@ -157,7 +158,7 @@ in { nixPkgs = [ nix-repl # nix REPL nix-prefetch-scripts # prefetch store paths from various destinations - haskellPackages.cabal2nix # convert cabal files to nix + # haskellPackages.cabal2nix # convert cabal files to nix ]; tmpPkgs = [ # needs user service diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix index ef0a2f3f..b79d5c4e 100644 --- a/machines/profpatsch/pkgs.nix +++ b/machines/profpatsch/pkgs.nix @@ -1,4 +1,4 @@ -{ pkgs }: +{ pkgs, lib }: let addRuntimeDeps = drv: ds: drv.overrideDerivation (old: { -- cgit 1.4.1