diff options
| author | Russell O'Connor <roconnor@theorem.ca> | 2012-03-25 21:27:30 +0000 |
|---|---|---|
| committer | Russell O'Connor <roconnor@theorem.ca> | 2012-03-25 21:27:30 +0000 |
| commit | ec5dda12d26c15b0837983260ee2599f421c976b (patch) | |
| tree | 7fa1166e65c632fbe0948121cafe08adc73eb2a5 /pkgs/applications/science/logic | |
| parent | 4bccef4db2a3a7d7b4efcb914fe76d2af8e4557d (diff) | |
| download | nixlib-ec5dda12d26c15b0837983260ee2599f421c976b.tar nixlib-ec5dda12d26c15b0837983260ee2599f421c976b.tar.gz nixlib-ec5dda12d26c15b0837983260ee2599f421c976b.tar.bz2 nixlib-ec5dda12d26c15b0837983260ee2599f421c976b.tar.lz nixlib-ec5dda12d26c15b0837983260ee2599f421c976b.tar.xz nixlib-ec5dda12d26c15b0837983260ee2599f421c976b.tar.zst nixlib-ec5dda12d26c15b0837983260ee2599f421c976b.zip | |
Reparing stable build of Matita.
Also correcting the version and simplifying the prerelease package of Matita. svn path=/nixpkgs/trunk/; revision=33420
Diffstat (limited to 'pkgs/applications/science/logic')
| -rw-r--r-- | pkgs/applications/science/logic/matita/130312.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/matita/130312.patch | 42 |
2 files changed, 2 insertions, 44 deletions
diff --git a/pkgs/applications/science/logic/matita/130312.nix b/pkgs/applications/science/logic/matita/130312.nix index 3501072fbfed..f77e9d34a2a8 100644 --- a/pkgs/applications/science/logic/matita/130312.nix +++ b/pkgs/applications/science/logic/matita/130312.nix @@ -2,7 +2,7 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.9.1pre130312"; + version = "0.99.1pre130312"; pname = "matita"; in @@ -43,7 +43,7 @@ stdenv.mkDerivation { substituteInPlace components/METAS/meta.helm-xml.src --replace "zip" "camlzip" ''; - patches = [ ./configure_130312.patch ./130312.patch ]; + patches = [ ./configure_130312.patch ]; preConfigure = '' # Setup for findlib. diff --git a/pkgs/applications/science/logic/matita/130312.patch b/pkgs/applications/science/logic/matita/130312.patch deleted file mode 100644 index 4596f7fde2e0..000000000000 --- a/pkgs/applications/science/logic/matita/130312.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- matita/components/content_pres/cicNotationParser.ml 2012-03-25 15:47:03.144583445 -0400 -+++ matita/components/content_pres/cicNotationParser.ml 2012-03-25 15:48:30.776209560 -0400 -@@ -209,8 +209,8 @@ - match magic with - | Ast.List0 (_, None) -> Gramext.Slist0 s - | Ast.List1 (_, None) -> Gramext.Slist1 s -- | Ast.List0 (_, Some l) -> Gramext.Slist0sep (s, gram_of_literal l, false) -- | Ast.List1 (_, Some l) -> Gramext.Slist1sep (s, gram_of_literal l, false) -+ | Ast.List0 (_, Some l) -> Gramext.Slist0sep (s, gram_of_literal l) -+ | Ast.List1 (_, Some l) -> Gramext.Slist1sep (s, gram_of_literal l) - | _ -> assert false - in - [ Env (List.map Env.list_declaration p_names), ---- matita/components/grafite_parser/print_grammar.ml 2012-03-25 15:47:03.123583779 -0400 -+++ matita/components/grafite_parser/print_grammar.ml 2012-03-25 15:49:43.900079528 -0400 -@@ -87,7 +87,7 @@ - | Smeta (_, lt, _) -> List.for_all is_symbol_dummy lt - | Snterm e | Snterml (e, _) -> is_entry_dummy e - | Slist1 x | Slist0 x -> is_symbol_dummy x -- | Slist1sep (x,y,false) | Slist0sep (x,y,false) -> is_symbol_dummy x && is_symbol_dummy y -+ | Slist1sep (x,y) | Slist0sep (x,y) -> is_symbol_dummy x && is_symbol_dummy y - | Sopt x -> is_symbol_dummy x - | Sself | Snext -> false - | Stree t -> is_tree_dummy t -@@ -186,7 +186,7 @@ - let todo = visit_symbol symbol todo is_son in - Format.fprintf fmt "@]} @ "; - todo -- | Slist0sep (symbol,sep,false) -> -+ | Slist0sep (symbol,sep) -> - Format.fprintf fmt "[@[<hov2> "; - let todo = visit_symbol symbol todo is_son in - Format.fprintf fmt "{@[<hov2> "; -@@ -200,7 +200,7 @@ - let todo = visit_symbol symbol todo is_son in - Format.fprintf fmt "@]}+ @ "; - todo -- | Slist1sep (symbol,sep,false) -> -+ | Slist1sep (symbol,sep) -> - let todo = visit_symbol symbol todo is_son in - Format.fprintf fmt "{@[<hov2> "; - let todo = visit_symbol sep todo is_son in |