diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2023-10-04 01:35:06 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2023-10-04 02:11:48 +0200 |
| commit | 1a64deeb894dc95e2645a75771732c6cc53a79ad (patch) | |
| tree | 1b9df4838f894577a09b9b260151756272efeb53 /default.nix | |
| parent | fa25ffd4583cc362075cd5e1b4130f33306103f0 (diff) | |
| download | Nix-1a64deeb894dc95e2645a75771732c6cc53a79ad.tar.gz Nix-1a64deeb894dc95e2645a75771732c6cc53a79ad.tar.zst Nix-1a64deeb894dc95e2645a75771732c6cc53a79ad.zip | |
Squash changes containing private information
There were a lot of changes since the previous commit, but a lot of them
contained personnal information about users. All thos changes got
stashed into a single commit (history is kept in a different place) and
private information was moved in a separate private repository
Diffstat (limited to 'default.nix')
| -rw-r--r-- | default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/default.nix b/default.nix index 1f43cdd..d0bc618 100644 --- a/default.nix +++ b/default.nix | |||
| @@ -1,11 +1,9 @@ | |||
| 1 | { sources ? import ./nix/sources.nix, pkgs ? import sources.nixpkgs {} }: | 1 | {}: |
| 2 | let | 2 | let |
| 3 | mypkgs = pkgs.callPackage ./pkgs {}; | 3 | mypackages = builtins.getFlake "path:${builtins.toString ./flakes/mypackages}"; |
| 4 | in | 4 | in |
| 5 | { | 5 | { |
| 6 | lib = pkgs.callPackage ./lib {}; | 6 | lib = mypackages.mylibs; |
| 7 | modules = import ./modules; | 7 | overlays = mypackages.overlays; |
| 8 | overlays = import ./overlays; | 8 | pkgs = mypackages.packages."${builtins.currentSystem}"; |
| 9 | pkgs = mypkgs; | 9 | } // mypackages.packages."${builtins.currentSystem}" |
| 10 | environments = pkgs.callPackage ./environments {}; | ||
| 11 | } // mypkgs | ||