diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-22 01:08:46 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-22 01:08:46 +0100 |
| commit | 020fcc22000ce35337a765bfa37f4178fbbff68c (patch) | |
| tree | 8485531b5285b4dce6e9b9abecba4ccad5b9b46a /makefu/2configs | |
| parent | 2924afb8a2cb7d734b56a4a8934737129a20154c (diff) | |
| parent | a2b8eb75506fa27bc3d44f6a33d860ce7d3470e0 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'makefu/2configs')
| -rw-r--r-- | makefu/2configs/default.nix | 7 | ||||
| -rw-r--r-- | makefu/2configs/deployment/mycube.connector.one.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/main-laptop.nix | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index 83018e9f8..3043a1af3 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -4,6 +4,13 @@ with config.krebs.lib; { system.stateVersion = "15.09"; + system.replaceRuntimeDependencies = with pkgs.lib; + [{original = pkgs.glibc; replacement = pkgs.stdenv.lib.overrideDerivation pkgs.glibc (oldAttr: { patches = oldAttr.patches ++ + [(pkgs.fetchurl { url = "https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/libraries/glibc/cve-2015-7547.patch"; + sha256 = "0awpc4rp2x27rjpj83ps0rclmn73hsgfv2xxk18k82w4hdxqpp5r";})]; + });} + ]; + imports = [ { users.extraUsers = diff --git a/makefu/2configs/deployment/mycube.connector.one.nix b/makefu/2configs/deployment/mycube.connector.one.nix index 6a32656b4..38fc4a243 100644 --- a/makefu/2configs/deployment/mycube.connector.one.nix +++ b/makefu/2configs/deployment/mycube.connector.one.nix @@ -16,7 +16,7 @@ in { vassals = { mycube-flask = { type = "normal"; - python2Packages = self: with self; [ pkgs.mycube-flask self.flask self.redis self.werkzeug self.jinja2 self.markupsafe itsdangerous ]; + python2Packages = self: with self; [ pkgs.mycube-flask flask redis werkzeug jinja2 markupsafe itsdangerous ]; socket = wsgi-sock; }; }; diff --git a/makefu/2configs/main-laptop.nix b/makefu/2configs/main-laptop.nix index c3e43723c..452cdfb23 100644 --- a/makefu/2configs/main-laptop.nix +++ b/makefu/2configs/main-laptop.nix @@ -12,6 +12,9 @@ with config.krebs.lib; ./fetchWallpaper.nix ./zsh-user.nix ]; + + users.users.${config.krebs.build.user.name}.extraGroups = [ "dialout" ]; + environment.systemPackages = with pkgs;[ vlc firefox |