summary refs log tree commit diff
path: root/pkgs/development/tools/cask
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-08-31 09:50:38 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-08-31 09:50:38 +0200
commitfc74ba8291a8a93cba428de6bc2e7c8c7f9330f4 (patch)
tree982675c7719f2060a550e80747dfa49c1a9d6b06 /pkgs/development/tools/cask
parent98640fd48212f8e6552517f667bba1901f5936d4 (diff)
parent81760f32353fa7f309a49fda17d90f43ac1e9a42 (diff)
downloadnixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar
nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.gz
nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.bz2
nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.lz
nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.xz
nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.zst
nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools/cask')
-rw-r--r--pkgs/development/tools/cask/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix
index b245084fe93..8ec2552aeff 100644
--- a/pkgs/development/tools/cask/default.nix
+++ b/pkgs/development/tools/cask/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, emacsPackagesNg }:
+{ stdenv, fetchurl, python, emacsPackages }:
 
 stdenv.mkDerivation rec {
   pname = "cask";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   doCheck = true;
-  buildInputs = with emacsPackagesNg; [
+  buildInputs = with emacsPackages; [
     s f dash ansi ecukes servant ert-runner el-mock
     noflet ert-async shell-split-string git package-build
   ];
@@ -44,5 +44,5 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.flexw ];
   };
 
-  nativeBuildInputs = [ emacsPackagesNg.emacs python ];
+  nativeBuildInputs = [ emacsPackages.emacs python ];
 }