Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provide functions directly from the flake lib toplevel #174

Merged
merged 1 commit into from
Sep 18, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 36 additions & 19 deletions lib/default.nix
Original file line number Diff line number Diff line change
@@ -1,25 +1,42 @@
inputs: {lib}: let
elispHelpers = import inputs.elisp-helpers {
pkgs = {inherit lib;};
};
inputs:
let
makeFromElisp =
lib:
(import inputs.elisp-helpers {
pkgs = {
inherit lib;
};
}).fromElisp;

inherit (elispHelpers) fromElisp;
inherit (builtins)
readFile
split
filter
isString
;
in
{
parseSetup =
{ lib }:
import ../pkgs/build-support/elisp/parseSetup.nix {
inherit lib;
fromElisp = makeFromElisp lib;
};

inherit (builtins) readFile split filter isString;
in {
parseSetup = import ../pkgs/build-support/elisp/parseSetup.nix {
inherit lib fromElisp;
};
parseUsePackages =
{ lib }:
import ../pkgs/build-support/elisp/parseUsePackages.nix {
inherit lib;
fromElisp = makeFromElisp lib;
};

parseUsePackages = import ../pkgs/build-support/elisp/parseUsePackages.nix {
inherit lib fromElisp;
};

emacsBuiltinLibraries = {
stdenv,
ripgrep,
emacs,
} @ args:
emacsBuiltinLibraries =
{
stdenv,
ripgrep,
emacs,
lib,
}@args:
lib.pipe (readFile (import ../pkgs/emacs/builtins.nix args)) [
(split "\n")
(filter (s: isString s && s != ""))