diff options
| author | lassulus <lass@aidsballs.de> | 2016-03-22 17:40:59 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-03-22 17:41:18 +0100 |
| commit | 55df7c1df55aaa8dc3f48ae83dbd87ce4d3057ba (patch) | |
| tree | a66046ba205584493d3140139f1073c0ac8c797b | |
| parent | fda0262111283afa198510730af8c251886abd4a (diff) | |
l 1 mors: remove broken pythonenv container
| -rw-r--r-- | lass/1systems/mors.nix | 33 | ||||
| -rw-r--r-- | lass/2configs/base.nix | 1 |
2 files changed, 1 insertions, 33 deletions
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 1f7a13c56..9b5c92ff3 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -99,39 +99,6 @@ # ]; #} { - containers.pythonenv = { - config = { - services.openssh.enable = true; - users.users.root.openssh.authorizedKeys.keys = [ - config.krebs.users.lass.pubkey - ]; - - environment = { - systemPackages = with pkgs; [ - git - libxml2 - libxslt - libzip - python27Full - python27Packages.buildout - stdenv - zlib - ]; - - pathsToLink = [ "/include" ]; - - shellInit = '' - # help pip to find libz.so when building lxml - export LIBRARY_PATH=/var/run/current-system/sw/lib - # ditto for header files, e.g. sqlite - export C_INCLUDE_PATH=/var/run/current-system/sw/include - ''; - }; - - }; - }; - } - { services.mysql = { enable = true; package = pkgs.mariadb; diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index 8017d4270..a50df128e 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -88,6 +88,7 @@ with config.krebs.lib; environment.systemPackages = with pkgs; [ #stockholm git + gnumake jq parallel proot |