diff options
author | Matthew Maurer <maurer@matthewmaurer.org> | 2016-07-19 03:36:34 -0400 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-07-19 09:36:34 +0200 |
commit | a6e3a53229ae8e4e4008feb04eeb91be6852d436 (patch) | |
tree | d038b4b8b99f798b285e83eb8a47db519ea4d4c2 /pkgs/development/ocaml-modules/bitstring | |
parent | a9728c279659ea5f9c2674373dcec4ac2ae615c1 (diff) | |
download | nixlib-a6e3a53229ae8e4e4008feb04eeb91be6852d436.tar nixlib-a6e3a53229ae8e4e4008feb04eeb91be6852d436.tar.gz nixlib-a6e3a53229ae8e4e4008feb04eeb91be6852d436.tar.bz2 nixlib-a6e3a53229ae8e4e4008feb04eeb91be6852d436.tar.lz nixlib-a6e3a53229ae8e4e4008feb04eeb91be6852d436.tar.xz nixlib-a6e3a53229ae8e4e4008feb04eeb91be6852d436.tar.zst nixlib-a6e3a53229ae8e4e4008feb04eeb91be6852d436.zip |
ocaml-bitstring: git -> 2.0.4 (#17002)
Google Code no longer supports git cloning. We could restore this revision by exporting the repository to github and working from there, but barring a request for it, we can just use the released version.
Diffstat (limited to 'pkgs/development/ocaml-modules/bitstring')
-rw-r--r-- | pkgs/development/ocaml-modules/bitstring/camlp4-git.patch | 44 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/bitstring/default.nix | 28 |
2 files changed, 0 insertions, 72 deletions
diff --git a/pkgs/development/ocaml-modules/bitstring/camlp4-git.patch b/pkgs/development/ocaml-modules/bitstring/camlp4-git.patch deleted file mode 100644 index 24d2e362dfac..000000000000 --- a/pkgs/development/ocaml-modules/bitstring/camlp4-git.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index d040f4c..cc1a8f5 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -40,7 +40,7 @@ pkg_extlib = @OCAML_PKG_extlib@ - enable_coverage = @enable_coverage@ - - OCAMLCFLAGS = -g --OCAMLCPACKAGES = -+OCAMLCPACKAGES = -package camlp4 - OCAMLCLIBS = -linkpkg - OCAMLOPTFLAGS = $(OCAMLCFLAGS) - OCAMLOPTPACKAGES = $(OCAMLCPACKAGES) -@@ -110,12 +110,13 @@ bitstring_persistent.cmi: bitstring_persistent.mli - -I +camlp4 -pp camlp4of -c $< - - pa_bitstring.cmo: pa_bitstring.ml bitstring.cma bitstring_persistent.cma -- $(OCAMLFIND) ocamlc bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \ -+ $(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) \ -+ bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \ - -pp camlp4of -c $< -o $@ - - bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma - $(OCAMLFIND) ocamlc -I +camlp4 unix.cma dynlink.cma camlp4lib.cma \ -- $(OCAMLCFLAGS) $(OCAMLCLIBS) \ -+ $(OCAMLCFLAGS) $(OCAMLCLIBS) $(OCAMLCPACKAGES) \ - bitstring.cma bitstring_persistent.cma \ - $< -o $@ - -@@ -158,12 +159,13 @@ tests/test.bmpp: create_test_pattern - - create_test_pattern: create_test_pattern.cmo - $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \ -- unix.cma -I +camlp4 dynlink.cma camlp4lib.cma \ -+ unix.cma -I `ocamlfind query camlp4` dynlink.cma camlp4lib.cma \ - $(OCAMLCLIBS) \ - -I . bitstring.cma bitstring_persistent.cma $< -o $@ - - create_test_pattern.cmo: create_test_pattern.ml - $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \ -+ $(OCAMLCPACKAGES) \ - unix.cma -I +camlp4 \ - -I . -c $< -o $@ - diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix deleted file mode 100644 index 2dc1b515c033..000000000000 --- a/pkgs/development/ocaml-modules/bitstring/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, fetchgit, buildOcaml, time, autoconf, automake}: - -buildOcaml rec { - name = "bitstring"; - version = "f1673f8"; - src = fetchgit { - url = "https://code.google.com/p/bitstring/"; - rev = "f1673f8"; - sha256 = "1lh97qf1b7mq64pxkphr2w91ri5hfwg58cpjb2xd8a453c9jylw4"; - }; - - patches = [ ./camlp4-git.patch ./meta.patch ./srcdir.patch ]; - - buildInputs = [time autoconf automake]; - doCheck = true; - - createFindlibDestdir = true; - hasSharedObjects = true; - - preConfigure = "./bootstrap"; - - meta = with stdenv.lib; { - description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml"; - homepage = http://code.google.com/p/bitstring/; - license = licenses.lgpl21Plus; - maintainers = [ maintainers.maurer ]; - }; -} |