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

svn path=/nixpkgs/trunk/; revision=22880

Browse Source
This commit is contained in:
Eelco Dolstra 2010-08-02 16:01:55 +00:00
parent fd268b4852
commit cc84ac9e84
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/science/logic/isabelle/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, nettools, polyml, emacs, emacsPackages }:
{ stdenv, fetchurl, perl, nettools, polyml, proofgeneral }:
# nettools needed for hostname
let
@ -6,7 +6,6 @@ let
version = "2009-1";
name = "${pname}${version}";
theories = ["HOL" "FOL" "ZF"];
proofgeneral = (emacsPackages emacs).proofgeneral;
in
stdenv.mkDerivation {

11
pkgs/top-level/all-packages.nix
View File

@ -7801,7 +7801,7 @@ let
dbusSupport = getPkgConfig "emacs" "dbusSupport" true;
});
emacsPackages = emacs: recurseIntoAttrs (rec {
emacsPackages = emacs: self: let callPackage = newScope self; in rec {
bbdb = import ../applications/editors/emacs-modes/bbdb {
inherit fetchurl stdenv emacs texinfo ctags;
};
@ -7893,10 +7893,10 @@ let
scalaMode = import ../applications/editors/emacs-modes/scala-mode {
inherit fetchsvn stdenv emacs;
};
});
};
emacs22Packages = emacsPackages emacs22;
emacs23Packages = emacsPackages emacs23;
emacs22Packages = emacsPackages emacs22 pkgs.emacs22Packages;
emacs23Packages = emacsPackages emacs23 pkgs.emacs23Packages;
epdfview = import ../applications/misc/epdfview {
inherit stdenv fetchurl pkgconfig poppler;
@ -9714,7 +9714,8 @@ let
};
isabelle = import ../applications/science/logic/isabelle {
inherit (pkgs) stdenv fetchurl nettools perl polyml emacs emacsPackages;
inherit (pkgs) stdenv fetchurl nettools perl polyml;
inherit (pkgs.emacs23Packages) proofgeneral;
};
ssreflect = import ../applications/science/logic/ssreflect {