From a89e7a5c75204c5d1ad825f25430830f718a0411 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 16 May 2017 22:03:42 +0200
Subject: [PATCH 01/32] krebs.tinc: expose confDir
---
krebs/3modules/retiolum.nix | 41 +++++++++++++++++++------------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix
index 0a3d7ed2f..67d383bb1 100644
--- a/krebs/3modules/retiolum.nix
+++ b/krebs/3modules/retiolum.nix
@@ -18,6 +18,26 @@ let
enable = mkEnableOption "krebs.tinc.${netname}" // { default = true; };
+ confDir = mkOption {
+ type = types.package;
+ default = pkgs.linkFarm "${netname}-etc-tinc"
+ (mapAttrsToList (name: path: { inherit name path; }) {
+ "hosts" = tinc.config.hostsPackage;
+ "tinc.conf" = pkgs.writeText "${netname}-tinc.conf" ''
+ Name = ${tinc.config.host.name}
+ Interface = ${netname}
+ ${concatMapStrings (c: "ConnectTo = ${c}\n") tinc.config.connectTo}
+ PrivateKeyFile = ${tinc.config.privkey.path}
+ Port = ${toString tinc.config.host.nets.${netname}.tinc.port}
+ ${tinc.config.extraConfig}
+ '';
+ "tinc-up" = pkgs.writeDash "${netname}-tinc-up" ''
+ ${tinc.config.iproutePackage}/sbin/ip link set ${netname} up
+ ${tinc.config.tincUp}
+ '';
+ });
+ };
+
host = mkOption {
type = types.host;
default = config.krebs.build.host;
@@ -179,25 +199,6 @@ let
let
tinc = cfg.tincPackage;
iproute = cfg.iproutePackage;
-
- confDir = let
- namePathPair = name: path: { inherit name path; };
- in pkgs.linkFarm "${netname}-etc-tinc" (mapAttrsToList namePathPair {
- "hosts" = cfg.hostsPackage;
- "tinc.conf" = pkgs.writeText "${cfg.netname}-tinc.conf" ''
- Name = ${cfg.host.name}
- Interface = ${netname}
- ${concatStrings (map (c: "ConnectTo = ${c}\n") cfg.connectTo)}
- PrivateKeyFile = ${cfg.privkey.path}
- Port = ${toString cfg.host.nets.${cfg.netname}.tinc.port}
- ${cfg.extraConfig}
- '';
- "tinc-up" = pkgs.writeDash "${netname}-tinc-up" ''
- ${iproute}/sbin/ip link set ${netname} up
- ${cfg.tincUp}
- '';
- }
- );
in {
description = "Tinc daemon for ${netname}";
after = [ "network.target" ];
@@ -206,7 +207,7 @@ let
path = [ tinc iproute ];
serviceConfig = rec {
Restart = "always";
- ExecStart = "${tinc}/sbin/tincd -c ${confDir} -d 0 -U ${cfg.user.name} -D --pidfile=/var/run/tinc.${SyslogIdentifier}.pid";
+ ExecStart = "${tinc}/sbin/tincd -c ${cfg.confDir} -d 0 -U ${cfg.user.name} -D --pidfile=/var/run/tinc.${SyslogIdentifier}.pid";
SyslogIdentifier = netname;
};
}
From fe639f585e9054096c2cee6e1a3cef9f22a37c78 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 16 May 2017 22:06:31 +0200
Subject: [PATCH 02/32] k3: retiolum.nix -> tinc.nix
---
krebs/3modules/default.nix | 2 +-
krebs/3modules/{retiolum.nix => tinc.nix} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename krebs/3modules/{retiolum.nix => tinc.nix} (100%)
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index daa963bc8..227eb209b 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -34,10 +34,10 @@ let
./Reaktor.nix
./realwallpaper.nix
./retiolum-bootstrap.nix
- ./retiolum.nix
./rtorrent.nix
./secret.nix
./setuid.nix
+ ./tinc.nix
./tinc_graphs.nix
./urlwatch.nix
./repo-sync.nix
diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/tinc.nix
similarity index 100%
rename from krebs/3modules/retiolum.nix
rename to krebs/3modules/tinc.nix
From e1350904390ca40e9ab8186c0ff27d088431a430 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 16 May 2017 23:18:28 +0200
Subject: [PATCH 03/32] l 2 retiolum: don't open smtp
---
lass/2configs/retiolum.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix
index 7a7bf95be..647327de5 100644
--- a/lass/2configs/retiolum.nix
+++ b/lass/2configs/retiolum.nix
@@ -5,7 +5,6 @@
krebs.iptables = {
tables = {
filter.INPUT.rules = [
- { predicate = "-p tcp --dport smtp"; target = "ACCEPT"; }
{ predicate = "-p tcp --dport tinc"; target = "ACCEPT"; }
{ predicate = "-p udp --dport tinc"; target = "ACCEPT"; }
];
From 0c2dc4ff66eded9f718a242bb342b366ee6c6978 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 16 May 2017 23:19:08 +0200
Subject: [PATCH 04/32] tinc module: add option enableLegacy
---
krebs/3modules/tinc.nix | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix
index 67d383bb1..8af15c13b 100644
--- a/krebs/3modules/tinc.nix
+++ b/krebs/3modules/tinc.nix
@@ -17,6 +17,7 @@ let
in {
enable = mkEnableOption "krebs.tinc.${netname}" // { default = true; };
+ enableLegacy = mkEnableOption "/etc/tinc/${netname}";
confDir = mkOption {
type = types.package;
@@ -195,6 +196,12 @@ let
}
) config.krebs.tinc;
+ environment.etc = mapAttrs' (netname: cfg:
+ nameValuePair "tinc/${netname}" (mkIf cfg.enableLegacy {
+ source = cfg.confDir;
+ })
+ ) config.krebs.tinc;
+
systemd.services = mapAttrs (netname: cfg:
let
tinc = cfg.tincPackage;
From f27676c5ea34a8d400988027e326c7022914bcf0 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 16 May 2017 23:18:50 +0200
Subject: [PATCH 05/32] l 2 retiolum: enable legacy /etc/tinc
---
lass/2configs/retiolum.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix
index 647327de5..7f1b36c96 100644
--- a/lass/2configs/retiolum.nix
+++ b/lass/2configs/retiolum.nix
@@ -12,6 +12,7 @@
};
krebs.tinc.retiolum = {
+ enableLegacy = true;
enable = true;
connectTo = [
"prism"
From 015649b9b32c39d1f1c90ebba8d9aadb733ba8b8 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 16 May 2017 23:30:09 +0200
Subject: [PATCH 06/32] whatsupnix: init
Import from https://github.com/NixOS/nix/issues/443#issuecomment-296752535
---
krebs/5pkgs/whatsupnix/default.nix | 15 +++++++++
krebs/5pkgs/whatsupnix/whatsupnix.bash | 44 ++++++++++++++++++++++++++
2 files changed, 59 insertions(+)
create mode 100644 krebs/5pkgs/whatsupnix/default.nix
create mode 100644 krebs/5pkgs/whatsupnix/whatsupnix.bash
diff --git a/krebs/5pkgs/whatsupnix/default.nix b/krebs/5pkgs/whatsupnix/default.nix
new file mode 100644
index 000000000..1a108c5e9
--- /dev/null
+++ b/krebs/5pkgs/whatsupnix/default.nix
@@ -0,0 +1,15 @@
+{ bash, coreutils, gawk, nix, makeWrapper, stdenv }:
+
+stdenv.mkDerivation {
+ name = "whatsupnix";
+ phases = [ "installPhase" ];
+ nativeBuildInputs = [ makeWrapper ];
+ installPhase = ''
+ mkdir -p $out/bin
+ cat - ${./whatsupnix.bash} > $out/bin/whatsupnix <<\EOF
+ #! ${bash}/bin/bash
+ export PATH=${stdenv.lib.makeBinPath [ coreutils gawk nix ]}
+ EOF
+ chmod +x $out/bin/whatsupnix
+ '';
+}
diff --git a/krebs/5pkgs/whatsupnix/whatsupnix.bash b/krebs/5pkgs/whatsupnix/whatsupnix.bash
new file mode 100644
index 000000000..a19410055
--- /dev/null
+++ b/krebs/5pkgs/whatsupnix/whatsupnix.bash
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+# Prints build logs for failed derivations in quiet build mode (-Q).
+# See https://github.com/NixOS/nix/issues/443
+#
+# Usage:
+#
+# set -o pipefail
+# nix-build ... -Q ... | whatsupnix
+#
+
+
+GAWK=${GAWK:-gawk}
+NIX_STORE=${NIX_STORE:-nix-store}
+
+broken=$(mktemp)
+trap 'rm -f -- "$broken"' EXIT
+
+exec >&2
+
+$GAWK -v broken="$broken" -f <(cat - <<- 'AWK'
+ match($0, /builder for .*(\/nix\/store\/.+\.drv).* failed/, m) {
+ print m[1] >> broken
+ }
+ { print $0 }
+AWK
+)
+
+export NIX_PAGER='' # for nix-store
+while read -r drv; do
+ title="** FAILED $drv LOG **"
+ frame=${title//?/*}
+
+ echo "$frame"
+ echo "$title"
+ echo "$frame"
+ echo
+
+ $NIX_STORE -l "$drv"
+
+ echo
+done < "$broken"
+
+exit 0
From 0901d6e6f8e5357cd06b0d6832bdbde6251b7de3 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Fri, 19 May 2017 00:24:52 +0200
Subject: [PATCH 07/32] lib/types: add managed bool to host type
---
lib/types.nix | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/lib/types.nix b/lib/types.nix
index 30de5e177..530cd1e69 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -31,6 +31,13 @@ rec {
default = null;
};
+ managed = mkOption {
+ description = ''
+ If true, then the host's configuration is defined in stockholm.
+ '';
+ type = bool;
+ };
+
owner = mkOption {
type = user;
};
From a9f0332f9c70088101b85c73d55e265813d94fd7 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Fri, 19 May 2017 00:25:27 +0200
Subject: [PATCH 08/32] k 3 l: define `managed` for every host
---
krebs/3modules/lass/default.nix | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index b86e05319..0e1cbd876 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -3,7 +3,10 @@
with import <stockholm/lib>;
{
- hosts = mapAttrs (_: setAttr "owner" config.krebs.users.lass) {
+ hosts = mapAttrs (_: recursiveUpdate {
+ owner = config.krebs.users.lass;
+ managed = true;
+ }) {
dishfire = {
cores = 4;
nets = rec {
@@ -124,6 +127,7 @@ with import <stockholm/lib>;
ssh.port = 2223;
};
};
+ managed = false;
};
cloudkrebs = {
cores = 1;
@@ -300,6 +304,7 @@ with import <stockholm/lib>;
};
iso = {
cores = 1;
+ managed = false;
};
sokrateslaptop = {
nets = {
@@ -321,6 +326,7 @@ with import <stockholm/lib>;
'';
};
};
+ managed = false;
};
};
users = {
From fa08ca88dee73ac0a0b888e114ab1df3ecf4c0fa Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Fri, 19 May 2017 00:27:25 +0200
Subject: [PATCH 09/32] l 3 hosts: filter unmanaged hosts
---
lass/3modules/hosts.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lass/3modules/hosts.nix b/lass/3modules/hosts.nix
index 125819bb0..7e3af10be 100644
--- a/lass/3modules/hosts.nix
+++ b/lass/3modules/hosts.nix
@@ -6,7 +6,7 @@ with import <stockholm/lib>;
options.lass.hosts = mkOption {
type = types.attrsOf types.host;
default =
- filterAttrs (_: host: host.owner.name == "lass")
+ filterAttrs (_: host: host.owner.name == "lass" && host.managed)
config.krebs.hosts;
};
}
From 6ff1f811366215b82e892cb75dd9419a6de06f4d Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Mon, 22 May 2017 17:20:58 +0200
Subject: [PATCH 10/32] l 2 baseX: enable X forwarding
---
lass/2configs/baseX.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 9c51effdc..65dc6b6e9 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -33,6 +33,7 @@ in {
time.timeZone = "Europe/Berlin";
programs.ssh.startAgent = false;
+ services.openssh.forwardX11 = true;
services.printing = {
enable = true;
From a5390438dc08684a543e7260ff3377001c8bd5b0 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Mon, 22 May 2017 17:22:28 +0200
Subject: [PATCH 11/32] l 2 retiolum: add tinc to systemPackages
---
lass/2configs/retiolum.nix | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix
index 7f1b36c96..e7779f53e 100644
--- a/lass/2configs/retiolum.nix
+++ b/lass/2configs/retiolum.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
{
@@ -25,4 +25,8 @@
nixpkgs.config.packageOverrides = pkgs: {
tinc = pkgs.tinc_pre;
};
+
+ environment.systemPackages = [
+ pkgs.tinc
+ ];
}
From fee2fa19585403a568242f3bdd870477b9cf97e7 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Mon, 22 May 2017 17:24:58 +0200
Subject: [PATCH 12/32] l 2 nixpkgs: 2bb9c1c -> f469354
---
lass/2configs/nixpkgs.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index 49c44aa88..c6620afaa 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
{
krebs.build.source.nixpkgs.git = {
url = https://cgit.lassul.us/nixpkgs;
- ref = "2bb9c1c";
+ ref = "f469354";
};
}
From 7545d799ddb4d4cb79a51fda3ac95262bdc15d22 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Mon, 22 May 2017 17:28:19 +0200
Subject: [PATCH 13/32] il 2: move dnscrypt & dnsmasq to dns-stuff.nix
---
lass/2configs/baseX.nix | 1 +
lass/2configs/default.nix | 9 ---------
lass/2configs/dns-stuff.nix | 31 +++++++++++++++++++++++++++++++
3 files changed, 32 insertions(+), 9 deletions(-)
create mode 100644 lass/2configs/dns-stuff.nix
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 65dc6b6e9..3e2e325d8 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -10,6 +10,7 @@ in {
./copyq.nix
./xresources.nix
./livestream.nix
+ ./dns-stuff.nix
{
hardware.pulseaudio = {
enable = true;
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index ffed5bb70..d7deb3165 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -63,15 +63,6 @@ with import <stockholm/lib>;
pkgs.pythonPackages.python
];
}
- {
- services.dnscrypt-proxy = {
- enable = true;
- resolverName = "cs-de";
- };
- networking.extraResolvconfConf = ''
- name_servers='127.0.0.1'
- '';
- }
];
networking.hostName = config.krebs.build.host.name;
diff --git a/lass/2configs/dns-stuff.nix b/lass/2configs/dns-stuff.nix
new file mode 100644
index 000000000..b52d3050b
--- /dev/null
+++ b/lass/2configs/dns-stuff.nix
@@ -0,0 +1,31 @@
+{ config, pkgs, ... }:
+with import <stockholm/lib>;
+{
+ services.dnscrypt-proxy = {
+ enable = true;
+ localAddress = "127.1.0.1";
+ resolverName = "cs-de";
+ };
+ services.dnsmasq = {
+ enable = true;
+ extraConfig = ''
+ server=127.1.0.1
+ server=/dn42/172.23.75.6
+ #no-resolv
+ cache-size=1000
+ min-cache-ttl=3600
+ bind-dynamic
+ all-servers
+ dnssec
+ trust-anchor=.,19036,8,2,49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5
+ address=/blog/127.0.0.1
+ address=/blog/::1
+ rebind-domain-ok=/onion/
+ server=/.onion/127.0.0.1#9053
+ port=53
+ '';
+ };
+ networking.extraResolvconfConf = ''
+ name_servers='127.0.0.1'
+ '';
+}
From 28b6e5d218ca984c3e34fd5385ea343a0bd3d39a Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 23 May 2017 19:57:03 +0200
Subject: [PATCH 14/32] l 1 mors: enable elasticsearch
---
lass/1systems/mors.nix | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index c8d9465d5..dd3777c64 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -32,14 +32,11 @@ with import <stockholm/lib>;
{ predicate = "-p tcp --dport 11100"; target = "ACCEPT"; }
];
}
- #{
- # services.elasticsearch = {
- # enable = true;
- # plugins = [
- # # pkgs.elasticsearchPlugins.elasticsearch_kopf
- # ];
- # };
- #}
+ {
+ services.elasticsearch = {
+ enable = true;
+ };
+ }
{
#zalando project
services.postgresql = {
From a44e215d31c019fda6b0783f0d07cbd8072f919e Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 23 May 2017 20:34:12 +0200
Subject: [PATCH 15/32] l 2 websites domsen: remove www. from domains
---
lass/2configs/websites/domsen.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 581b37d91..62945755d 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -25,8 +25,8 @@ in {
imports = [
./sqlBackup.nix
(servePage [ "reich-gebaeudereinigung.de" "www.reich-gebaeudereinigung.de" ])
- (servePage [ "karlaskop.de" "www.karlaskop.de" ])
- (servePage [ "makeup.apanowicz.de" "www.makeup.apanowicz.de" ])
+ (servePage [ "karlaskop.de" ])
+ (servePage [ "makeup.apanowicz.de" ])
(servePage [ "pixelpocket.de" ])
(serveOwncloud [ "o.ubikmedia.de" ])
(serveWordpress [
From d1321d64118fa50d0082e79a8fc74613aa0cb66a Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 23 May 2017 20:35:42 +0200
Subject: [PATCH 16/32] l 2 websites habsys.*: fritz -> domsen
---
lass/2configs/websites/domsen.nix | 1 +
lass/2configs/websites/fritz.nix | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 62945755d..b0d28d4da 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -28,6 +28,7 @@ in {
(servePage [ "karlaskop.de" ])
(servePage [ "makeup.apanowicz.de" ])
(servePage [ "pixelpocket.de" ])
+ (servePage [ "habsys.de" "habsys.eu" ])
(serveOwncloud [ "o.ubikmedia.de" ])
(serveWordpress [
"ubikmedia.de"
diff --git a/lass/2configs/websites/fritz.nix b/lass/2configs/websites/fritz.nix
index 9bf7e4a9c..45927b102 100644
--- a/lass/2configs/websites/fritz.nix
+++ b/lass/2configs/websites/fritz.nix
@@ -40,8 +40,6 @@ in {
(serveWordpress [ "eastuttgart.de" "www.eastuttgart.de" ])
- (servePage [ "habsys.de" "www.habsys.de" "habsys.eu" "www.habsys.eu" ])
-
(serveWordpress [ "goldbarrendiebstahl.radical-dreamers.de" ])
];
From ad1e4cb239bfbb39be977c3fdf2f5f172bb5a4f5 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 23 May 2017 20:36:23 +0200
Subject: [PATCH 17/32] l 3 pyload: init
---
lass/3modules/default.nix | 1 +
lass/3modules/pyload.nix | 55 +++++++++++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+)
create mode 100644 lass/3modules/pyload.nix
diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix
index 73692446a..fd353e008 100644
--- a/lass/3modules/default.nix
+++ b/lass/3modules/default.nix
@@ -6,6 +6,7 @@ _:
./hosts.nix
./mysql-backup.nix
./news.nix
+ ./pyload.nix
./umts.nix
./usershadow.nix
./xresources.nix
diff --git a/lass/3modules/pyload.nix b/lass/3modules/pyload.nix
new file mode 100644
index 000000000..6f29ffb17
--- /dev/null
+++ b/lass/3modules/pyload.nix
@@ -0,0 +1,55 @@
+{ config, lib, pkgs, ... }:
+
+with import <stockholm/lib>;
+
+let
+ cfg = config.lass.pyload;
+
+ out = {
+ options.lass.pyload = api;
+ config = lib.mkIf cfg.enable imp;
+ };
+
+ api = {
+ enable = mkEnableOption "pyload";
+ user = mkOption {
+ type = types.str;
+ default = "download";
+ };
+ };
+
+ imp = {
+
+ krebs.per-user.${cfg.user}.packages = [
+ pkgs.pyload
+ pkgs.spidermonkey
+ pkgs.tesseract
+ ];
+
+ krebs.iptables.tables.filter.INPUT.rules = [
+ { predicate = "-p tcp --dport 9099"; target = "ACCEPT"; }
+ ];
+ systemd.services.pyload = {
+ description = "pyload";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+
+ path = with pkgs; [
+ pyload
+ spidermonkey
+ tesseract
+ dnsmasq
+ ];
+
+ restartIfChanged = true;
+
+ serviceConfig = {
+ Restart = "always";
+ ExecStart = "${pkgs.pyload}/bin/pyLoadCore";
+ User = cfg.user;
+ };
+ };
+
+ };
+
+in out
From 2d2550c5b5bdb10e4c2958425add337572347a11 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 23 May 2017 21:22:25 +0200
Subject: [PATCH 18/32] kirk: 1.0.0 -> 1.0.1
---
krebs/5pkgs/haskell-overrides/kirk.nix | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/krebs/5pkgs/haskell-overrides/kirk.nix b/krebs/5pkgs/haskell-overrides/kirk.nix
index 2cd6bb134..073e5d505 100644
--- a/krebs/5pkgs/haskell-overrides/kirk.nix
+++ b/krebs/5pkgs/haskell-overrides/kirk.nix
@@ -3,16 +3,19 @@
}:
mkDerivation {
pname = "kirk";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchgit {
url = "http://cgit.krebsco.de/kirk";
- sha256 = "0w4drg2lyyw45abfn3g55zd6m7pl7yqxql5rpyy6qqdbvnyak94w";
- rev = "c78f3c62c0ba76465e39d1570073f867aa2d4240";
+ sha256 = "1acsmmc485c54axpy9bd0320j18hs261vl1vdxns4n04sxzqd7k0";
+ rev = "cdf3cb373af8f9b03a9487a63eb32e0226913589";
};
- isLibrary = false;
+ isLibrary = true;
isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring network optparse-applicative text
+ ];
executableHaskellDepends = [
- async base bytestring network optparse-applicative text
+ async base network optparse-applicative text
];
license = stdenv.lib.licenses.mit;
}
From 71719f2929c2dae1c431c09c517d8c49c7610b30 Mon Sep 17 00:00:00 2001
From: nin <nineinchnade@gmail.com>
Date: Tue, 23 May 2017 22:45:52 +0200
Subject: [PATCH 19/32] n 2: change search-domain to r
---
nin/2configs/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nin/2configs/default.nix b/nin/2configs/default.nix
index a1ed76d98..cb02521ce 100644
--- a/nin/2configs/default.nix
+++ b/nin/2configs/default.nix
@@ -59,7 +59,7 @@ with import <stockholm/lib>;
krebs = {
enable = true;
- search-domain = "retiolum";
+ search-domain = "r";
build = {
user = config.krebs.users.nin;
source = let inherit (config.krebs.build) host; in {
From 5f92b6b0a27ac6ed3289c0df96ebb9be664c0464 Mon Sep 17 00:00:00 2001
From: nin <nineinchnade@gmail.com>
Date: Tue, 23 May 2017 22:51:09 +0200
Subject: [PATCH 20/32] n 2 nixpkgs: 5b0c9d4 -> 0afb6d7
---
nin/2configs/nixpkgs.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nin/2configs/nixpkgs.nix b/nin/2configs/nixpkgs.nix
index 9c3eafffd..14ddb7920 100644
--- a/nin/2configs/nixpkgs.nix
+++ b/nin/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
{
krebs.build.source.nixpkgs.git = {
url = https://github.com/nixos/nixpkgs;
- ref = "5b0c9d4";
+ ref = "0afb6d7";
};
}
From e497faf8ec755da17e790782909a7aa8de7e0677 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 23 May 2017 23:35:31 +0200
Subject: [PATCH 21/32] l 2 bepasty: allow write for externals
---
lass/2configs/bepasty.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lass/2configs/bepasty.nix b/lass/2configs/bepasty.nix
index c2bc3f3cd..b2d40d4f3 100644
--- a/lass/2configs/bepasty.nix
+++ b/lass/2configs/bepasty.nix
@@ -35,7 +35,7 @@ in {
forceSSL = true;
enableACME = true;
};
- defaultPermissions = "read";
+ defaultPermissions = "read,create";
secretKey = secKey;
});
};
From 061e702a6fc0e6046d39c3975c9034a69499c45f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 23 May 2017 23:44:17 +0200
Subject: [PATCH 22/32] turn krebs/5pkgs into an overlay
---
krebs/5pkgs/default.nix | 14 ++++----------
krebs/5pkgs/writers.nix | 8 +++-----
krebs/default.nix | 2 +-
3 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 8bb244cd3..81481e14b 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -1,11 +1,6 @@
-{ config, lib, pkgs, ... }@args:
+pkgs: oldpkgs:
with import <stockholm/lib>;
-{
- imports = [
- ./writers.nix
- ];
- nixpkgs.config.packageOverrides = oldpkgs: let
-
+ let
# This callPackage will try to detect obsolete overrides.
callPackage = path: args: let
override = pkgs.callPackage path args;
@@ -16,8 +11,8 @@ with import <stockholm/lib>;
compareVersions upstream.name override.name != -1
then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
else override;
-
in {}
+ // import ./writers.nix pkgs oldpkgs
// mapAttrs (_: flip callPackage {})
(filterAttrs (_: dir: pathExists (dir + "/default.nix"))
(subdirsOf ./.))
@@ -60,5 +55,4 @@ with import <stockholm/lib>;
test = {
infest-cac-centos7 = callPackage ./test/infest-cac-centos7 {};
};
- };
-}
+ }
diff --git a/krebs/5pkgs/writers.nix b/krebs/5pkgs/writers.nix
index d14090323..8ea9c37d5 100644
--- a/krebs/5pkgs/writers.nix
+++ b/krebs/5pkgs/writers.nix
@@ -1,7 +1,6 @@
-{ pkgs, ... }:
+pkgs: oldpkgs:
with import <stockholm/lib>;
-{
- nixpkgs.config.packageOverrides = _: {
+ {
# Combine a list of derivations using symlinks. Paths in later derivations
# take precedence over earlier ones.
@@ -323,5 +322,4 @@ with import <stockholm/lib>;
};
writeSed = pkgs.makeScriptWriter "${pkgs.gnused}/bin/sed -f";
- };
-}
+ }
diff --git a/krebs/default.nix b/krebs/default.nix
index e5e8cbc49..55bf66f77 100644
--- a/krebs/default.nix
+++ b/krebs/default.nix
@@ -3,6 +3,6 @@ with import <stockholm/lib>;
{
imports = [
./3modules
- ./5pkgs
];
+ nixpkgs.config.packageOverrides = import ./5pkgs pkgs;
}
From f0b98bd0114df1e1ebb82ff300f9532d86b3eb18 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 01:43:50 +0200
Subject: [PATCH 23/32] krebs/5pkgs: move simple pkgs to a subdir
---
krebs/5pkgs/default.nix | 11 ++++-------
krebs/5pkgs/{ => simple}/Reaktor/default.nix | 0
krebs/5pkgs/{ => simple}/Reaktor/plugins.nix | 0
.../{ => simple}/Reaktor/scripts/random-emoji.sh | 0
.../{ => simple}/Reaktor/scripts/random-issue.sh | 0
.../5pkgs/{ => simple}/Reaktor/scripts/sed-plugin.py | 0
.../{ => simple}/Reaktor/scripts/shack-correct.sh | 0
krebs/5pkgs/{ => simple}/apt-cacher-ng/default.nix | 0
.../5pkgs/{ => simple}/bepasty-client-cli/default.nix | 0
krebs/5pkgs/{ => simple}/buildbot/default.nix | 0
krebs/5pkgs/{ => simple}/buildbot/worker.nix | 0
krebs/5pkgs/{ => simple}/cac-api/default.nix | 0
krebs/5pkgs/{ => simple}/cac-cert/cac.pem | 0
krebs/5pkgs/{ => simple}/cac-cert/default.nix | 0
krebs/5pkgs/{ => simple}/cac-panel/default.nix | 0
.../{ => simple}/collectd-connect-time/default.nix | 0
krebs/5pkgs/simple/default.nix | 10 ++++++++++
krebs/5pkgs/{ => simple}/dic/default.nix | 0
.../{ => simple}/drivedroid-gen-repo/default.nix | 0
krebs/5pkgs/{ => simple}/fortclientsslvpn/default.nix | 0
krebs/5pkgs/{ => simple}/games-user-env/default.nix | 0
krebs/5pkgs/{ => simple}/get/default.nix | 0
krebs/5pkgs/{ => simple}/git-hooks/default.nix | 0
.../5pkgs/{ => simple}/github-hosts-sync/default.nix | 0
krebs/5pkgs/{ => simple}/go-shortener/default.nix | 0
krebs/5pkgs/{ => simple}/go-shortener/packages.nix | 0
krebs/5pkgs/{ => simple}/goify/default.nix | 0
krebs/5pkgs/{ => simple}/hashPassword/default.nix | 0
krebs/5pkgs/{ => simple}/htgen/default.nix | 0
krebs/5pkgs/{ => simple}/irc-announce/default.nix | 0
krebs/5pkgs/{ => simple}/kpaste/default.nix | 0
krebs/5pkgs/{ => simple}/krebspaste/default.nix | 0
krebs/5pkgs/{ => simple}/krebszones/default.nix | 0
krebs/5pkgs/{ => simple}/logf/default.nix | 0
krebs/5pkgs/{ => simple}/much/cabal.nix | 0
krebs/5pkgs/{ => simple}/much/default.nix | 0
krebs/5pkgs/{ => simple}/netcup/default.nix | 0
krebs/5pkgs/{ => simple}/newsbot-js/default.nix | 0
krebs/5pkgs/{ => simple}/newsbot-js/packages.nix | 0
krebs/5pkgs/{ => simple}/noVNC/default.nix | 0
krebs/5pkgs/{ => simple}/painload/default.nix | 0
krebs/5pkgs/{ => simple}/passwdqc-utils/default.nix | 0
krebs/5pkgs/{ => simple}/populate/default.nix | 0
krebs/5pkgs/{ => simple}/posix-array/default.nix | 0
krebs/5pkgs/{ => simple}/pssh/default.nix | 0
krebs/5pkgs/{ => simple}/push/default.nix | 0
krebs/5pkgs/{ => simple}/realwallpaper/default.nix | 0
krebs/5pkgs/{ => simple}/repo-sync/default.nix | 0
.../5pkgs/{ => simple}/retiolum-bootstrap/default.nix | 0
krebs/5pkgs/{ => simple}/rutorrent/default.nix | 0
krebs/5pkgs/{ => simple}/tarantool/default.nix | 0
krebs/5pkgs/{ => simple}/tinc_graphs/default.nix | 0
krebs/5pkgs/{ => simple}/translate-shell/default.nix | 0
krebs/5pkgs/{ => simple}/treq/default.nix | 0
krebs/5pkgs/{ => simple}/untilport/default.nix | 0
krebs/5pkgs/{ => simple}/urlwatch/default.nix | 0
krebs/5pkgs/{ => simple}/weechat/default.nix | 0
krebs/5pkgs/{ => simple}/whatsupnix/default.nix | 0
krebs/5pkgs/{ => simple}/whatsupnix/whatsupnix.bash | 0
krebs/5pkgs/{ => simple}/with-tmpdir/default.nix | 0
krebs/5pkgs/{ => simple}/youtube-tools/default.nix | 0
krebs/5pkgs/{ => simple}/zandronum-bin/default.nix | 0
62 files changed, 14 insertions(+), 7 deletions(-)
rename krebs/5pkgs/{ => simple}/Reaktor/default.nix (100%)
rename krebs/5pkgs/{ => simple}/Reaktor/plugins.nix (100%)
rename krebs/5pkgs/{ => simple}/Reaktor/scripts/random-emoji.sh (100%)
rename krebs/5pkgs/{ => simple}/Reaktor/scripts/random-issue.sh (100%)
rename krebs/5pkgs/{ => simple}/Reaktor/scripts/sed-plugin.py (100%)
rename krebs/5pkgs/{ => simple}/Reaktor/scripts/shack-correct.sh (100%)
rename krebs/5pkgs/{ => simple}/apt-cacher-ng/default.nix (100%)
rename krebs/5pkgs/{ => simple}/bepasty-client-cli/default.nix (100%)
rename krebs/5pkgs/{ => simple}/buildbot/default.nix (100%)
rename krebs/5pkgs/{ => simple}/buildbot/worker.nix (100%)
rename krebs/5pkgs/{ => simple}/cac-api/default.nix (100%)
rename krebs/5pkgs/{ => simple}/cac-cert/cac.pem (100%)
rename krebs/5pkgs/{ => simple}/cac-cert/default.nix (100%)
rename krebs/5pkgs/{ => simple}/cac-panel/default.nix (100%)
rename krebs/5pkgs/{ => simple}/collectd-connect-time/default.nix (100%)
create mode 100644 krebs/5pkgs/simple/default.nix
rename krebs/5pkgs/{ => simple}/dic/default.nix (100%)
rename krebs/5pkgs/{ => simple}/drivedroid-gen-repo/default.nix (100%)
rename krebs/5pkgs/{ => simple}/fortclientsslvpn/default.nix (100%)
rename krebs/5pkgs/{ => simple}/games-user-env/default.nix (100%)
rename krebs/5pkgs/{ => simple}/get/default.nix (100%)
rename krebs/5pkgs/{ => simple}/git-hooks/default.nix (100%)
rename krebs/5pkgs/{ => simple}/github-hosts-sync/default.nix (100%)
rename krebs/5pkgs/{ => simple}/go-shortener/default.nix (100%)
rename krebs/5pkgs/{ => simple}/go-shortener/packages.nix (100%)
rename krebs/5pkgs/{ => simple}/goify/default.nix (100%)
rename krebs/5pkgs/{ => simple}/hashPassword/default.nix (100%)
rename krebs/5pkgs/{ => simple}/htgen/default.nix (100%)
rename krebs/5pkgs/{ => simple}/irc-announce/default.nix (100%)
rename krebs/5pkgs/{ => simple}/kpaste/default.nix (100%)
rename krebs/5pkgs/{ => simple}/krebspaste/default.nix (100%)
rename krebs/5pkgs/{ => simple}/krebszones/default.nix (100%)
rename krebs/5pkgs/{ => simple}/logf/default.nix (100%)
rename krebs/5pkgs/{ => simple}/much/cabal.nix (100%)
rename krebs/5pkgs/{ => simple}/much/default.nix (100%)
rename krebs/5pkgs/{ => simple}/netcup/default.nix (100%)
rename krebs/5pkgs/{ => simple}/newsbot-js/default.nix (100%)
rename krebs/5pkgs/{ => simple}/newsbot-js/packages.nix (100%)
rename krebs/5pkgs/{ => simple}/noVNC/default.nix (100%)
rename krebs/5pkgs/{ => simple}/painload/default.nix (100%)
rename krebs/5pkgs/{ => simple}/passwdqc-utils/default.nix (100%)
rename krebs/5pkgs/{ => simple}/populate/default.nix (100%)
rename krebs/5pkgs/{ => simple}/posix-array/default.nix (100%)
rename krebs/5pkgs/{ => simple}/pssh/default.nix (100%)
rename krebs/5pkgs/{ => simple}/push/default.nix (100%)
rename krebs/5pkgs/{ => simple}/realwallpaper/default.nix (100%)
rename krebs/5pkgs/{ => simple}/repo-sync/default.nix (100%)
rename krebs/5pkgs/{ => simple}/retiolum-bootstrap/default.nix (100%)
rename krebs/5pkgs/{ => simple}/rutorrent/default.nix (100%)
rename krebs/5pkgs/{ => simple}/tarantool/default.nix (100%)
rename krebs/5pkgs/{ => simple}/tinc_graphs/default.nix (100%)
rename krebs/5pkgs/{ => simple}/translate-shell/default.nix (100%)
rename krebs/5pkgs/{ => simple}/treq/default.nix (100%)
rename krebs/5pkgs/{ => simple}/untilport/default.nix (100%)
rename krebs/5pkgs/{ => simple}/urlwatch/default.nix (100%)
rename krebs/5pkgs/{ => simple}/weechat/default.nix (100%)
rename krebs/5pkgs/{ => simple}/whatsupnix/default.nix (100%)
rename krebs/5pkgs/{ => simple}/whatsupnix/whatsupnix.bash (100%)
rename krebs/5pkgs/{ => simple}/with-tmpdir/default.nix (100%)
rename krebs/5pkgs/{ => simple}/youtube-tools/default.nix (100%)
rename krebs/5pkgs/{ => simple}/zandronum-bin/default.nix (100%)
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 81481e14b..5af541258 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -12,10 +12,8 @@ with import <stockholm/lib>;
then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
else override;
in {}
+ // import ./simple pkgs oldpkgs
// import ./writers.nix pkgs oldpkgs
- // mapAttrs (_: flip callPackage {})
- (filterAttrs (_: dir: pathExists (dir + "/default.nix"))
- (subdirsOf ./.))
// {
empty = pkgs.runCommand "empty-1.0.0" {} "mkdir $out";
@@ -33,13 +31,12 @@ with import <stockholm/lib>;
(builtins.readDir ./haskell-overrides));
};
- ReaktorPlugins = callPackage ./Reaktor/plugins.nix {};
+ ReaktorPlugins = callPackage ./simple/Reaktor/plugins.nix {};
- buildbot = callPackage ./buildbot {};
- buildbot-full = callPackage ./buildbot {
+ buildbot-full = callPackage ./simple/buildbot {
plugins = with pkgs.buildbot-plugins; [ www console-view waterfall-view ];
};
- buildbot-worker = callPackage ./buildbot/worker.nix {};
+ buildbot-worker = callPackage ./simple/buildbot/worker.nix {};
# https://github.com/proot-me/PRoot/issues/106
proot = pkgs.writeDashBin "proot" ''
diff --git a/krebs/5pkgs/Reaktor/default.nix b/krebs/5pkgs/simple/Reaktor/default.nix
similarity index 100%
rename from krebs/5pkgs/Reaktor/default.nix
rename to krebs/5pkgs/simple/Reaktor/default.nix
diff --git a/krebs/5pkgs/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix
similarity index 100%
rename from krebs/5pkgs/Reaktor/plugins.nix
rename to krebs/5pkgs/simple/Reaktor/plugins.nix
diff --git a/krebs/5pkgs/Reaktor/scripts/random-emoji.sh b/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
similarity index 100%
rename from krebs/5pkgs/Reaktor/scripts/random-emoji.sh
rename to krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
diff --git a/krebs/5pkgs/Reaktor/scripts/random-issue.sh b/krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh
similarity index 100%
rename from krebs/5pkgs/Reaktor/scripts/random-issue.sh
rename to krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh
diff --git a/krebs/5pkgs/Reaktor/scripts/sed-plugin.py b/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
similarity index 100%
rename from krebs/5pkgs/Reaktor/scripts/sed-plugin.py
rename to krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
diff --git a/krebs/5pkgs/Reaktor/scripts/shack-correct.sh b/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh
similarity index 100%
rename from krebs/5pkgs/Reaktor/scripts/shack-correct.sh
rename to krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh
diff --git a/krebs/5pkgs/apt-cacher-ng/default.nix b/krebs/5pkgs/simple/apt-cacher-ng/default.nix
similarity index 100%
rename from krebs/5pkgs/apt-cacher-ng/default.nix
rename to krebs/5pkgs/simple/apt-cacher-ng/default.nix
diff --git a/krebs/5pkgs/bepasty-client-cli/default.nix b/krebs/5pkgs/simple/bepasty-client-cli/default.nix
similarity index 100%
rename from krebs/5pkgs/bepasty-client-cli/default.nix
rename to krebs/5pkgs/simple/bepasty-client-cli/default.nix
diff --git a/krebs/5pkgs/buildbot/default.nix b/krebs/5pkgs/simple/buildbot/default.nix
similarity index 100%
rename from krebs/5pkgs/buildbot/default.nix
rename to krebs/5pkgs/simple/buildbot/default.nix
diff --git a/krebs/5pkgs/buildbot/worker.nix b/krebs/5pkgs/simple/buildbot/worker.nix
similarity index 100%
rename from krebs/5pkgs/buildbot/worker.nix
rename to krebs/5pkgs/simple/buildbot/worker.nix
diff --git a/krebs/5pkgs/cac-api/default.nix b/krebs/5pkgs/simple/cac-api/default.nix
similarity index 100%
rename from krebs/5pkgs/cac-api/default.nix
rename to krebs/5pkgs/simple/cac-api/default.nix
diff --git a/krebs/5pkgs/cac-cert/cac.pem b/krebs/5pkgs/simple/cac-cert/cac.pem
similarity index 100%
rename from krebs/5pkgs/cac-cert/cac.pem
rename to krebs/5pkgs/simple/cac-cert/cac.pem
diff --git a/krebs/5pkgs/cac-cert/default.nix b/krebs/5pkgs/simple/cac-cert/default.nix
similarity index 100%
rename from krebs/5pkgs/cac-cert/default.nix
rename to krebs/5pkgs/simple/cac-cert/default.nix
diff --git a/krebs/5pkgs/cac-panel/default.nix b/krebs/5pkgs/simple/cac-panel/default.nix
similarity index 100%
rename from krebs/5pkgs/cac-panel/default.nix
rename to krebs/5pkgs/simple/cac-panel/default.nix
diff --git a/krebs/5pkgs/collectd-connect-time/default.nix b/krebs/5pkgs/simple/collectd-connect-time/default.nix
similarity index 100%
rename from krebs/5pkgs/collectd-connect-time/default.nix
rename to krebs/5pkgs/simple/collectd-connect-time/default.nix
diff --git a/krebs/5pkgs/simple/default.nix b/krebs/5pkgs/simple/default.nix
new file mode 100644
index 000000000..2f6799759
--- /dev/null
+++ b/krebs/5pkgs/simple/default.nix
@@ -0,0 +1,10 @@
+with import <stockholm/lib>;
+
+self: super:
+listToAttrs
+ (map
+ (name: nameValuePair (removeSuffix ".nix" name)
+ (super.callPackage (./. + "/${name}") {}))
+ (filter
+ (name: name != "default.nix" && !hasPrefix "." name)
+ (attrNames (readDir ./.))))
diff --git a/krebs/5pkgs/dic/default.nix b/krebs/5pkgs/simple/dic/default.nix
similarity index 100%
rename from krebs/5pkgs/dic/default.nix
rename to krebs/5pkgs/simple/dic/default.nix
diff --git a/krebs/5pkgs/drivedroid-gen-repo/default.nix b/krebs/5pkgs/simple/drivedroid-gen-repo/default.nix
similarity index 100%
rename from krebs/5pkgs/drivedroid-gen-repo/default.nix
rename to krebs/5pkgs/simple/drivedroid-gen-repo/default.nix
diff --git a/krebs/5pkgs/fortclientsslvpn/default.nix b/krebs/5pkgs/simple/fortclientsslvpn/default.nix
similarity index 100%
rename from krebs/5pkgs/fortclientsslvpn/default.nix
rename to krebs/5pkgs/simple/fortclientsslvpn/default.nix
diff --git a/krebs/5pkgs/games-user-env/default.nix b/krebs/5pkgs/simple/games-user-env/default.nix
similarity index 100%
rename from krebs/5pkgs/games-user-env/default.nix
rename to krebs/5pkgs/simple/games-user-env/default.nix
diff --git a/krebs/5pkgs/get/default.nix b/krebs/5pkgs/simple/get/default.nix
similarity index 100%
rename from krebs/5pkgs/get/default.nix
rename to krebs/5pkgs/simple/get/default.nix
diff --git a/krebs/5pkgs/git-hooks/default.nix b/krebs/5pkgs/simple/git-hooks/default.nix
similarity index 100%
rename from krebs/5pkgs/git-hooks/default.nix
rename to krebs/5pkgs/simple/git-hooks/default.nix
diff --git a/krebs/5pkgs/github-hosts-sync/default.nix b/krebs/5pkgs/simple/github-hosts-sync/default.nix
similarity index 100%
rename from krebs/5pkgs/github-hosts-sync/default.nix
rename to krebs/5pkgs/simple/github-hosts-sync/default.nix
diff --git a/krebs/5pkgs/go-shortener/default.nix b/krebs/5pkgs/simple/go-shortener/default.nix
similarity index 100%
rename from krebs/5pkgs/go-shortener/default.nix
rename to krebs/5pkgs/simple/go-shortener/default.nix
diff --git a/krebs/5pkgs/go-shortener/packages.nix b/krebs/5pkgs/simple/go-shortener/packages.nix
similarity index 100%
rename from krebs/5pkgs/go-shortener/packages.nix
rename to krebs/5pkgs/simple/go-shortener/packages.nix
diff --git a/krebs/5pkgs/goify/default.nix b/krebs/5pkgs/simple/goify/default.nix
similarity index 100%
rename from krebs/5pkgs/goify/default.nix
rename to krebs/5pkgs/simple/goify/default.nix
diff --git a/krebs/5pkgs/hashPassword/default.nix b/krebs/5pkgs/simple/hashPassword/default.nix
similarity index 100%
rename from krebs/5pkgs/hashPassword/default.nix
rename to krebs/5pkgs/simple/hashPassword/default.nix
diff --git a/krebs/5pkgs/htgen/default.nix b/krebs/5pkgs/simple/htgen/default.nix
similarity index 100%
rename from krebs/5pkgs/htgen/default.nix
rename to krebs/5pkgs/simple/htgen/default.nix
diff --git a/krebs/5pkgs/irc-announce/default.nix b/krebs/5pkgs/simple/irc-announce/default.nix
similarity index 100%
rename from krebs/5pkgs/irc-announce/default.nix
rename to krebs/5pkgs/simple/irc-announce/default.nix
diff --git a/krebs/5pkgs/kpaste/default.nix b/krebs/5pkgs/simple/kpaste/default.nix
similarity index 100%
rename from krebs/5pkgs/kpaste/default.nix
rename to krebs/5pkgs/simple/kpaste/default.nix
diff --git a/krebs/5pkgs/krebspaste/default.nix b/krebs/5pkgs/simple/krebspaste/default.nix
similarity index 100%
rename from krebs/5pkgs/krebspaste/default.nix
rename to krebs/5pkgs/simple/krebspaste/default.nix
diff --git a/krebs/5pkgs/krebszones/default.nix b/krebs/5pkgs/simple/krebszones/default.nix
similarity index 100%
rename from krebs/5pkgs/krebszones/default.nix
rename to krebs/5pkgs/simple/krebszones/default.nix
diff --git a/krebs/5pkgs/logf/default.nix b/krebs/5pkgs/simple/logf/default.nix
similarity index 100%
rename from krebs/5pkgs/logf/default.nix
rename to krebs/5pkgs/simple/logf/default.nix
diff --git a/krebs/5pkgs/much/cabal.nix b/krebs/5pkgs/simple/much/cabal.nix
similarity index 100%
rename from krebs/5pkgs/much/cabal.nix
rename to krebs/5pkgs/simple/much/cabal.nix
diff --git a/krebs/5pkgs/much/default.nix b/krebs/5pkgs/simple/much/default.nix
similarity index 100%
rename from krebs/5pkgs/much/default.nix
rename to krebs/5pkgs/simple/much/default.nix
diff --git a/krebs/5pkgs/netcup/default.nix b/krebs/5pkgs/simple/netcup/default.nix
similarity index 100%
rename from krebs/5pkgs/netcup/default.nix
rename to krebs/5pkgs/simple/netcup/default.nix
diff --git a/krebs/5pkgs/newsbot-js/default.nix b/krebs/5pkgs/simple/newsbot-js/default.nix
similarity index 100%
rename from krebs/5pkgs/newsbot-js/default.nix
rename to krebs/5pkgs/simple/newsbot-js/default.nix
diff --git a/krebs/5pkgs/newsbot-js/packages.nix b/krebs/5pkgs/simple/newsbot-js/packages.nix
similarity index 100%
rename from krebs/5pkgs/newsbot-js/packages.nix
rename to krebs/5pkgs/simple/newsbot-js/packages.nix
diff --git a/krebs/5pkgs/noVNC/default.nix b/krebs/5pkgs/simple/noVNC/default.nix
similarity index 100%
rename from krebs/5pkgs/noVNC/default.nix
rename to krebs/5pkgs/simple/noVNC/default.nix
diff --git a/krebs/5pkgs/painload/default.nix b/krebs/5pkgs/simple/painload/default.nix
similarity index 100%
rename from krebs/5pkgs/painload/default.nix
rename to krebs/5pkgs/simple/painload/default.nix
diff --git a/krebs/5pkgs/passwdqc-utils/default.nix b/krebs/5pkgs/simple/passwdqc-utils/default.nix
similarity index 100%
rename from krebs/5pkgs/passwdqc-utils/default.nix
rename to krebs/5pkgs/simple/passwdqc-utils/default.nix
diff --git a/krebs/5pkgs/populate/default.nix b/krebs/5pkgs/simple/populate/default.nix
similarity index 100%
rename from krebs/5pkgs/populate/default.nix
rename to krebs/5pkgs/simple/populate/default.nix
diff --git a/krebs/5pkgs/posix-array/default.nix b/krebs/5pkgs/simple/posix-array/default.nix
similarity index 100%
rename from krebs/5pkgs/posix-array/default.nix
rename to krebs/5pkgs/simple/posix-array/default.nix
diff --git a/krebs/5pkgs/pssh/default.nix b/krebs/5pkgs/simple/pssh/default.nix
similarity index 100%
rename from krebs/5pkgs/pssh/default.nix
rename to krebs/5pkgs/simple/pssh/default.nix
diff --git a/krebs/5pkgs/push/default.nix b/krebs/5pkgs/simple/push/default.nix
similarity index 100%
rename from krebs/5pkgs/push/default.nix
rename to krebs/5pkgs/simple/push/default.nix
diff --git a/krebs/5pkgs/realwallpaper/default.nix b/krebs/5pkgs/simple/realwallpaper/default.nix
similarity index 100%
rename from krebs/5pkgs/realwallpaper/default.nix
rename to krebs/5pkgs/simple/realwallpaper/default.nix
diff --git a/krebs/5pkgs/repo-sync/default.nix b/krebs/5pkgs/simple/repo-sync/default.nix
similarity index 100%
rename from krebs/5pkgs/repo-sync/default.nix
rename to krebs/5pkgs/simple/repo-sync/default.nix
diff --git a/krebs/5pkgs/retiolum-bootstrap/default.nix b/krebs/5pkgs/simple/retiolum-bootstrap/default.nix
similarity index 100%
rename from krebs/5pkgs/retiolum-bootstrap/default.nix
rename to krebs/5pkgs/simple/retiolum-bootstrap/default.nix
diff --git a/krebs/5pkgs/rutorrent/default.nix b/krebs/5pkgs/simple/rutorrent/default.nix
similarity index 100%
rename from krebs/5pkgs/rutorrent/default.nix
rename to krebs/5pkgs/simple/rutorrent/default.nix
diff --git a/krebs/5pkgs/tarantool/default.nix b/krebs/5pkgs/simple/tarantool/default.nix
similarity index 100%
rename from krebs/5pkgs/tarantool/default.nix
rename to krebs/5pkgs/simple/tarantool/default.nix
diff --git a/krebs/5pkgs/tinc_graphs/default.nix b/krebs/5pkgs/simple/tinc_graphs/default.nix
similarity index 100%
rename from krebs/5pkgs/tinc_graphs/default.nix
rename to krebs/5pkgs/simple/tinc_graphs/default.nix
diff --git a/krebs/5pkgs/translate-shell/default.nix b/krebs/5pkgs/simple/translate-shell/default.nix
similarity index 100%
rename from krebs/5pkgs/translate-shell/default.nix
rename to krebs/5pkgs/simple/translate-shell/default.nix
diff --git a/krebs/5pkgs/treq/default.nix b/krebs/5pkgs/simple/treq/default.nix
similarity index 100%
rename from krebs/5pkgs/treq/default.nix
rename to krebs/5pkgs/simple/treq/default.nix
diff --git a/krebs/5pkgs/untilport/default.nix b/krebs/5pkgs/simple/untilport/default.nix
similarity index 100%
rename from krebs/5pkgs/untilport/default.nix
rename to krebs/5pkgs/simple/untilport/default.nix
diff --git a/krebs/5pkgs/urlwatch/default.nix b/krebs/5pkgs/simple/urlwatch/default.nix
similarity index 100%
rename from krebs/5pkgs/urlwatch/default.nix
rename to krebs/5pkgs/simple/urlwatch/default.nix
diff --git a/krebs/5pkgs/weechat/default.nix b/krebs/5pkgs/simple/weechat/default.nix
similarity index 100%
rename from krebs/5pkgs/weechat/default.nix
rename to krebs/5pkgs/simple/weechat/default.nix
diff --git a/krebs/5pkgs/whatsupnix/default.nix b/krebs/5pkgs/simple/whatsupnix/default.nix
similarity index 100%
rename from krebs/5pkgs/whatsupnix/default.nix
rename to krebs/5pkgs/simple/whatsupnix/default.nix
diff --git a/krebs/5pkgs/whatsupnix/whatsupnix.bash b/krebs/5pkgs/simple/whatsupnix/whatsupnix.bash
similarity index 100%
rename from krebs/5pkgs/whatsupnix/whatsupnix.bash
rename to krebs/5pkgs/simple/whatsupnix/whatsupnix.bash
diff --git a/krebs/5pkgs/with-tmpdir/default.nix b/krebs/5pkgs/simple/with-tmpdir/default.nix
similarity index 100%
rename from krebs/5pkgs/with-tmpdir/default.nix
rename to krebs/5pkgs/simple/with-tmpdir/default.nix
diff --git a/krebs/5pkgs/youtube-tools/default.nix b/krebs/5pkgs/simple/youtube-tools/default.nix
similarity index 100%
rename from krebs/5pkgs/youtube-tools/default.nix
rename to krebs/5pkgs/simple/youtube-tools/default.nix
diff --git a/krebs/5pkgs/zandronum-bin/default.nix b/krebs/5pkgs/simple/zandronum-bin/default.nix
similarity index 100%
rename from krebs/5pkgs/zandronum-bin/default.nix
rename to krebs/5pkgs/simple/zandronum-bin/default.nix
From 17df5f0c453d891b29dbb6a9d189fc8dcf88fac0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 01:49:36 +0200
Subject: [PATCH 24/32] empty: move to krebs/5pkgs/simple
---
krebs/5pkgs/default.nix | 2 --
krebs/5pkgs/simple/empty.nix | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
create mode 100644 krebs/5pkgs/simple/empty.nix
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 5af541258..9fe2fea3c 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -15,8 +15,6 @@ with import <stockholm/lib>;
// import ./simple pkgs oldpkgs
// import ./writers.nix pkgs oldpkgs
// {
- empty = pkgs.runCommand "empty-1.0.0" {} "mkdir $out";
-
haskellPackages = oldpkgs.haskellPackages.override {
overrides = self: super:
mapAttrs (name: path: self.callPackage path {})
diff --git a/krebs/5pkgs/simple/empty.nix b/krebs/5pkgs/simple/empty.nix
new file mode 100644
index 000000000..a45723b65
--- /dev/null
+++ b/krebs/5pkgs/simple/empty.nix
@@ -0,0 +1,2 @@
+{ pkgs }:
+pkgs.runCommand "empty-1.0.0" {} "mkdir $out"
From eae210f8ff05b7f59ab62ba161c86971dbd7f50e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 01:57:28 +0200
Subject: [PATCH 25/32] krebs/5pkgs: move haskell stuff to a subdir
---
krebs/5pkgs/default.nix | 15 +--------------
.../{haskell-overrides => haskell}/blessings.nix | 0
krebs/5pkgs/haskell/default.nix | 15 +++++++++++++++
.../email-header.nix | 0
.../hyphenation.nix | 0
.../5pkgs/{haskell-overrides => haskell}/kirk.nix | 0
.../5pkgs/{haskell-overrides => haskell}/news.nix | 0
.../{haskell-overrides => haskell}/scanner.nix | 0
.../xmonad-stockholm.nix | 0
9 files changed, 16 insertions(+), 14 deletions(-)
rename krebs/5pkgs/{haskell-overrides => haskell}/blessings.nix (100%)
create mode 100644 krebs/5pkgs/haskell/default.nix
rename krebs/5pkgs/{haskell-overrides => haskell}/email-header.nix (100%)
rename krebs/5pkgs/{haskell-overrides => haskell}/hyphenation.nix (100%)
rename krebs/5pkgs/{haskell-overrides => haskell}/kirk.nix (100%)
rename krebs/5pkgs/{haskell-overrides => haskell}/news.nix (100%)
rename krebs/5pkgs/{haskell-overrides => haskell}/scanner.nix (100%)
rename krebs/5pkgs/{haskell-overrides => haskell}/xmonad-stockholm.nix (100%)
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 9fe2fea3c..eab059165 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -12,23 +12,10 @@ with import <stockholm/lib>;
then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
else override;
in {}
+ // import ./haskell pkgs oldpkgs
// import ./simple pkgs oldpkgs
// import ./writers.nix pkgs oldpkgs
// {
- haskellPackages = oldpkgs.haskellPackages.override {
- overrides = self: super:
- mapAttrs (name: path: self.callPackage path {})
- (mapAttrs'
- (name: type:
- if hasSuffix ".nix" name
- then {
- name = removeSuffix ".nix" name;
- value = ./haskell-overrides + "/${name}";
- }
- else null)
- (builtins.readDir ./haskell-overrides));
- };
-
ReaktorPlugins = callPackage ./simple/Reaktor/plugins.nix {};
buildbot-full = callPackage ./simple/buildbot {
diff --git a/krebs/5pkgs/haskell-overrides/blessings.nix b/krebs/5pkgs/haskell/blessings.nix
similarity index 100%
rename from krebs/5pkgs/haskell-overrides/blessings.nix
rename to krebs/5pkgs/haskell/blessings.nix
diff --git a/krebs/5pkgs/haskell/default.nix b/krebs/5pkgs/haskell/default.nix
new file mode 100644
index 000000000..1120356a7
--- /dev/null
+++ b/krebs/5pkgs/haskell/default.nix
@@ -0,0 +1,15 @@
+with import <stockholm/lib>;
+
+self: super:
+{
+ haskellPackages = super.haskellPackages.override {
+ overrides = self: super:
+ listToAttrs
+ (map
+ (name: nameValuePair (removeSuffix ".nix" name)
+ (self.callPackage (./. + "/${name}") {}))
+ (filter
+ (name: name != "default.nix" && !hasPrefix "." name)
+ (attrNames (readDir ./.))));
+ };
+}
diff --git a/krebs/5pkgs/haskell-overrides/email-header.nix b/krebs/5pkgs/haskell/email-header.nix
similarity index 100%
rename from krebs/5pkgs/haskell-overrides/email-header.nix
rename to krebs/5pkgs/haskell/email-header.nix
diff --git a/krebs/5pkgs/haskell-overrides/hyphenation.nix b/krebs/5pkgs/haskell/hyphenation.nix
similarity index 100%
rename from krebs/5pkgs/haskell-overrides/hyphenation.nix
rename to krebs/5pkgs/haskell/hyphenation.nix
diff --git a/krebs/5pkgs/haskell-overrides/kirk.nix b/krebs/5pkgs/haskell/kirk.nix
similarity index 100%
rename from krebs/5pkgs/haskell-overrides/kirk.nix
rename to krebs/5pkgs/haskell/kirk.nix
diff --git a/krebs/5pkgs/haskell-overrides/news.nix b/krebs/5pkgs/haskell/news.nix
similarity index 100%
rename from krebs/5pkgs/haskell-overrides/news.nix
rename to krebs/5pkgs/haskell/news.nix
diff --git a/krebs/5pkgs/haskell-overrides/scanner.nix b/krebs/5pkgs/haskell/scanner.nix
similarity index 100%
rename from krebs/5pkgs/haskell-overrides/scanner.nix
rename to krebs/5pkgs/haskell/scanner.nix
diff --git a/krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix b/krebs/5pkgs/haskell/xmonad-stockholm.nix
similarity index 100%
rename from krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix
rename to krebs/5pkgs/haskell/xmonad-stockholm.nix
From e6b7fe74c1ec4ff42967e7bd79d7fe669451d047 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 02:03:46 +0200
Subject: [PATCH 26/32] krebs/5pkgs: detect simple obsolete overrides
---
krebs/5pkgs/default.nix | 21 +++++----------------
krebs/5pkgs/simple/default.nix | 28 +++++++++++++++++++++-------
2 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index eab059165..ea14e02a4 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -1,27 +1,16 @@
pkgs: oldpkgs:
with import <stockholm/lib>;
- let
- # This callPackage will try to detect obsolete overrides.
- callPackage = path: args: let
- override = pkgs.callPackage path args;
- upstream = optionalAttrs (override ? "name")
- (oldpkgs.${(parseDrvName override.name).name} or {});
- in if upstream ? "name" &&
- override ? "name" &&
- compareVersions upstream.name override.name != -1
- then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
- else override;
- in {}
+ {}
// import ./haskell pkgs oldpkgs
// import ./simple pkgs oldpkgs
// import ./writers.nix pkgs oldpkgs
// {
- ReaktorPlugins = callPackage ./simple/Reaktor/plugins.nix {};
+ ReaktorPlugins = pkgs.callPackage ./simple/Reaktor/plugins.nix {};
- buildbot-full = callPackage ./simple/buildbot {
+ buildbot-full = pkgs.callPackage ./simple/buildbot {
plugins = with pkgs.buildbot-plugins; [ www console-view waterfall-view ];
};
- buildbot-worker = callPackage ./simple/buildbot/worker.nix {};
+ buildbot-worker = pkgs.callPackage ./simple/buildbot/worker.nix {};
# https://github.com/proot-me/PRoot/issues/106
proot = pkgs.writeDashBin "proot" ''
@@ -35,6 +24,6 @@ with import <stockholm/lib>;
in if typeOf x != "lambda" then x else oldpkgs.symlinkJoin name paths;
test = {
- infest-cac-centos7 = callPackage ./test/infest-cac-centos7 {};
+ infest-cac-centos7 = pkgs.callPackage ./test/infest-cac-centos7 {};
};
}
diff --git a/krebs/5pkgs/simple/default.nix b/krebs/5pkgs/simple/default.nix
index 2f6799759..1b9d8c235 100644
--- a/krebs/5pkgs/simple/default.nix
+++ b/krebs/5pkgs/simple/default.nix
@@ -1,10 +1,24 @@
with import <stockholm/lib>;
self: super:
-listToAttrs
- (map
- (name: nameValuePair (removeSuffix ".nix" name)
- (super.callPackage (./. + "/${name}") {}))
- (filter
- (name: name != "default.nix" && !hasPrefix "." name)
- (attrNames (readDir ./.))))
+
+let
+ # This callPackage will try to detect obsolete overrides.
+ callPackage = path: args: let
+ override = self.callPackage path args;
+ upstream = optionalAttrs (override ? "name")
+ (super.${(parseDrvName override.name).name} or {});
+ in if upstream ? "name" &&
+ override ? "name" &&
+ compareVersions upstream.name override.name != -1
+ then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
+ else override;
+in
+
+ listToAttrs
+ (map
+ (name: nameValuePair (removeSuffix ".nix" name)
+ (callPackage (./. + "/${name}") {}))
+ (filter
+ (name: name != "default.nix" && !hasPrefix "." name)
+ (attrNames (readDir ./.))))
From 98741092302a796554b727f54cef1316b405562d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 02:12:02 +0200
Subject: [PATCH 27/32] krebs/5pkgs: move test stuff to a subdir
---
krebs/5pkgs/default.nix | 5 +----
krebs/5pkgs/test/default.nix | 9 +++++++++
2 files changed, 10 insertions(+), 4 deletions(-)
create mode 100644 krebs/5pkgs/test/default.nix
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index ea14e02a4..6dbb0954f 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -3,6 +3,7 @@ with import <stockholm/lib>;
{}
// import ./haskell pkgs oldpkgs
// import ./simple pkgs oldpkgs
+ // import ./test pkgs oldpkgs
// import ./writers.nix pkgs oldpkgs
// {
ReaktorPlugins = pkgs.callPackage ./simple/Reaktor/plugins.nix {};
@@ -22,8 +23,4 @@ with import <stockholm/lib>;
symlinkJoin = { name, paths, ... }@args: let
x = oldpkgs.symlinkJoin args;
in if typeOf x != "lambda" then x else oldpkgs.symlinkJoin name paths;
-
- test = {
- infest-cac-centos7 = pkgs.callPackage ./test/infest-cac-centos7 {};
- };
}
diff --git a/krebs/5pkgs/test/default.nix b/krebs/5pkgs/test/default.nix
new file mode 100644
index 000000000..5ee8f913b
--- /dev/null
+++ b/krebs/5pkgs/test/default.nix
@@ -0,0 +1,9 @@
+with import <stockholm/lib>;
+
+self: super:
+
+{
+ test = {
+ infest-cac-centos7 = self.callPackage ./infest-cac-centos7 {};
+ };
+}
From 00b9970aae4e2cb472c793b9809bfb18fff8a37f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 02:25:21 +0200
Subject: [PATCH 28/32] krebs/5pkgs: import directory contents as overlays
---
krebs/5pkgs/default.nix | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 6dbb0954f..820f0cdc8 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -1,10 +1,13 @@
pkgs: oldpkgs:
with import <stockholm/lib>;
- {}
- // import ./haskell pkgs oldpkgs
- // import ./simple pkgs oldpkgs
- // import ./test pkgs oldpkgs
- // import ./writers.nix pkgs oldpkgs
+
+ foldl' mergeAttrs {}
+ (map
+ (name: import (./. + "/${name}") pkgs oldpkgs)
+ (filter
+ (name: name != "default.nix" && !hasPrefix "." name)
+ (attrNames (readDir ./.))))
+
// {
ReaktorPlugins = pkgs.callPackage ./simple/Reaktor/plugins.nix {};
From e733b7e07d091593ebbe9274be0e71e541db4c06 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 02:28:37 +0200
Subject: [PATCH 29/32] krebs/5pkgs: reformat
---
krebs/5pkgs/default.nix | 50 ++++++++++++++++++++++-------------------
1 file changed, 27 insertions(+), 23 deletions(-)
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 820f0cdc8..39e89a4b6 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -1,29 +1,33 @@
-pkgs: oldpkgs:
with import <stockholm/lib>;
- foldl' mergeAttrs {}
- (map
- (name: import (./. + "/${name}") pkgs oldpkgs)
- (filter
- (name: name != "default.nix" && !hasPrefix "." name)
- (attrNames (readDir ./.))))
+self: super:
- // {
- ReaktorPlugins = pkgs.callPackage ./simple/Reaktor/plugins.nix {};
+# Import files and subdirectories like they are overlays.
+foldl' mergeAttrs {}
+ (map
+ (name: import (./. + "/${name}") self super)
+ (filter
+ (name: name != "default.nix" && !hasPrefix "." name)
+ (attrNames (readDir ./.))))
- buildbot-full = pkgs.callPackage ./simple/buildbot {
- plugins = with pkgs.buildbot-plugins; [ www console-view waterfall-view ];
- };
- buildbot-worker = pkgs.callPackage ./simple/buildbot/worker.nix {};
+//
- # https://github.com/proot-me/PRoot/issues/106
- proot = pkgs.writeDashBin "proot" ''
- export PROOT_NO_SECCOMP=1
- exec ${oldpkgs.proot}/bin/proot "$@"
- '';
+{
+ ReaktorPlugins = self.callPackage ./simple/Reaktor/plugins.nix {};
- # XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d
- symlinkJoin = { name, paths, ... }@args: let
- x = oldpkgs.symlinkJoin args;
- in if typeOf x != "lambda" then x else oldpkgs.symlinkJoin name paths;
- }
+ buildbot-full = self.callPackage ./simple/buildbot {
+ plugins = with self.buildbot-plugins; [ www console-view waterfall-view ];
+ };
+ buildbot-worker = self.callPackage ./simple/buildbot/worker.nix {};
+
+ # https://github.com/proot-me/PRoot/issues/106
+ proot = self.writeDashBin "proot" ''
+ export PROOT_NO_SECCOMP=1
+ exec ${super.proot}/bin/proot "$@"
+ '';
+
+ # XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d
+ symlinkJoin = { name, paths, ... }@args: let
+ x = super.symlinkJoin args;
+ in if typeOf x != "lambda" then x else super.symlinkJoin name paths;
+}
From 4d1de57df5800879e7fcfcc38e5a10f0c1b993d7 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 02:32:39 +0200
Subject: [PATCH 30/32] {lass,makefu}: fix path to simple pkgs
---
lass/1systems/iso.nix | 2 +-
makefu/1systems/iso.nix | 2 +-
makefu/5pkgs/default.nix | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lass/1systems/iso.nix b/lass/1systems/iso.nix
index 30fc674bc..eaeb1991f 100644
--- a/lass/1systems/iso.nix
+++ b/lass/1systems/iso.nix
@@ -16,7 +16,7 @@ with import <stockholm/lib>;
# /dev/pts is empty except for 1 file
# my life sucks
nixpkgs.config.packageOverrides = super: {
- irc-announce = super.callPackage <stockholm/krebs/5pkgs/irc-announce> {
+ irc-announce = super.callPackage <stockholm/krebs/5pkgs/simple/irc-announce> {
pkgs = pkgs // { coreutils = pkgs.concat "coreutils-hack" [
pkgs.coreutils
(pkgs.writeDashBin "tee" ''
diff --git a/makefu/1systems/iso.nix b/makefu/1systems/iso.nix
index ee1046f79..1e4f9c55f 100644
--- a/makefu/1systems/iso.nix
+++ b/makefu/1systems/iso.nix
@@ -31,7 +31,7 @@ with import <stockholm/lib>;
systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ];
# hack `tee` behavior
nixpkgs.config.packageOverrides = super: {
- irc-announce = super.callPackage <stockholm/krebs/5pkgs/irc-announce> {
+ irc-announce = super.callPackage <stockholm/krebs/5pkgs/simple/irc-announce> {
pkgs = pkgs // { coreutils = pkgs.concat "coreutils-hack" [
pkgs.coreutils
(pkgs.writeDashBin "tee" ''
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 25ae2fe4b..d1b8fcc42 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -25,7 +25,7 @@ with import <stockholm/lib>;
alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
inherit (callPackage ./devpi {}) devpi-web devpi-server devpi-client;
nodemcu-uploader = callPackage ./nodemcu-uploader {};
- pwqgen-ger = callPackage ../../krebs/5pkgs/passwdqc-utils {
+ pwqgen-ger = callPackage <stockholm/krebs/5pkgs/simple/passwdqc-utils> {
wordset-file = pkgs.fetchurl {
url = https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c ;
sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb";
From 6e93f661e0b31c95f69d1bd3a6f208d26e3e0958 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Mon, 29 May 2017 10:52:58 +0200
Subject: [PATCH 31/32] l 2 nixpkgs: f469354 -> f8dfdd7
---
lass/2configs/nixpkgs.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index c6620afaa..a3916a2ea 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
{
krebs.build.source.nixpkgs.git = {
url = https://cgit.lassul.us/nixpkgs;
- ref = "f469354";
+ ref = "f8dfdd7";
};
}
From 21d92086fe00c7369fde3951f92e9f73f4c05ee9 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 30 May 2017 10:06:04 +0200
Subject: [PATCH 32/32] l: move Reaktor coders config to 2configs
---
lass/1systems/prism.nix | 99 +-----------------------------------
lass/2configs/coders-irc.nix | 92 +++++++++++++++++++++++++++++++++
2 files changed, 93 insertions(+), 98 deletions(-)
create mode 100644 lass/2configs/coders-irc.nix
diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 01cfe5414..02054a8e5 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -1,5 +1,4 @@
{ config, lib, pkgs, ... }:
-
with import <stockholm/lib>;
let
@@ -46,6 +45,7 @@ in {
../2configs/monitoring/monit-alarms.nix
../2configs/paste.nix
../2configs/syncthing.nix
+ ../2configs/coders-irc.nix
{
imports = [
../2configs/bepasty.nix
@@ -253,103 +253,6 @@ in {
{ v6 = false; precedence = 1000; predicate = "-d 192.168.122.24 -p tcp --dport 22 -m state --state NEW,ESTABLISHED,RELATED"; target = "ACCEPT"; }
];
}
- {
- krebs.Reaktor.coders = {
- nickname = "Reaktor|lass";
- channels = [ "#coders" "#germany" ];
- extraEnviron = {
- REAKTOR_HOST = "irc.hackint.org";
- };
- plugins = with pkgs.ReaktorPlugins; let
-
- lambdabot = (import (pkgs.fetchFromGitHub {
- owner = "NixOS"; repo = "nixpkgs";
- rev = "a4ec1841da14fc98c5c35cc72242c23bb698d4ac";
- sha256 = "148fpw31s922hxrf28yhrci296f7c7zd81hf0k6zs05rq0i3szgy";
- }) {}).lambdabot;
-
- lambdabotflags = ''
- -XStandaloneDeriving -XGADTs -XFlexibleContexts \
- -XFlexibleInstances -XMultiParamTypeClasses \
- -XOverloadedStrings -XFunctionalDependencies \'';
- in [
- url-title
- (buildSimpleReaktorPlugin "lambdabot-pl" {
- pattern = "^@pl (?P<args>.*)$$";
- script = pkgs.writeDash "lambda-pl" ''
- exec ${lambdabot}/bin/lambdabot \
- ${indent lambdabotflags}
- -e "@pl $1"
- '';
- })
- (buildSimpleReaktorPlugin "lambdabot-type" {
- pattern = "^@type (?P<args>.*)$$";
- script = pkgs.writeDash "lambda-type" ''
- exec ${lambdabot}/bin/lambdabot \
- ${indent lambdabotflags}
- -e "@type $1"
- '';
- })
- (buildSimpleReaktorPlugin "lambdabot-let" {
- pattern = "^@let (?P<args>.*)$$";
- script = pkgs.writeDash "lambda-let" ''
- exec ${lambdabot}/bin/lambdabot \
- ${indent lambdabotflags}
- -e "@let $1"
- '';
- })
- (buildSimpleReaktorPlugin "lambdabot-run" {
- pattern = "^@run (?P<args>.*)$$";
- script = pkgs.writeDash "lambda-run" ''
- exec ${lambdabot}/bin/lambdabot \
- ${indent lambdabotflags}
- -e "@run $1"
- '';
- })
- (buildSimpleReaktorPlugin "lambdabot-kind" {
- pattern = "^@kind (?P<args>.*)$$";
- script = pkgs.writeDash "lambda-kind" ''
- exec ${lambdabot}/bin/lambdabot \
- ${indent lambdabotflags}
- -e "@kind $1"
- '';
- })
- (buildSimpleReaktorPlugin "lambdabot-kind" {
- pattern = "^@kind (?P<args>.*)$$";
- script = pkgs.writeDash "lambda-kind" ''
- exec ${lambdabot}/bin/lambdabot \
- ${indent lambdabotflags}
- -e "@kind $1"
- '';
- })
- (buildSimpleReaktorPlugin "random-unicorn-porn" {
- pattern = "^!rup$$";
- script = pkgs.writePython2 "rup" ''
- #!${pkgs.python2}/bin/python
- t1 = """
- _.
- ;=',_ ()
- 8===D~~ S" .--`||
- sS \__ ||
- __.' ( \-->||
- _=/ _./-\/ ||
- 8===D~~ ((\( /-' -'l ||
- ) |/ \\ (_))
- \\ \\
- '~ '~
- """
- print(t1)
- '';
- })
- (buildSimpleReaktorPlugin "ping" {
- pattern = "^!ping (?P<args>.*)$$";
- script = pkgs.writeDash "ping" ''
- exec /var/setuid-wrappers/ping -q -c1 "$1" 2>&1 | tail -1
- '';
- })
- ];
- };
- }
{
krebs.Reaktor.prism = {
nickname = "Reaktor|lass";
diff --git a/lass/2configs/coders-irc.nix b/lass/2configs/coders-irc.nix
new file mode 100644
index 000000000..61cc7cfe0
--- /dev/null
+++ b/lass/2configs/coders-irc.nix
@@ -0,0 +1,92 @@
+{ config, lib, pkgs, ... }:
+with import <stockholm/lib>;
+
+{
+ krebs.Reaktor.coders = {
+ nickname = "Reaktor|lass";
+ channels = [ "#coders" "#germany" ];
+ extraEnviron = {
+ REAKTOR_HOST = "irc.hackint.org";
+ };
+ plugins = with pkgs.ReaktorPlugins; let
+
+ lambdabot = (import (pkgs.fetchFromGitHub {
+ owner = "NixOS"; repo = "nixpkgs";
+ rev = "a4ec1841da14fc98c5c35cc72242c23bb698d4ac";
+ sha256 = "148fpw31s922hxrf28yhrci296f7c7zd81hf0k6zs05rq0i3szgy";
+ }) {}).lambdabot;
+
+ lambdabotflags = ''
+ -XStandaloneDeriving -XGADTs -XFlexibleContexts \
+ -XFlexibleInstances -XMultiParamTypeClasses \
+ -XOverloadedStrings -XFunctionalDependencies \'';
+ in [
+ url-title
+ (buildSimpleReaktorPlugin "lambdabot-pl" {
+ pattern = "^@pl (?P<args>.*)$$";
+ script = pkgs.writeDash "lambda-pl" ''
+ exec ${lambdabot}/bin/lambdabot \
+ ${indent lambdabotflags}
+ -e "@pl $1"
+ '';
+ })
+ (buildSimpleReaktorPlugin "lambdabot-type" {
+ pattern = "^@type (?P<args>.*)$$";
+ script = pkgs.writeDash "lambda-type" ''
+ exec ${lambdabot}/bin/lambdabot \
+ ${indent lambdabotflags}
+ -e "@type $1"
+ '';
+ })
+ (buildSimpleReaktorPlugin "lambdabot-let" {
+ pattern = "^@let (?P<args>.*)$$";
+ script = pkgs.writeDash "lambda-let" ''
+ exec ${lambdabot}/bin/lambdabot \
+ ${indent lambdabotflags}
+ -e "@let $1"
+ '';
+ })
+ (buildSimpleReaktorPlugin "lambdabot-run" {
+ pattern = "^@run (?P<args>.*)$$";
+ script = pkgs.writeDash "lambda-run" ''
+ exec ${lambdabot}/bin/lambdabot \
+ ${indent lambdabotflags}
+ -e "@run $1"
+ '';
+ })
+ (buildSimpleReaktorPlugin "lambdabot-kind" {
+ pattern = "^@kind (?P<args>.*)$$";
+ script = pkgs.writeDash "lambda-kind" ''
+ exec ${lambdabot}/bin/lambdabot \
+ ${indent lambdabotflags}
+ -e "@kind $1"
+ '';
+ })
+ (buildSimpleReaktorPlugin "random-unicorn-porn" {
+ pattern = "^!rup$$";
+ script = pkgs.writePython2 "rup" ''
+ #!${pkgs.python2}/bin/python
+ t1 = """
+ _.
+ ;=',_ ()
+ 8===D~~ S" .--`||
+ sS \__ ||
+ __.' ( \-->||
+ _=/ _./-\/ ||
+ 8===D~~ ((\( /-' -'l ||
+ ) |/ \\ (_))
+ \\ \\
+ '~ '~
+ """
+ print(t1)
+ '';
+ })
+ (buildSimpleReaktorPlugin "ping" {
+ pattern = "^!ping (?P<args>.*)$$";
+ script = pkgs.writeDash "ping" ''
+ exec /var/setuid-wrappers/ping -q -c1 "$1" 2>&1 | tail -1
+ '';
+ })
+ ];
+ };
+}