diff --git a/default.nix b/default.nix index 185ec7a..f5e1525 100644 --- a/default.nix +++ b/default.nix @@ -104,7 +104,7 @@ let # Stage 2: install dependencies and byte-compile prepared source doomLocal = let - straight-env = pkgs.callPackage (lock "nix-straight.el") { + straight-env = pkgs.callPackage (lock "nix-straight") { emacsPackages = if bundledPackages then let diff --git a/flake.nix b/flake.nix index 34ccbeb..455bea1 100644 --- a/flake.nix +++ b/flake.nix @@ -52,8 +52,8 @@ evil-quick-diff.flake = false; explain-pause-mode.url = "github:lastquestion/explain-pause-mode"; explain-pause-mode.flake = false; - "nix-straight.el".url = "github:vlaci/nix-straight.el/v2.1.0"; - "nix-straight.el".flake = false; + nix-straight.url = "github:vlaci/nix-straight.el/v2.1.0"; + nix-straight.flake = false; nose.url= "github:emacsattic/nose"; nose.flake = false; ob-racket.url = "github:xchrishawk/ob-racket"; @@ -64,10 +64,10 @@ org-yt.flake = false; php-extras.url = "github:arnested/php-extras"; php-extras.flake = false; - "reveal.js".url = "github:hakimel/reveal.js"; - "reveal.js".flake = false; - "rotate-text.el".url = "github:debug-ito/rotate-text.el"; - "rotate-text.el".flake = false; + revealjs.url = "github:hakimel/reveal.js"; + revealjs.flake = false; + rotate-text.url = "github:debug-ito/rotate-text.el"; + rotate-text.flake = false; }; outputs = inputs: { diff --git a/overrides.nix b/overrides.nix index e59f414..293f0f3 100644 --- a/overrides.nix +++ b/overrides.nix @@ -72,8 +72,7 @@ self: super: { }; revealjs = self.straightBuild { - pname = "reveal.js"; - ename = "revealjs"; + pname = "revealjs"; installPhase = '' LISPDIR=$out/share/emacs/site-lisp @@ -84,8 +83,7 @@ self: super: { }; rotate-text = self.straightBuild { - pname = "rotate-text.el"; - ename = "rotate-text"; + pname = "rotate-text"; }; so-long = self.straightBuild {