From 967541ffcb222072946683c35e67ade371b25fbc Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 12 Sep 2023 18:49:12 +0200 Subject: [PATCH] dev: shell.nix: add emacs 29, 30.0.50, & CI versions And default to 29.1 (the new stable release of Emacs). --- shell.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/shell.nix b/shell.nix index 80ad84095..0f3954172 100644 --- a/shell.nix +++ b/shell.nix @@ -18,11 +18,15 @@ # nix-shell --argstr emacs 27.2 # 27.2 # nix-shell --argstr emacs 28.1 # 28.1 # nix-shell --argstr emacs 28.2 # 28.2 -# nix-shell --argstr emacs head # 29.0.50 +# nix-shell --argstr emacs 29.1 # 29.1 +# nix-shell --argstr emacs head # 30.0.50 # nix-shell --argstr emacs ci-26.3 # 26.3 (barebones; no GUI) # nix-shell --argstr emacs ci-27.1 # 27.1 (barebones; no GUI) # nix-shell --argstr emacs ci-27.2 # 27.2 (barebones; no GUI) -# nix-shell --argstr emacs ci-HEAD # 29.0.50 (barebones; no GUI) +# nix-shell --argstr emacs ci-28.1 # 28.1 (barebones; no GUI) +# nix-shell --argstr emacs ci-28.2 # 28.2 (barebones; no GUI) +# nix-shell --argstr emacs ci-29.1 # 29.1 (barebones; no GUI) +# nix-shell --argstr emacs ci-HEAD # 30.0.50 (barebones; no GUI) { pkgs ? import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/22.05.tar.gz") { @@ -37,10 +41,11 @@ emacs27-1 = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/11264a390b197b80edeffac6f20e582f3ea318bd.tar.gz") {}).emacs; emacs27-2 = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/4c87cb87a2db6b9eb43541c1cf83f2a2f725fa25.tar.gz") {}).emacs; emacs28-1 = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/54e795706d9fa90004ed1274af639a717f04a2aa.tar.gz") {}).emacs; + emacs29-1 = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/c434383f2a4866a7c674019b4cdcbfc55db3c4ab.tar.gz") {}).emacs29; }) ]; } -, emacs ? "28.2" +, emacs ? "29.1" , emacsdir ? "$(pwd)" , doomdir ? "" , doomlocaldir ? "$EMACSDIR/.local" }: @@ -50,12 +55,14 @@ let emacsPkg = (if emacs == "26.3" then pkgs.emacs26 else if emacs == "27.2" then pkgs.emacs27-2 else if emacs == "28.1" then pkgs.emacs28-1 else if emacs == "28.2" then pkgs.emacs + else if emacs == "29.1" then pkgs.emacs29-1 else if emacs == "head" then pkgs.emacsGit else if emacs == "ci-26.3" then pkgs.emacs-26-3 else if emacs == "ci-27.1" then pkgs.emacs-27-1 else if emacs == "ci-27.2" then pkgs.emacs-27-2 else if emacs == "ci-28.1" then pkgs.emacs-28-1 else if emacs == "ci-28.2" then pkgs.emacs-28-2 + else if emacs == "ci-29.1" then pkgs.emacs-29-1 else if emacs == "ci-head" then pkgs.emacs-snapshot else pkgs.emacs); in pkgs.stdenv.mkDerivation {