diff options
| -rw-r--r-- | krebs/3modules/tv/default.nix | 1 | ||||
| -rw-r--r-- | krebs/5pkgs/much/cabal.nix | 28 | ||||
| -rw-r--r-- | krebs/5pkgs/much/default.nix | 31 | ||||
| -rw-r--r-- | lib/types.nix | 4 | ||||
| -rw-r--r-- | tv/1systems/xu.nix | 2 | ||||
| -rw-r--r-- | tv/2configs/default.nix | 2 |
6 files changed, 35 insertions, 33 deletions
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 2da38e08d..e387fabc5 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -358,6 +358,7 @@ with import <stockholm/lib>; ip6.addr = "42::1338"; aliases = [ "xu.r" + "cgit.xu.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- diff --git a/krebs/5pkgs/much/cabal.nix b/krebs/5pkgs/much/cabal.nix new file mode 100644 index 000000000..09bc7b5df --- /dev/null +++ b/krebs/5pkgs/much/cabal.nix @@ -0,0 +1,28 @@ +{ mkDerivation, aeson, attoparsec, base, base64-bytestring +, blaze-builder, blessings, bytestring, case-insensitive +, containers, deepseq, directory, docopt, email-header, fetchgit +, filepath, friendly-time, hyphenation, linebreak, old-locale +, process, random, rosezipper, safe, scanner, split, stdenv +, terminal-size, text, time, transformers, transformers-compat +, unix, vector +}: +mkDerivation { + pname = "much"; + version = "1.1.0"; + src = fetchgit { + url = "http://cgit.ni.krebsco.de/much"; + sha256 = "1325554zymr1dd0clj8c5ygl70c791csvs0hz33jcfr6b8wysdrl"; + rev = "dfec37d848e11c00d9b7f03295af1fc7b0e83ef5"; + }; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-builder blessings + bytestring case-insensitive containers deepseq directory docopt + email-header filepath friendly-time hyphenation linebreak + old-locale process random rosezipper safe scanner split + terminal-size text time transformers transformers-compat unix + vector + ]; + license = stdenv.lib.licenses.mit; +} diff --git a/krebs/5pkgs/much/default.nix b/krebs/5pkgs/much/default.nix index aa3c56fe0..cf55eb537 100644 --- a/krebs/5pkgs/much/default.nix +++ b/krebs/5pkgs/much/default.nix @@ -1,30 +1,3 @@ -{ pkgs, ... }: +{ haskellPackages, ... }: -pkgs.haskellPackages.callPackage ( -{ mkDerivation, aeson, attoparsec, base, base64-bytestring -, blaze-builder, blessings, bytestring, case-insensitive, containers, deepseq -, directory, docopt, email-header, fetchgit, filepath -, friendly-time, hyphenation, linebreak, old-locale, process -, random, rosezipper, safe, scanner, split, stdenv, terminal-size, text -, time, transformers, transformers-compat, unix, vector -}: -mkDerivation { - pname = "much"; - version = "1.0.0"; - src = fetchgit { - url = "http://cgit.ni.krebsco.de/much"; - rev = "045dc986b4de225a927175f81c8ccfdab450202c"; - sha256 = "17jbw7x82a3bgn1qv5k764f103knrf865dmx48h7192vdh8gz766"; - }; - isLibrary = false; - isExecutable = true; - buildDepends = [ - aeson attoparsec base base64-bytestring blaze-builder blessings bytestring - case-insensitive containers deepseq directory docopt email-header filepath - friendly-time hyphenation linebreak old-locale process random rosezipper - safe scanner split terminal-size text time transformers transformers-compat - unix vector - ]; - license = stdenv.lib.licenses.mit; -} -) {} +haskellPackages.callPackage ./cabal.nix {} diff --git a/lib/types.nix b/lib/types.nix index f511541bd..30de5e177 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -284,8 +284,8 @@ rec { default = "/home/${config.name}"; }; mail = mkOption { - type = str; # TODO retiolum mail address - default = "${config._module.args.name}@${config.networking.hostName}.r"; + type = nullOr str; + default = null; }; name = mkOption { type = username; diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix index 8cf6146b5..60d1af23e 100644 --- a/tv/1systems/xu.nix +++ b/tv/1systems/xu.nix @@ -43,7 +43,7 @@ with import <stockholm/lib>; pass q qrencode - #texLive + texlive.combined.scheme-full tmux #ack diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index fd8bafe05..d16ff4eb5 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import <stockholm/lib>; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "67c6638b089a5766435e07057ff73b35c82440cc"; # nixos-17.03 + ref = "99dfb6dce37edcd1db7cb85c2db97089d9d5f442"; # nixos-17.03 }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; |