aboutsummaryrefslogtreecommitdiff
path: root/pkgs/default.nix
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-11 12:16:57 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-11 12:16:57 +0200
commit1bd8b03eeaafa9345282d8aaf6499bc80adf062f (patch)
treea80e655fbf0dad25c29c41a7f880a4c3574edebf /pkgs/default.nix
parent9eae2b47b7b315b05a0e010f3003bd875685e260 (diff)
downloadNix-1bd8b03eeaafa9345282d8aaf6499bc80adf062f.tar.gz
Nix-1bd8b03eeaafa9345282d8aaf6499bc80adf062f.tar.zst
Nix-1bd8b03eeaafa9345282d8aaf6499bc80adf062f.zip
Move Aten packages to pkgs
Diffstat (limited to 'pkgs/default.nix')
-rw-r--r--pkgs/default.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix
index b97b267..18fc3b3 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,6 +1,7 @@
1{ pkgs }: 1{ pkgs }:
2with pkgs; 2with pkgs;
3let mylibs = import ../libs.nix { inherit pkgs; }; 3let
4 mylibs = import ../libs.nix { inherit pkgs; };
4in 5in
5rec { 6rec {
6 boinctui = callPackage ../pkgs/boinctui {}; 7 boinctui = callPackage ../pkgs/boinctui {};
@@ -38,4 +39,8 @@ rec {
38 39
39 composerEnv = callPackage ./composer-env {}; 40 composerEnv = callPackage ./composer-env {};
40 webapps = callPackage ./webapps { inherit mylibs composerEnv; }; 41 webapps = callPackage ./webapps { inherit mylibs composerEnv; };
42
43 private = if builtins.pathExists (./. + "/private")
44 then import ./private { inherit pkgs; }
45 else { webapps = {}; };
41} 46}