diff options
author | Aycan iRiCAN <iricanaycan@gmail.com> | 2014-06-21 19:55:26 +0300 |
---|---|---|
committer | Aycan iRiCAN <iricanaycan@gmail.com> | 2014-06-21 19:55:26 +0300 |
commit | a60e9fb33cad30222953aff9b15517abfadfdfdf (patch) | |
tree | 50d126d1d313e9990776ae307d3ded7a00ef6d01 /pkgs/top-level | |
parent | 8fe08c34a4bfb440e4288ec8728ae0910e78e88d (diff) | |
parent | 3b267d77a8fae04fa2cb1bad1da5461448cbcfaa (diff) | |
download | nixlib-a60e9fb33cad30222953aff9b15517abfadfdfdf.tar nixlib-a60e9fb33cad30222953aff9b15517abfadfdfdf.tar.gz nixlib-a60e9fb33cad30222953aff9b15517abfadfdfdf.tar.bz2 nixlib-a60e9fb33cad30222953aff9b15517abfadfdfdf.tar.lz nixlib-a60e9fb33cad30222953aff9b15517abfadfdfdf.tar.xz nixlib-a60e9fb33cad30222953aff9b15517abfadfdfdf.tar.zst nixlib-a60e9fb33cad30222953aff9b15517abfadfdfdf.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ede0521df28..e7ade25cbf4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8383,12 +8383,19 @@ let prologMode = callPackage ../applications/editors/emacs-modes/prolog { }; - proofgeneral = callPackage ../applications/editors/emacs-modes/proofgeneral { + proofgeneral_4_2 = callPackage ../applications/editors/emacs-modes/proofgeneral/4.2.nix { texinfo = texinfo4 ; texLive = pkgs.texLiveAggregationFun { paths = [ pkgs.texLive pkgs.texLiveCMSuper ]; }; }; + proofgeneral_4_3_pre = callPackage ../applications/editors/emacs-modes/proofgeneral/4.3pre.nix { + texinfo = texinfo4 ; + texLive = pkgs.texLiveAggregationFun { + paths = [ pkgs.texLive pkgs.texLiveCMSuper ]; + }; + }; + proofgeneral = self.proofgeneral_4_2; quack = callPackage ../applications/editors/emacs-modes/quack { }; |