test: Switch to the flake package of nix-emacs-ci

emacs-twist · Sep 5, 2023 · 9dbdb09 · 9dbdb09
1 parent 19fb57b
commit 9dbdb09
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 14 deletions.
diff --git a/test/flake.lock b/test/flake.lock
diff --git a/test/flake.nix b/test/flake.nix
@@ -5,6 +5,7 @@
   };
 
   inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
     twist.url = "github:emacs-twist/twist.nix";
     home-manager.url = "github:nix-community/home-manager";
@@ -26,13 +27,11 @@
       flake = false;
     };
 
-    emacs-ci = {
-      url = "github:purcell/nix-emacs-ci";
-      flake = false;
-    };
+    emacs-ci.url = "github:purcell/nix-emacs-ci";
   };
 
   outputs = {
+    nixpkgs,
     flake-utils,
     emacs-ci,
     self,
@@ -64,23 +63,27 @@
         ]);
     }
     // flake-utils.lib.eachDefaultSystem (system: let
-      nixpkgs = nixpkgsFor system;
-
       pkgs = import nixpkgs {
         inherit system;
         overlays = [
-          (import (emacs-ci.outPath + "/overlay.nix"))
           # emacs-unstable.overlay
           inputs.twist.overlays.default
         ];
       };
 
       inherit (pkgs) lib;
 
-      emacs = pkgs.callPackage ./twist.nix {inherit inputs;};
+      emacsPackage = emacs-ci.packages.${system}.emacs-snapshot;
+
+      emacs = pkgs.callPackage ./twist.nix {
+        inherit inputs;
+        inherit emacsPackage;
+      };
 
       # Another test path to build the whole derivation (not with --dry-run).
-      emacs-wrapper = pkgs.callPackage ./twist-minimal.nix {};
+      emacs-wrapper = pkgs.callPackage ./twist-minimal.nix {
+        inherit emacsPackage;
+      };
 
       # This is an example of interactive Emacs session.
       # You can start Emacs by running `nix run .#emacs-interactive`.

diff --git a/test/twist-minimal.nix b/test/twist-minimal.nix
@@ -1,9 +1,9 @@
 {
   emacsTwist,
-  emacs-28-2,
+  emacsPackage,
 }:
 emacsTwist {
-  emacsPackage = emacs-28-2.overrideAttrs (_: {version = "20221201.0";});
+  inherit emacsPackage;
   initFiles = [];
   lockDir = ./lock;
   inventories = [];

diff --git a/test/twist.nix b/test/twist.nix
@@ -1,11 +1,11 @@
 {
   emacsTwist,
-  emacs-snapshot,
+  emacsPackage,
   inputs,
 }:
 emacsTwist {
   # Use nix-emacs-ci which is more lightweight than a regular build
-  emacsPackage = emacs-snapshot;
+  inherit emacsPackage;
   # In an actual configuration, you would use this:
   # emacs = pkgs.emacsPgtkGcc.overrideAttrs (_: { version = "29.0.50"; });
   initFiles = [
@@ -16,7 +16,7 @@ emacsTwist {
     {
       type = "elpa";
       path = inputs.gnu-elpa.outPath + "/elpa-packages";
-      core-src = emacs-snapshot.src;
+      core-src = emacsPackage.src;
       auto-sync-only = true;
     }
     {