public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-08-31 09:50:38 +02:00
parent 98640fd482 81760f3235
commit fc74ba8291
364 changed files with 8989 additions and 6877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/cask/default.nix
View File

@@ -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 ];
}