Skip to content

Commit c3db6c9

Browse files
committed
refactor: remove some layers of indirection
1 parent 6c931ef commit c3db6c9

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

Diff for: default.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ let
88
sha256 = sourceInfo.narHash;
99
};
1010
flake = (prev.callPackage flake-compat { src = ./inputs; }).defaultNix;
11-
lisp-overlay = import ./lisp-packages-lite.nix { inherit (flake) inputs; };
1211
in
13-
lisp-overlay final prev
12+
import ./lisp-packages-lite.nix { inherit (flake) inputs; pkgs = prev; }

Diff for: lisp-packages-lite.nix

+3-5
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,15 @@
1414

1515
{
1616
inputs
17+
, pkgs
1718
, lisp ? pkgs: pkgs.sbcl
1819
}:
1920

20-
# Return an overlay
21-
_: pkgs:
2221
with {
2322
inherit (pkgs) lib;
2423
};
2524

26-
let
25+
{
2726
lispPackagesLite = lib.recurseIntoAttrs (lib.makeScope pkgs.newScope (self:
2827
with self;
2928
with callPackage ./utils.nix {};
@@ -2274,5 +2273,4 @@ let
22742273

22752274
zpng = callPackage (self: with self; lispify "zpng" [ salza2 ]) {};
22762275
}));
2277-
in
2278-
{ inherit lispPackagesLite; }
2276+
}

0 commit comments

Comments
 (0)