aboutsummaryrefslogtreecommitdiff
path: root/pkgs/default.nix
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-04-18 16:10:56 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-04-20 01:51:48 +0200
commitd3452fc59b9839846225fd254926c64a9c71f071 (patch)
treea98a0958b826ac4b2ab137720edf0195c65dd958 /pkgs/default.nix
parent514f9ec3beec470c4445be690673a0ceab9115b4 (diff)
downloadNix-d3452fc59b9839846225fd254926c64a9c71f071.tar.gz
Nix-d3452fc59b9839846225fd254926c64a9c71f071.tar.zst
Nix-d3452fc59b9839846225fd254926c64a9c71f071.zip
Refactor websites
Diffstat (limited to 'pkgs/default.nix')
-rw-r--r--pkgs/default.nix6
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix
index b02c63e..14d3ed6 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -45,7 +45,7 @@ rec {
45 bitlbee-mastodon = callPackage ./bitlbee-mastodon {}; 45 bitlbee-mastodon = callPackage ./bitlbee-mastodon {};
46 46
47 composerEnv = callPackage ./composer-env {}; 47 composerEnv = callPackage ./composer-env {};
48 webapps = callPackage ./webapps { inherit mylibs composerEnv private; }; 48 webapps = callPackage ./webapps { inherit mylibs composerEnv; };
49 49
50 monitoring-plugins = callPackage ./monitoring-plugins {}; 50 monitoring-plugins = callPackage ./monitoring-plugins {};
51 naemon = callPackage ./naemon { inherit mylibs monitoring-plugins; }; 51 naemon = callPackage ./naemon { inherit mylibs monitoring-plugins; };
@@ -54,10 +54,6 @@ rec {
54 simp_le_0_17 = callPackage ./simp_le {}; 54 simp_le_0_17 = callPackage ./simp_le {};
55 certbot = callPackage ./certbot {}; 55 certbot = callPackage ./certbot {};
56 56
57 private = if builtins.pathExists (./. + "/private")
58 then import ./private { inherit pkgs; }
59 else { webapps = {}; };
60
61 python3PackagesPlus = callPackage ./python-packages { 57 python3PackagesPlus = callPackage ./python-packages {
62 python = python3; 58 python = python3;
63 inherit mylibs; 59 inherit mylibs;