diff --git a/shell.nix b/shell.nix index cdab39d27..80ad84095 100644 --- a/shell.nix +++ b/shell.nix @@ -13,54 +13,49 @@ # # With a specific version of Emacs # -# nix-shell --argstr emacs 26 # 26.3 # nix-shell --argstr emacs 26.3 # 26.3 -# nix-shell --argstr emacs 27 # 27.1 # nix-shell --argstr emacs 27.1 # 27.1 # nix-shell --argstr emacs 27.2 # 27.2 -# nix-shell --argstr emacs 28 # 28.0.50 -# nix-shell --argstr emacs gcc # 28.0.50 + native-comp -# nix-shell --argstr emacs pgtk+gcc # 28.0.50 + pgtk + native-comp +# 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 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 # 28.0.50 (barebones; no GUI) +# nix-shell --argstr emacs ci-HEAD # 29.0.50 (barebones; no GUI) { pkgs ? import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/22.05.tar.gz") { overlays = [ # emacs-overlay: provides EmacsGit, EmacsNativeComp, and EmacsPgtkNativeComp - (import (fetchTarball "https://github.com/nix-community/emacs-overlay/archive/ae5528c72a1e1afbbcb7be7e813f4b3598f919ed.tar.gz")) - # nix-emacs-ci: provides CI versions of Emacs 26.3, 27.1, 27.2, 28.1, and snapshot + (import (fetchTarball "https://github.com/nix-community/emacs-overlay/archive/88e410d7f1ddef554b40f66755626e5c883487d9.tar.gz")) + # nix-emacs-ci: provides CI versions of Emacs 26.3, 27.1, 27.2, 28.1, 28.2, and snapshot (_: _: (import (fetchTarball "https://github.com/purcell/nix-emacs-ci/archive/master.tar.gz"))) - # emacs{26,27-{1,2}} + # emacs{26,27-{1,2},28-1} (_: _: { emacs26 = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/11264a390b197b80edeffac6f20e582f3ea318bd.tar.gz") {}).emacs26; 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; }) ]; } -, emacs ? "28" +, emacs ? "28.2" , emacsdir ? "$(pwd)" , doomdir ? "" , doomlocaldir ? "$EMACSDIR/.local" }: -let emacsPkg = (if emacs == "26" then pkgs.emacs26 - else if emacs == "26.3" then pkgs.emacs26 - else if emacs == "27" then pkgs.emacs27-2 - else if emacs == "27.1" then pkgs.emacs27 +let emacsPkg = (if emacs == "26.3" then pkgs.emacs26 + else if emacs == "27.1" then pkgs.emacs27-1 else if emacs == "27.2" then pkgs.emacs27-2 - else if emacs == "28" then pkgs.emacs - else if emacs == "28.1" then pkgs.emacs + else if emacs == "28.1" then pkgs.emacs28-1 + else if emacs == "28.2" then pkgs.emacs else if emacs == "head" then pkgs.emacsGit - else if emacs == "gcc" then pkgs.emacsNativeComp - else if emacs == "pgtk+gcc" then pkgs.emacsPgtkNativeComp 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" then pkgs.emacs-28-1 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-head" then pkgs.emacs-snapshot else pkgs.emacs); in pkgs.stdenv.mkDerivation {