Merge remote-tracking branch 'ni/master'
This commit is contained in:
commit
c5b1857384
|
@ -358,6 +358,7 @@ with import <stockholm/lib>;
|
||||||
ip6.addr = "42::1338";
|
ip6.addr = "42::1338";
|
||||||
aliases = [
|
aliases = [
|
||||||
"xu.r"
|
"xu.r"
|
||||||
|
"cgit.xu.r"
|
||||||
];
|
];
|
||||||
tinc.pubkey = ''
|
tinc.pubkey = ''
|
||||||
-----BEGIN RSA PUBLIC KEY-----
|
-----BEGIN RSA PUBLIC KEY-----
|
||||||
|
|
28
krebs/5pkgs/much/cabal.nix
Normal file
28
krebs/5pkgs/much/cabal.nix
Normal file
|
@ -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;
|
||||||
|
}
|
|
@ -1,30 +1,3 @@
|
||||||
{ pkgs, ... }:
|
{ haskellPackages, ... }:
|
||||||
|
|
||||||
pkgs.haskellPackages.callPackage (
|
haskellPackages.callPackage ./cabal.nix {}
|
||||||
{ 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;
|
|
||||||
}
|
|
||||||
) {}
|
|
||||||
|
|
|
@ -284,8 +284,8 @@ rec {
|
||||||
default = "/home/${config.name}";
|
default = "/home/${config.name}";
|
||||||
};
|
};
|
||||||
mail = mkOption {
|
mail = mkOption {
|
||||||
type = str; # TODO retiolum mail address
|
type = nullOr str;
|
||||||
default = "${config._module.args.name}@${config.networking.hostName}.r";
|
default = null;
|
||||||
};
|
};
|
||||||
name = mkOption {
|
name = mkOption {
|
||||||
type = username;
|
type = username;
|
||||||
|
|
|
@ -43,7 +43,7 @@ with import <stockholm/lib>;
|
||||||
pass
|
pass
|
||||||
q
|
q
|
||||||
qrencode
|
qrencode
|
||||||
#texLive
|
texlive.combined.scheme-full
|
||||||
tmux
|
tmux
|
||||||
|
|
||||||
#ack
|
#ack
|
||||||
|
|
|
@ -14,7 +14,7 @@ with import <stockholm/lib>;
|
||||||
stockholm.file = "/home/tv/stockholm";
|
stockholm.file = "/home/tv/stockholm";
|
||||||
nixpkgs.git = {
|
nixpkgs.git = {
|
||||||
url = https://github.com/NixOS/nixpkgs;
|
url = https://github.com/NixOS/nixpkgs;
|
||||||
ref = "67c6638b089a5766435e07057ff73b35c82440cc"; # nixos-17.03
|
ref = "99dfb6dce37edcd1db7cb85c2db97089d9d5f442"; # nixos-17.03
|
||||||
};
|
};
|
||||||
} // optionalAttrs host.secure {
|
} // optionalAttrs host.secure {
|
||||||
secrets-master.file = "/home/tv/secrets/master";
|
secrets-master.file = "/home/tv/secrets/master";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user