From 8c93fa4c740fde141697300f85fa756fcfb61a2f Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 29 Mar 2017 21:27:33 +0200 Subject: [PATCH 1/9] m 5 taskserver: rip --- makefu/5pkgs/taskserver/default.nix | 43 ----------------------------- 1 file changed, 43 deletions(-) delete mode 100644 makefu/5pkgs/taskserver/default.nix diff --git a/makefu/5pkgs/taskserver/default.nix b/makefu/5pkgs/taskserver/default.nix deleted file mode 100644 index a1502b4d6..000000000 --- a/makefu/5pkgs/taskserver/default.nix +++ /dev/null @@ -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 ]; - }; -} From 52eac8085972d6d042f48b26fcc429e6379ddc62 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 30 Mar 2017 16:48:30 +0200 Subject: [PATCH 2/9] m 1 omo: do not watch urls --- makefu/1systems/omo.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix index f77a19c11..99303b604 100644 --- a/makefu/1systems/omo.nix +++ b/makefu/1systems/omo.nix @@ -43,7 +43,6 @@ in { # TODO: unlock home partition via ssh ../2configs/fs/sda-crypto-root.nix ../2configs/zsh-user.nix - ../2configs/urlwatch.nix ../2configs/backup.nix ../2configs/exim-retiolum.nix ../2configs/smart-monitor.nix From a059f2fc99e4de0d7c1c84f3365d3dd026609dfe Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 31 Mar 2017 11:56:16 +0200 Subject: [PATCH 3/9] Revert "exim: init at 4.88" This reverts commit df7e24c93dc318084322fae3441d1f3f94833041. ^ lolwat --- krebs/5pkgs/exim.nix | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 krebs/5pkgs/exim.nix diff --git a/krebs/5pkgs/exim.nix b/krebs/5pkgs/exim.nix deleted file mode 100644 index 4bb69267c..000000000 --- a/krebs/5pkgs/exim.nix +++ /dev/null @@ -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 ]; From 6688dfbabe8ea9fa271ace59dad6650ff37e1fae Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 31 Mar 2017 13:00:52 +0200 Subject: [PATCH 4/9] m 2 urlwatch: Mic92 is the new maintainer of vicious --- makefu/2configs/urlwatch.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/makefu/2configs/urlwatch.nix b/makefu/2configs/urlwatch.nix index 6402b364a..5b82d8107 100644 --- a/makefu/2configs/urlwatch.nix +++ b/makefu/2configs/urlwatch.nix @@ -10,6 +10,7 @@ https://api.github.com/repos/ovh/python-ovh/tags https://api.github.com/repos/embray/d2to1/tags 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/xstatic/ http://guest:derpi@cvs2svn.tigris.org/svn/cvs2svn/tags/ From 1d1b113465878e69f3511e1092f4ec2ff592502c Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 31 Mar 2017 13:01:26 +0200 Subject: [PATCH 5/9] m 2 backup: wry on standby --- makefu/2configs/backup.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefu/2configs/backup.nix b/makefu/2configs/backup.nix index 280dc1df4..9ed890326 100644 --- a/makefu/2configs/backup.nix +++ b/makefu/2configs/backup.nix @@ -29,7 +29,7 @@ let }; in { 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 "/"; }; } From f9555d014ac6c87cd5a361765728f611b0c30c32 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 31 Mar 2017 13:39:13 +0200 Subject: [PATCH 6/9] m 2 default: use cups-dymo patch --- makefu/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index 6d5a2f688..2f340a678 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -22,7 +22,7 @@ with import ; user = config.krebs.users.makefu; source = let inherit (config.krebs.build) host user; - ref = "73a6832"; # unstable @ 2017-03-24 + ref = "3ff00fa"; # unstable @ 2017-03-31 + cups-dymo in { nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then { From fac92f5b2828095b421b5be3fc55e7e7bf0e1735 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 31 Mar 2017 14:22:42 +0200 Subject: [PATCH 7/9] k 3 m: disable v6 address for gum --- krebs/3modules/makefu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 489f62b65..7a6a88e85 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -464,7 +464,7 @@ with import ; retiolum = { via = internet; 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 = [ "gum.r" "gum.retiolum" From a673125fbbf24b3a5abfe397396d5fc32360be09 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 31 Mar 2017 15:08:16 +0200 Subject: [PATCH 8/9] types.*pathname: normalize slashes --- lib/types.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index edd48c35b..8a3c76483 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -5,7 +5,7 @@ let all any concatMapStringsSep concatStringsSep const filter flip genid hasSuffix head isInt isString length match mergeOneOption mkOption mkOptionType optional optionalAttrs optionals range splitString - stringLength tail typeOf; + stringLength substring typeOf; inherit (lib.types) attrsOf bool either enum int listOf nullOr path str string submodule; in @@ -430,23 +430,23 @@ rec { }; # POSIX.1‐2013, 3.2 Absolute Pathname - # TODO normalize slashes - # TODO two slashes absolute-pathname = mkOptionType { name = "POSIX absolute pathname"; - check = x: let xs = splitString "/" x; xa = head xs; in - isString x - && stringLength x > 0 - && (xa == "/" || (xa == "" && all filename.check (tail xs))); + check = x: isString x && substring 0 1 x == "/" && pathname.check x; merge = mergeOneOption; }; # POSIX.1‐2013, 3.267 Pathname - # TODO normalize slashes pathname = mkOptionType { name = "POSIX pathname"; - check = x: let xs = splitString "/" x; in - isString x && all filename.check (if head xs == "" then tail xs else xs); + check = x: + 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; }; From 9a5cd35de345db85480df7f7dabe561439cf2e69 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 31 Mar 2017 18:25:54 +0200 Subject: [PATCH 9/9] m 2 base-gui: Terminus naming fuckup https://bbs.archlinux.org/viewtopic.php?id=221794 --- makefu/2configs/base-gui.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix index 55dd44575..ba4c551b3 100644 --- a/makefu/2configs/base-gui.nix +++ b/makefu/2configs/base-gui.nix @@ -62,7 +62,7 @@ in cat |derp <