Merge remote-tracking branch 'prism/newest'
This commit is contained in:
commit
23bbf68204
|
@ -464,7 +464,7 @@ with import <stockholm/lib>;
|
||||||
retiolum = {
|
retiolum = {
|
||||||
via = internet;
|
via = internet;
|
||||||
ip4.addr = "10.243.0.211";
|
ip4.addr = "10.243.0.211";
|
||||||
ip6.addr = "42:f9f0:0000:0000:0000:0000:0000:70d2";
|
# ip6.addr = "42:f9f0:0000:0000:0000:0000:0000:70d2";
|
||||||
aliases = [
|
aliases = [
|
||||||
"gum.r"
|
"gum.r"
|
||||||
"gum.retiolum"
|
"gum.retiolum"
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
|
|
||||||
index 0918e30..5b7a587 100644
|
|
||||||
--- a/pkgs/servers/mail/exim/default.nix
|
|
||||||
+++ b/pkgs/servers/mail/exim/default.nix
|
|
||||||
@@ -1,11 +1,11 @@
|
|
||||||
{ coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
- name = "exim-4.87";
|
|
||||||
+ name = "exim-4.88";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
- url = "http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/${name}.tar.bz2";
|
|
||||||
- sha256 = "1jbxn13shq90kpn0s73qpjnx5xm8jrpwhcwwgqw5s6sdzw6iwsbl";
|
|
||||||
+ url = "ftp://ftp.exim.org/pub/exim/exim4/${name}.tar.bz2";
|
|
||||||
+ sha256 = "0bca3wb45hl7h8m8bpvsmrmqa07jhbhqyigs9pl29hhzwgbmz78i";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ coreutils db openssl pcre perl pkgconfig ];
|
|
|
@ -5,7 +5,7 @@ let
|
||||||
all any concatMapStringsSep concatStringsSep const filter flip genid
|
all any concatMapStringsSep concatStringsSep const filter flip genid
|
||||||
hasSuffix head isInt isString length match mergeOneOption mkOption
|
hasSuffix head isInt isString length match mergeOneOption mkOption
|
||||||
mkOptionType optional optionalAttrs optionals range splitString
|
mkOptionType optional optionalAttrs optionals range splitString
|
||||||
stringLength tail typeOf;
|
stringLength substring typeOf;
|
||||||
inherit (lib.types)
|
inherit (lib.types)
|
||||||
attrsOf bool either enum int listOf nullOr path str string submodule;
|
attrsOf bool either enum int listOf nullOr path str string submodule;
|
||||||
in
|
in
|
||||||
|
@ -430,23 +430,23 @@ rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
# POSIX.1‐2013, 3.2 Absolute Pathname
|
# POSIX.1‐2013, 3.2 Absolute Pathname
|
||||||
# TODO normalize slashes
|
|
||||||
# TODO two slashes
|
|
||||||
absolute-pathname = mkOptionType {
|
absolute-pathname = mkOptionType {
|
||||||
name = "POSIX absolute pathname";
|
name = "POSIX absolute pathname";
|
||||||
check = x: let xs = splitString "/" x; xa = head xs; in
|
check = x: isString x && substring 0 1 x == "/" && pathname.check x;
|
||||||
isString x
|
|
||||||
&& stringLength x > 0
|
|
||||||
&& (xa == "/" || (xa == "" && all filename.check (tail xs)));
|
|
||||||
merge = mergeOneOption;
|
merge = mergeOneOption;
|
||||||
};
|
};
|
||||||
|
|
||||||
# POSIX.1‐2013, 3.267 Pathname
|
# POSIX.1‐2013, 3.267 Pathname
|
||||||
# TODO normalize slashes
|
|
||||||
pathname = mkOptionType {
|
pathname = mkOptionType {
|
||||||
name = "POSIX pathname";
|
name = "POSIX pathname";
|
||||||
check = x: let xs = splitString "/" x; in
|
check = x:
|
||||||
isString x && all filename.check (if head xs == "" then tail xs else xs);
|
let
|
||||||
|
# The filter is used to normalize paths, i.e. to remove duplicated and
|
||||||
|
# trailing slashes. It also removes leading slashes, thus we have to
|
||||||
|
# check for "/" explicitly below.
|
||||||
|
xs = filter (s: stringLength s > 0) (splitString "/" x);
|
||||||
|
in
|
||||||
|
isString x && (x == "/" || (length xs > 0 && all filename.check xs));
|
||||||
merge = mergeOneOption;
|
merge = mergeOneOption;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,6 @@ in {
|
||||||
# TODO: unlock home partition via ssh
|
# TODO: unlock home partition via ssh
|
||||||
../2configs/fs/sda-crypto-root.nix
|
../2configs/fs/sda-crypto-root.nix
|
||||||
../2configs/zsh-user.nix
|
../2configs/zsh-user.nix
|
||||||
../2configs/urlwatch.nix
|
|
||||||
../2configs/backup.nix
|
../2configs/backup.nix
|
||||||
../2configs/exim-retiolum.nix
|
../2configs/exim-retiolum.nix
|
||||||
../2configs/smart-monitor.nix
|
../2configs/smart-monitor.nix
|
||||||
|
|
|
@ -29,7 +29,7 @@ let
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
krebs.backup.plans = {
|
krebs.backup.plans = {
|
||||||
wry-to-omo_root = defaultPull config.krebs.hosts.wry "/";
|
# wry-to-omo_root = defaultPull config.krebs.hosts.wry "/";
|
||||||
gum-to-omo_root = defaultPull config.krebs.hosts.gum "/";
|
gum-to-omo_root = defaultPull config.krebs.hosts.gum "/";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -62,7 +62,7 @@ in
|
||||||
cat |derp <<EOF
|
cat |derp <<EOF
|
||||||
XTerm*background: black
|
XTerm*background: black
|
||||||
XTerm*foreground: white
|
XTerm*foreground: white
|
||||||
XTerm*FaceName : Terminus:pixelsize=14
|
XTerm*FaceName : xft:xos4 Terminus:pixelsize=14
|
||||||
|
|
||||||
URxvt*termName: rxvt
|
URxvt*termName: rxvt
|
||||||
URxvt*saveLines: 10000
|
URxvt*saveLines: 10000
|
||||||
|
@ -74,7 +74,8 @@ in
|
||||||
URxvt.background: black
|
URxvt.background: black
|
||||||
URxvt.urgentOnBell: true
|
URxvt.urgentOnBell: true
|
||||||
URxvt.visualBell: false
|
URxvt.visualBell: false
|
||||||
URxvt.font : xft:Terminus
|
URxvt.font : xft:xos4 Terminus:size=12
|
||||||
|
|
||||||
|
|
||||||
! blue
|
! blue
|
||||||
URxvt*color4: #268bd2
|
URxvt*color4: #268bd2
|
||||||
|
|
|
@ -22,7 +22,7 @@ with import <stockholm/lib>;
|
||||||
user = config.krebs.users.makefu;
|
user = config.krebs.users.makefu;
|
||||||
source = let
|
source = let
|
||||||
inherit (config.krebs.build) host user;
|
inherit (config.krebs.build) host user;
|
||||||
ref = "73a6832"; # unstable @ 2017-03-24
|
ref = "3ff00fa"; # unstable @ 2017-03-31 + cups-dymo
|
||||||
in {
|
in {
|
||||||
nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
|
nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
|
||||||
{
|
{
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
https://api.github.com/repos/ovh/python-ovh/tags
|
https://api.github.com/repos/ovh/python-ovh/tags
|
||||||
https://api.github.com/repos/embray/d2to1/tags
|
https://api.github.com/repos/embray/d2to1/tags
|
||||||
http://git.sysphere.org/vicious/log/?qt=grep&q=Next+release
|
http://git.sysphere.org/vicious/log/?qt=grep&q=Next+release
|
||||||
|
https://api.github.com/repos/Mic92/vicious/tags
|
||||||
https://pypi.python.org/simple/bepasty/
|
https://pypi.python.org/simple/bepasty/
|
||||||
https://pypi.python.org/simple/xstatic/
|
https://pypi.python.org/simple/xstatic/
|
||||||
http://guest:derpi@cvs2svn.tigris.org/svn/cvs2svn/tags/
|
http://guest:derpi@cvs2svn.tigris.org/svn/cvs2svn/tags/
|
||||||
|
|
|
@ -1,43 +0,0 @@
|
||||||
{ stdenv, fetchurl, cmake, libuuid, gnutls, makeWrapper }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "taskserver-${version}";
|
|
||||||
version = "1.1.0";
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "http://www.taskwarrior.org/download/taskd-${version}.tar.gz";
|
|
||||||
sha256 = "1d110q9vw8g5syzihxymik7hd27z1592wkpz55kya6lphzk8i13v";
|
|
||||||
};
|
|
||||||
|
|
||||||
patchPhase = ''
|
|
||||||
pkipath=$out/share/taskd/pki
|
|
||||||
mkdir -p $pkipath
|
|
||||||
cp -r pki/* $pkipath
|
|
||||||
echo "patching paths in pki/generate"
|
|
||||||
sed -i "s#^\.#$pkipath#" $pkipath/generate
|
|
||||||
for f in $pkipath/generate* ;do
|
|
||||||
i=$(basename $f)
|
|
||||||
echo patching $i
|
|
||||||
sed -i \
|
|
||||||
-e 's/which/type -p/g' \
|
|
||||||
-e 's#^\. ./vars#if test -e ./vars;then . ./vars; else echo "cannot find ./vars - copy the template from '$pkipath'/vars into the working directory";exit 1; fi#' $f
|
|
||||||
|
|
||||||
echo wrapping $i
|
|
||||||
makeWrapper $pkipath/$i $out/bin/taskd-pki-$i \
|
|
||||||
--prefix PATH : ${gnutls}/bin/
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
|
|
||||||
buildInputs = [ makeWrapper ];
|
|
||||||
nativeBuildInputs = [ cmake libuuid gnutls ];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "Server for synchronising Taskwarrior clients";
|
|
||||||
homepage = http://taskwarrior.org;
|
|
||||||
license = stdenv.lib.licenses.mit;
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
maintainers = with stdenv.lib.maintainers; [ matthiasbeyer makefu ];
|
|
||||||
};
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user