From a52e2d79168da4154a95a8d91cf7592995e66e55 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 31 Oct 2019 15:17:18 +0100
Subject: [PATCH] shack/*: fix regression with mkYarnPackage and pypi2nix
generated files
---
krebs/2configs/shack/muell_mail.nix | 4 +-
krebs/2configs/shack/muellshack.nix | 4 +-
krebs/2configs/shack/node-light.nix | 6 +--
krebs/2configs/shack/s3-power.nix | 7 ++--
krebs/2configs/shack/worlddomination.nix | 2 +-
.../2configs/bureautomation/person/team.nix | 38 ++++++++++++++++++-
6 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/krebs/2configs/shack/muell_mail.nix b/krebs/2configs/shack/muell_mail.nix
index 5ae80d780..409278954 100644
--- a/krebs/2configs/shack/muell_mail.nix
+++ b/krebs/2configs/shack/muell_mail.nix
@@ -4,8 +4,8 @@ let
pkg = pkgs.callPackage (
pkgs.fetchgit {
url = "https://git.shackspace.de/rz/muell_mail";
- rev = "861ec25ab22797d8961efb32e72d79e113aa9f0f";
- sha256 = "sha256:18cw95zbr7isv4cw80cbpd84n5z208fwh5390i6j10jkn398mjq2";
+ rev = "57b67c95052d90044137b2c89007a371dc389afd";
+ sha256 = "1grkzs6fxjnc2bv4kskj63d5sb4qxz6yyr85nj0da9hn7qkk4jkj";
}) { mkYarnPackage = pkgs.yarn2nix-moretea.mkYarnPackage; };
home = "/var/lib/muell_mail";
cfg = toString <secrets/shack/muell_mail.js>;
diff --git a/krebs/2configs/shack/muellshack.nix b/krebs/2configs/shack/muellshack.nix
index 179855c4c..c1c957da3 100644
--- a/krebs/2configs/shack/muellshack.nix
+++ b/krebs/2configs/shack/muellshack.nix
@@ -4,8 +4,8 @@ let
pkg = pkgs.callPackage (
pkgs.fetchgit {
url = "https://git.shackspace.de/rz/muellshack";
- rev = "d8a5e2d4c0a22804838675ac42b468299dcd9a76";
- sha256 = "0ff6q64dgdxmpszp94z100fdic175b1vvxn4crg8p0jcabzxsv0m";
+ rev = "4601f59787de090c83be6dbae6ca72d7fc84ab9f";
+ sha256 = "1cshbd6ipvynbm3gmnsm58ccc1m5xc87cpd3b6jx0s6pr2j19g9j";
}) { mkYarnPackage = pkgs.yarn2nix-moretea.mkYarnPackage; };
home = "/var/lib/muellshack";
port = "8081";
diff --git a/krebs/2configs/shack/node-light.nix b/krebs/2configs/shack/node-light.nix
index 8cf0007b8..38cb3b55d 100644
--- a/krebs/2configs/shack/node-light.nix
+++ b/krebs/2configs/shack/node-light.nix
@@ -4,9 +4,9 @@ let
pkg = pkgs.callPackage (
pkgs.fetchgit {
url = "https://git.shackspace.de/rz/node-light.git";
- rev = "a32c782650c4cc0adf51250fe249167d7246c59b";
- sha256 = "0clvcp1m2ay0a9ibh7s21q7d9a6nam3497bysvc6mdygblks22qy";
- }) {};
+ rev = "32d8064db5172b8068f633211c8bd5688b2c8773";
+ sha256 = "14jzhs7pp3hq42wq3cwqarivn1z7vcgksfzfqfc4yyh21096yi1j";
+ }) { mkYarnPackage = pkgs.yarn2nix-moretea.mkYarnPackage; };
home = "/var/lib/node-light";
port = "8082";
in {
diff --git a/krebs/2configs/shack/s3-power.nix b/krebs/2configs/shack/s3-power.nix
index 40c42260f..f3ea67f79 100644
--- a/krebs/2configs/shack/s3-power.nix
+++ b/krebs/2configs/shack/s3-power.nix
@@ -4,9 +4,10 @@ let
pkg = pkgs.callPackage (
pkgs.fetchgit {
url = "https://git.shackspace.de/rz/s3-power";
- rev = "b2b87b56bb40d714dbbecd1285566870b256aec4";
- sha256 = "sha256:02wikwf3rgkkggwbwqisdvhlwd38w5pw011xhwvhnj114s3rynan";
- }) {};
+ rev = "0687ab64";
+ sha256 = "1m8h4bwykv24bbgr5v51mam4wsbp5424xcrawhs4izv563jjf130";
+ }) { mkYarnPackage = pkgs.yarn2nix-moretea.mkYarnPackage; };
+
home = "/var/lib/s3-power";
cfg = toString <secrets/shack/s3-power.json>;
in {
diff --git a/krebs/2configs/shack/worlddomination.nix b/krebs/2configs/shack/worlddomination.nix
index 44176a341..b38b9cab4 100644
--- a/krebs/2configs/shack/worlddomination.nix
+++ b/krebs/2configs/shack/worlddomination.nix
@@ -65,7 +65,7 @@ let
};
LinkHeader = pythonPackages.buildPythonPackage {
name = "LinkHeader-0.4.3";
- src = pkgs.fetchurl { url = "https://pypi.python.org/packages/27/d4/eb1da743b2dc825e936ef1d9e04356b5701e3a9ea022c7aaffdf4f6b0594/LinkHeader-0.4.3.tar.gz"; sha256 = "7fbbc35c0ba3fbbc530571db7e1c886e7db3d718b29b345848ac9686f21b50c3"; };
+ src = pkgs.fetchurl { url = "https://files.pythonhosted.org/packages/27/d4/eb1da743b2dc825e936ef1d9e04356b5701e3a9ea022c7aaffdf4f6b0594/LinkHeader-0.4.3.tar.gz"; sha256 = "7fbbc35c0ba3fbbc530571db7e1c886e7db3d718b29b345848ac9686f21b50c3"; };
propagatedBuildInputs = [ ];
meta = with pkgs.stdenv.lib; {
homepage = "";
diff --git a/makefu/2configs/bureautomation/person/team.nix b/makefu/2configs/bureautomation/person/team.nix
index e18c42194..fc2d9ba17 100644
--- a/makefu/2configs/bureautomation/person/team.nix
+++ b/makefu/2configs/bureautomation/person/team.nix
@@ -3,7 +3,7 @@
id = 1;
device_trackers = [
"device_tracker.thorsten_phone"
- "device_tracker.thorsten_arbeitphone"
+ #"device_tracker.thorsten_arbeitphone"
];
}
{ name = "Felix";
@@ -26,4 +26,40 @@
"device_tracker.daniel_phone"
];
}
+ { name = "Thierry";
+ id = 5;
+ device_trackers = [
+ "device_tracker.thierry_phone"
+ ];
+ }
+ { name = "Frank";
+ id = 6;
+ device_trackers = [
+ "device_tracker.frank_phone"
+ ];
+ }
+ { name = "Carsten";
+ id = 7;
+ device_trackers = [
+ "device_tracker.carsten_phone"
+ ];
+ }
+ { name = "Emeka";
+ id = 8;
+ device_trackers = [
+ "device_tracker.emeka_phone"
+ ];
+ }
+ #{ name = "Sabine";
+ # id = 9;
+ # device_trackers = [
+ # "device_tracker.sabine_phone"
+ # ];
+ #}
+ { name = "Tobias";
+ id = 10;
+ device_trackers = [
+ "device_tracker.tobias_phone"
+ ];
+ }
]