update use of emacs-overlay to newer attribute names

Signed-off-by: Psionik K <[email protected]>
positron-solutions · Oct 24, 2023 · a9c2a37 · a9c2a37
1 parent c1a5d76
commit a9c2a37
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.github/flake.nix b/.github/flake.nix
@@ -44,21 +44,22 @@
       let
 
         # instantaite nixpkgs with the emacs overlay applied.
-        # to explore available attributes, you can instantiate nixpkgs with the emacs overlay in a nix repl:
-        # pkgs = import (builtins.getFlake "nixpkgs") { system = builtins.currentSystem; overlays = [ (builtins.getFlake ("emacs-overlay")).overlay ];}
-        # pkgs.emacs will tab complete
         pkgs = import nixpkgs {
           inherit system;
           overlays = [ emacs-overlay.overlay ];
         };
 
-        # List of Emacsen to generate development shells for
+        # List of Emacsen to generate development shells for.
         emacsPackages = [
-          "emacsUnstable"
-          "emacsGit"
+          "emacs-unstable"
+          "emacs-git"
           "emacs28"
+          "emacs29"
           "emacs"
         ];
+        # To explore available attributes, you can instantiate nixpkgs with the emacs overlay in a nix repl:
+        # pkgs = import (builtins.getFlake "nixpkgs") { system = builtins.currentSystem; overlays = [ (builtins.getFlake ("emacs-overlay")).overlay ];}
+        # pkgs.emacs will tab complete.  pkgs.emacs.version etc describe what's inside.
 
         # let's have a development shell per Emacs!
         devShells = pkgs.lib.genAttrs emacsPackages (emacsPkg:
@@ -113,6 +114,6 @@
         # Augment the devShells with a default so that `nix develop` knows what
         # to do.  Run `nix flake show` to see the results.  Per-system,
         # per-Emacs, we have a development environment avaialble.
-        devShells = devShells // { default = devShells.emacsGit; };
+        devShells = devShells // { default = devShells.emacs-git; };
       });
 }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,7 +41,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        emacsPkg: [ emacs, emacsGit, ]
+        emacsPkg: [ emacs, emacs-git, ]
     runs-on: ${{ matrix.os }}
     # If you update steps, be sure to update the approved actions list in the
     # manual and in your repositories!