Merge pull request #182 from emacs-twist/use-elisp-helpers-flake

Use elisp-helpers via the flake API

Author: akirak

flake.nix

@@ -1,10 +1,7 @@
 {
   description = "Source-based Emacs Lisp build machinery";
 
-  inputs.elisp-helpers = {
-    url = "github:emacs-twist/elisp-helpers";
-    flake = false;
-  };
+  inputs.elisp-helpers.url = "github:emacs-twist/elisp-helpers";
 
   outputs = {...} @ inputs: {
     # lib is experimental at present, so it may be removed in the future.

lib/default.nix

@@ -1,12 +1,6 @@
 inputs:
 let
-  makeFromElisp =
-    lib:
-    (import inputs.elisp-helpers {
-      pkgs = {
-        inherit lib;
-      };
-    }).fromElisp;
+  makeFromElisp = lib: (inputs.elisp-helpers.lib.makeLib { inherit lib; }).fromElisp;
 
   inherit (builtins)
     readFile

pkgs/build-support/default.nix

@@ -22,9 +22,7 @@
 
   inherit (pkgs) lib;
 
-  elispHelpers = import inputs.elisp-helpers {
-    pkgs = {inherit lib;};
-  };
+  elispHelpers = inputs.elisp-helpers.lib.makeLib { inherit lib; };
 
   inherit (elispHelpers) fromElisp;
 

pkgs/build-support/elisp/flake.lock

@@ -1,9 +1,8 @@
 {
-  inputs.elisp-helpers = {
-    url = "github:emacs-twist/elisp-helpers";
-    flake = false;
-  };
+  inputs.elisp-helpers.url = "github:emacs-twist/elisp-helpers";
 
-  outputs = {...}: {
-  };
+  outputs =
+    { ... }:
+    {
+    };
 }

pkgs/build-support/elisp/flake.nix

@@ -1,9 +1,12 @@
-/* Helpers for testing */
-{pkgs ? import <nixpkgs> {}}: let
-  inherit (builtins) fetchTree fromJSON readFile;
-  elispHelpers = import (fetchTree (fromJSON (readFile ./flake.lock)).nodes.elisp-helpers.locked) {
-    inherit pkgs;
+# Helpers for testing
+{
+  pkgs ? import <nixpkgs> { },
+}:
+let
+  elispHelpers = (builtins.getFlake "github:emacs-twist/elisp-helpers").lib.makeLib {
+    inherit (pkgs) lib;
   };
-in {
+in
+{
   inherit (elispHelpers) fromElisp;
 }