summary refs log tree commit diff
diff options
context:
space:
mode:
authorFelix Buehler <account@buehler.rocks>2021-08-16 21:32:45 +0200
committerFelix Buehler <account@buehler.rocks>2021-08-16 21:34:58 +0200
commit829ed287f07b36bba577a83dcaaa0f6ff0e32f90 (patch)
treece5902f69dcac938c46fc7e77d7e5a4768b64a7a
parenta64e6a253b485bc61d00ba525419a826541568f4 (diff)
downloadnixpkgs-829ed287f07b36bba577a83dcaaa0f6ff0e32f90.tar
nixpkgs-829ed287f07b36bba577a83dcaaa0f6ff0e32f90.tar.gz
nixpkgs-829ed287f07b36bba577a83dcaaa0f6ff0e32f90.tar.bz2
nixpkgs-829ed287f07b36bba577a83dcaaa0f6ff0e32f90.tar.lz
nixpkgs-829ed287f07b36bba577a83dcaaa0f6ff0e32f90.tar.xz
nixpkgs-829ed287f07b36bba577a83dcaaa0f6ff0e32f90.tar.zst
nixpkgs-829ed287f07b36bba577a83dcaaa0f6ff0e32f90.zip
elpa-packages: deprecate phases
-rw-r--r--pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix2
-rw-r--r--pkgs/build-support/emacs/elpa.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
index adf7d75ed5f..c708fa56ef7 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
@@ -66,7 +66,7 @@ self: let
         # actually unpack source of ada-mode and wisi
         # which are both needed to compile the tools
         # we need at runtime
-        phases = "unpackPhase " + old.phases; # not a list, interestingly…
+        dontUnpack = false;
         srcs = [
           super.ada-mode.src
           # ada-mode needs a specific version of wisi, check NEWS or ada-mode's
diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix
index 08257ff2542..f7027dc499d 100644
--- a/pkgs/build-support/emacs/elpa.nix
+++ b/pkgs/build-support/emacs/elpa.nix
@@ -21,7 +21,7 @@ in
 
 import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({
 
-  phases = "installPhase fixupPhase distPhase";
+  dontUnpack = true;
 
   installPhase = ''
     runHook preInstall