Skip to content

Commit ab6fde4

Browse files
committed
Add a reasonable default package
Among other things, a plain `nix build` will now produce a *single* `result` symlink that incorporates many of the Nixathena packages, one per subdir.
1 parent b9f6fc2 commit ab6fde4

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

default.nix

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
let
1212
athena-pkgs = import ./pkgs { inherit pkgs; };
13+
athena-python = with athena-pkgs; [ python-discuss python-afs python-hesiod locker-support ];
14+
athena-python3 = (pkgs.python3.withPackages (ps: (map (pkg: pkg ps) athena-python)));
1315
in
1416
{
1517
# The `lib`, `modules`, and `overlays` names are special
@@ -22,18 +24,17 @@ in
2224
};
2325

2426
inherit athena-pkgs;
27+
# linkFarmFromDrvs is undocumented, but the source is at
28+
# https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/trivial-builders/default.nix#L578
29+
default = pkgs.linkFarmFromDrvs "nixathena-pkgs" (with athena-pkgs; [ discuss pyhesiodfs remctl athena-python3 ]);
2530
debathena-aclocal = athena-pkgs.debathena-aclocal;
2631
discuss = athena-pkgs.discuss;
2732
python-discuss = athena-pkgs.python-discuss;
2833
python-afs = athena-pkgs.python-afs;
2934
python-hesiod = athena-pkgs.python-hesiod;
3035
pyhesiodfs = athena-pkgs.pyhesiodfs;
3136
remctl = athena-pkgs.remctl;
32-
example-package = pkgs.callPackage ./pkgs/example-package { };
3337
# some-qt5-package = pkgs.libsForQt5.callPackage ./pkgs/some-qt5-package { };
3438
# ...
35-
athena-python3 = (pkgs.python3.withPackages (ps: (map (pkg: pkg ps) [
36-
athena-pkgs.python-discuss
37-
athena-pkgs.python-afs
38-
])));
39+
athena-python3 = athena-python3;
3940
}

0 commit comments

Comments
 (0)