Author: eelco
Date: Mon Aug 2 16:01:55 2010
New Revision: 22880
URL: https://svn.nixos.org/websvn/nix/?rev=22880&sc=1
Log:
Modified:
nixpkgs/trunk/pkgs/applications/science/logic/isabelle/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/science/logic/isabelle/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/science/logic/isabelle/default.nix Mon Aug
2 15:58:03 2010 (r22879)
+++ nixpkgs/trunk/pkgs/applications/science/logic/isabelle/default.nix Mon Aug
2 16:01:55 2010 (r22880)
@@ -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 @@
version = "2009-1";
name = "${pname}${version}";
theories = ["HOL" "FOL" "ZF"];
- proofgeneral = (emacsPackages emacs).proofgeneral;
in
stdenv.mkDerivation {
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 2 15:58:03
2010 (r22879)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 2 16:01:55
2010 (r22880)
@@ -7801,7 +7801,7 @@
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 @@
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 @@
};
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 {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
