summaryrefslogtreecommitdiff
path: root/pkgs
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-25 00:04:58 +0200
commit5ea02e5164d6be1eba8e7b2341105205ead98a87 (patch)
treee56335c0a286f5673f2427fdd4bae0ed0d0aa553 /pkgs
parent341ee3c6f3f1eb42f4627a0ab411174adaeadc7f (diff)
downloadNUR-5ea02e5164d6be1eba8e7b2341105205ead98a87.tar.gz
NUR-5ea02e5164d6be1eba8e7b2341105205ead98a87.tar.zst
NUR-5ea02e5164d6be1eba8e7b2341105205ead98a87.zip
Refactor websites
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/default.nix6
-rw-r--r--pkgs/webapps/default.nix4
2 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix
index b02c63ec..14d3ed6f 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;
diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix
index 2f4d7396..8cc252df 100644
--- a/pkgs/webapps/default.nix
+++ b/pkgs/webapps/default.nix
@@ -1,4 +1,4 @@
1{ callPackage, mylibs, composerEnv, lib, private }: 1{ callPackage, mylibs, composerEnv, lib }:
2rec { 2rec {
3 adminer = callPackage ./adminer {}; 3 adminer = callPackage ./adminer {};
4 apache-theme = callPackage ./apache-theme {}; 4 apache-theme = callPackage ./apache-theme {};
@@ -113,4 +113,4 @@ rec {
113 in 113 in
114 lib.attrsets.genAttrs names 114 lib.attrsets.genAttrs names
115 (name: callPackage (./yourls/plugins + "/${name}") { inherit mylibs; }); 115 (name: callPackage (./yourls/plugins + "/${name}") { inherit mylibs; });
116} // private.webapps 116}