s 1 wolf: bump worlddomination

This commit is contained in:
makefu 2017-06-18 14:09:02 +02:00
parent 78ba83b1ee
commit 2cb779a549
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 13 additions and 3 deletions

View File

@ -15,6 +15,7 @@ in
../2configs/repo-sync.nix ../2configs/repo-sync.nix
../2configs/shared-buildbot.nix ../2configs/shared-buildbot.nix
../2configs/shack/worlddomination.nix
../2configs/shack/drivedroid.nix ../2configs/shack/drivedroid.nix
# ../2configs/shack/nix-cacher.nix # ../2configs/shack/nix-cacher.nix
../2configs/shack/mqtt_sub.nix ../2configs/shack/mqtt_sub.nix
@ -90,6 +91,15 @@ in
swapDevices = [ swapDevices = [
{ device = "/dev/disk/by-label/swap"; } { device = "/dev/disk/by-label/swap"; }
]; ];
# fallout of ipv6calypse
networking.extraHosts = ''
hass.shack 10.42.2.191
heidi.shack 10.42.2.135
'';
users.extraUsers.root.openssh.authorizedKeys.keys = [
config.krebs.users.ulrich.pubkey
];
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
sound.enable = false; sound.enable = false;

View File

@ -26,11 +26,11 @@ let
}; };
}; };
pkg = pkgs.stdenv.mkDerivation { pkg = pkgs.stdenv.mkDerivation {
name = "worlddomination-2017-06-08"; name = "worlddomination-2017-06-10";
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://github.com/shackspace/worlddomination/"; url = "https://github.com/shackspace/worlddomination/";
rev = "39344a4"; rev = "72fc9b5";
sha256 = "07alvdgz1vyww6nlay4qx4l7hnfqw0sqcdd9syhsjhqv3ciigwcp"; sha256 = "05h500rswzypcxy4i22qc1vkc8izbzfqa9m86xg289hjxh133xyf";
}; };
buildInputs = [ buildInputs = [
(pkgs.python3.withPackages (pythonPackages: with pythonPackages; [ (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [