From cc84ac9e84c2e1be9eabd0033437486efb42277c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 2 Aug 2010 16:01:55 +0000
Subject: svn path=/nixpkgs/trunk/; revision=22880

---
 pkgs/applications/science/logic/isabelle/default.nix |  3 +--
 pkgs/top-level/all-packages.nix                      | 11 ++++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix
index 4d8df2f0880..2471aa8b594 100644
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/pkgs/applications/science/logic/isabelle/default.nix
@@ -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 {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index acb3a4c05d5..feafbc1be60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 {
-- 
cgit 1.4.1