Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-re for openSUSE:Factory
checked in at 2022-05-05 23:07:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-re (Old)
and /work/SRC/openSUSE:Factory/.ocaml-re.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-re"
Thu May 5 23:07:20 2022 rev:7 rq:975187 version:1.10.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-re/ocaml-re.changes 2021-09-29
20:19:42.159057048 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-re.new.1538/ocaml-re.changes
2022-05-05 23:08:01.553679572 +0200
@@ -1,0 +2,6 @@
+Wed Apr 27 12:34:56 UTC 2022 - oher...@suse.de
+
+- Update to version 1.10.4
+ see included CHANGES for details
+
+-------------------------------------------------------------------
Old:
----
ocaml-re-1.10.3.tar.xz
New:
----
ocaml-re-1.10.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml-re.spec ++++++
--- /var/tmp/diff_new_pack.XulxVj/_old 2022-05-05 23:08:02.053680196 +0200
+++ /var/tmp/diff_new_pack.XulxVj/_new 2022-05-05 23:08:02.061680206 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-re
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,32 +16,32 @@
#
-%define build_flavor @BUILD_FLAVOR@%{nil}
-%if "%{build_flavor}" == "testsuite"
+%define build_flavor @BUILD_FLAVOR@%nil
+%if "%build_flavor" == "testsuite"
%define nsuffix -testsuite
%else
-%define nsuffix %{nil}
+%define nsuffix %nil
%endif
%define pkg ocaml-re
-Name: %{pkg}%{nsuffix}
-Version: 1.10.3
+Name: %pkg%nsuffix
+Version: 1.10.4
Release: 0
%{?ocaml_preserve_bytecode}
Summary: Pure OCaml regular expressions
License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception
Group: Development/Languages/OCaml
URL: https://opam.ocaml.org/packages/re
-Source0: %{pkg}-%{version}.tar.xz
+Source0: %pkg-%version.tar.xz
BuildRequires: ocaml
BuildRequires: ocaml-dune >= 2.0
-BuildRequires: ocaml-rpm-macros >= 20210911
+BuildRequires: ocaml-rpm-macros >= 20220409
%if 1
BuildRequires: ocamlfind(seq)
BuildRequires: ocamlfind(str)
%endif
-%if "%{build_flavor}" == "testsuite"
+%if "%build_flavor" == "testsuite"
BuildRequires: ocamlfind(oUnit)
BuildRequires: ocamlfind(re)
%endif
@@ -50,39 +50,39 @@
Pure OCaml regular expressions, with support for Perl and POSIX-style strings.
%package devel
-Summary: Development files for %{name}
+Summary: Development files for %name
Group: Development/Languages/OCaml
-Requires: %{name} = %{version}-%{release}
+Requires: %name = %version-%release
%description devel
-The %{name}-devel package contains libraries and signature files for
-developing applications that use %{name}.
+The %name-devel package contains libraries and signature files for
+developing applications that use %name.
%prep
-%autosetup -p1 -n %{pkg}-%{version}
+%autosetup -p1 -n %pkg-%version
%build
dune_release_pkgs='re'
%ocaml_dune_setup
-%if "%{build_flavor}" == ""
+%if "%build_flavor" == ""
%ocaml_dune_build
%endif
%install
-%if "%{build_flavor}" == ""
+%if "%build_flavor" == ""
%ocaml_dune_install
%ocaml_create_file_list
%endif
-%if "%{build_flavor}" == "testsuite"
+%if "%build_flavor" == "testsuite"
%check
%ocaml_dune_test
%endif
-%if "%{build_flavor}" == ""
-%files -f %{name}.files
+%if "%build_flavor" == ""
+%files -f %name.files
-%files devel -f %{name}.files.devel
+%files devel -f %name.files.devel
%endif
++++++ _service ++++++
--- /var/tmp/diff_new_pack.XulxVj/_old 2022-05-05 23:08:02.113680271 +0200
+++ /var/tmp/diff_new_pack.XulxVj/_new 2022-05-05 23:08:02.117680275 +0200
@@ -1,7 +1,7 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="filename">ocaml-re</param>
- <param name="revision">c5d5df80e128c3d7646b7d8b1322012c5fcc35f3</param>
+ <param name="revision">e9a4cecb8294c1839db18b1d0c30e755ec85ed5e</param>
<param name="scm">git</param>
<param name="submodules">disable</param>
<param name="url">https://github.com/ocaml/ocaml-re.git</param>
++++++ ocaml-re-1.10.3.tar.xz -> ocaml-re-1.10.4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-re-1.10.3/.travis.yml
new/ocaml-re-1.10.4/.travis.yml
--- old/ocaml-re-1.10.3/.travis.yml 2021-09-13 21:26:15.000000000 +0200
+++ new/ocaml-re-1.10.4/.travis.yml 2022-04-27 20:13:14.000000000 +0200
@@ -6,7 +6,6 @@
global:
- PACKAGE=re
matrix:
- - OCAML_VERSION=4.02
- OCAML_VERSION=4.03
- OCAML_VERSION=4.04
- OCAML_VERSION=4.05
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-re-1.10.3/CHANGES.md
new/ocaml-re-1.10.4/CHANGES.md
--- old/ocaml-re-1.10.3/CHANGES.md 2021-09-13 21:26:15.000000000 +0200
+++ new/ocaml-re-1.10.4/CHANGES.md 2022-04-27 20:13:14.000000000 +0200
@@ -1,3 +1,8 @@
+1.10.4 (27-Apr-2022)
+--------------------
+
+* Improve handling of word boundaries (#179)
+
1.10.3 (13-Sep-2021)
--------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-re-1.10.3/dune-workspace.dev
new/ocaml-re-1.10.4/dune-workspace.dev
--- old/ocaml-re-1.10.3/dune-workspace.dev 2021-09-13 21:26:15.000000000
+0200
+++ new/ocaml-re-1.10.4/dune-workspace.dev 2022-04-27 20:13:14.000000000
+0200
@@ -1,6 +1,5 @@
(lang dune 1.0)
;; This file is used by `make all-supported-ocaml-versions`
-(context (opam (switch 4.02.3)))
(context (opam (switch 4.03.0)))
(context (opam (switch 4.04.2)))
(context (opam (switch 4.05.0)))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-re-1.10.3/lib/core.ml
new/ocaml-re-1.10.4/lib/core.ml
--- old/ocaml-re-1.10.3/lib/core.ml 2021-09-13 21:26:15.000000000 +0200
+++ new/ocaml-re-1.10.4/lib/core.ml 2022-04-27 20:13:14.000000000 +0200
@@ -631,11 +631,11 @@
| Beg_of_word ->
(A.seq ids `First
(A.after ids Category.(inexistant ++ not_letter))
- (A.before ids Category.(inexistant ++ letter)),
+ (A.before ids Category.letter),
kind)
| End_of_word ->
(A.seq ids `First
- (A.after ids Category.(inexistant ++ letter))
+ (A.after ids Category.letter)
(A.before ids Category.(inexistant ++ not_letter)),
kind)
| Not_bound ->
@@ -643,8 +643,8 @@
(A.after ids Category.letter)
(A.before ids Category.letter);
A.seq ids `First
- (A.after ids Category.letter)
- (A.before ids Category.letter)],
+ (A.after ids Category.(inexistant ++ not_letter))
+ (A.before ids Category.(inexistant ++ not_letter))],
kind)
| Beg_of_str ->
(A.after ids Category.inexistant, kind)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-re-1.10.3/lib/core.mli
new/ocaml-re-1.10.4/lib/core.mli
--- old/ocaml-re-1.10.3/lib/core.mli 2021-09-13 21:26:15.000000000 +0200
+++ new/ocaml-re-1.10.4/lib/core.mli 2022-04-27 20:13:14.000000000 +0200
@@ -86,23 +86,49 @@
possible, the one specified by the match semantics described below is
returned.
+ {5 Examples:}
+ {[
+ # let regex = Re.compile Re.(seq [str "//"; rep print ]);;
+ val regex : re = <abstr>
+
+ # Re.exec regex "// a C comment";;
+ - : Re.substrings = <abstr>
+
+ # Re.exec regex "# a C comment?";;
+ Exception: Not_found
+
+ # Re.exec ~pos:1 regex "// a C comment";;
+ Exception: Not_found
+ ]}
+
+
@param pos optional beginning of the string (default 0)
@param len length of the substring of [str] that can be matched (default
[-1],
meaning to the end of the string)
@raise Not_found if the regular expression can't be found in [str]
-
- Note that [exec re str ~pos ~len] is not equivalent to [exec re
- (String.sub str pos len)]. This transformation changes the meaning
- of some constructs ({!bos}, {!eos}, {!whole_string} and {!leol}), and
- zero-width assertions like {!bow} or {!eow} look at characters before
- [pos] and after [pos + len].
*)
val exec_opt :
?pos:int -> (** Default: 0 *)
?len:int -> (** Default: -1 (until end of string) *)
re -> string -> Group.t option
-(** Similar to {!exec}, but returns an option instead of using an exception. *)
+(** Similar to {!exec}, but returns an option instead of using an exception.
+
+ {5 Examples:}
+ {[
+ # let regex = Re.compile Re.(seq [str "//"; rep print ]);;
+ val regex : re = <abstr>
+
+ # Re.exec_opt regex "// a C comment";;
+ - : Re.substrings option = Some <abstr>
+
+ # Re.exec_opt regex "# a C comment?";;
+ - : Re.substrings option = None
+
+ # Re.exec_opt ~pos:1 regex "// a C comment";;
+ - : Re.substrings option = None
+ ]}
+*)
val execp :
?pos:int -> (** Default: 0 *)
@@ -111,6 +137,18 @@
(** Similar to {!exec}, but returns [true] if the expression matches,
and [false] if it doesn't. This function is more efficient than
calling {!exec} or {!exec_opt} and ignoring the returned group.
+
+ {5 Examples:}
+ {[
+ # let regex = Re.compile Re.(seq [str "//"; rep print ]);;
+ val regex : re = <abstr>
+
+ # Re.execp regex "// a C comment";;
+ - : bool = true
+
+ # Re.execp ~pos:1 regex "// a C comment";;
+ - : bool = false
+ ]}
*)
val exec_partial :
@@ -119,7 +157,26 @@
re -> string -> [ `Full | `Partial | `Mismatch ]
(** More detailed version of {!exec_p}. [`Full] is equivalent to [true],
while [`Mismatch] and [`Partial] are equivalent to [false], but [`Partial]
- indicates the input string could be extended to create a match. *)
+ indicates the input string could be extended to create a match.
+
+ {5 Examples:}
+ {[
+ # let regex = Re.compile Re.(seq [bos; str "// a C comment"]);;
+ val regex : re = <abstr>
+
+ # Re.exec_partial regex "// a C comment here.";;
+ - : [ `Full | `Mismatch | `Partial ] = `Full
+
+ # Re.exec_partial regex "// a C comment";;
+ - : [ `Full | `Mismatch | `Partial ] = `Partial
+
+ # Re.exec_partial regex "//";;
+ - : [ `Full | `Mismatch | `Partial ] = `Partial
+
+ # Re.exec_partial regex "# a C comment?";;
+ - : [ `Full | `Mismatch | `Partial ] = `Mismatch
+ ]}
+*)
(** Marks *)
module Mark : sig
@@ -155,9 +212,11 @@
val all_gen : ?pos:int -> ?len:int -> re -> string -> Group.t gen
[@@ocaml.deprecated "Use Seq.all"]
+(** @deprecated Use {!module-Seq.all} instead. *)
val all_seq : ?pos:int -> ?len:int -> re -> string -> Group.t Seq.t
[@@ocaml.deprecated "Use Seq.all"]
+(** @deprecated Use {!module-Seq.all} instead. *)
val matches : ?pos:int -> ?len:int -> re -> string -> string list
(** Same as {!all}, but extracts the matched substring rather than returning
@@ -165,31 +224,71 @@
val matches_gen : ?pos:int -> ?len:int -> re -> string -> string gen
[@@ocaml.deprecated "Use Seq.matches"]
+(** @deprecated Use {!module-Seq.matches} instead. *)
val matches_seq : ?pos:int -> ?len:int -> re -> string -> string Seq.t
[@@ocaml.deprecated "Use Seq.matches"]
+(** @deprecated Use {!module-Seq.matches} instead. *)
val split : ?pos:int -> ?len:int -> re -> string -> string list
(** [split re s] splits [s] into chunks separated by [re]. It yields the chunks
- themselves, not the separator. For instance this can be used with a
- whitespace-matching re such as ["[\t ]+"]. *)
+ themselves, not the separator.
+
+ {5 Examples:}
+ {[
+ # let regex = Re.compile (Re.char ',');;
+ val regex : re = <abstr>
+
+ # Re.split regex "Re,Ocaml,Jerome Vouillon";;
+ - : string list = ["Re"; "Ocaml"; "Jerome Vouillon"]
+
+ # Re.split regex "No commas in this sentence.";;
+ - : string list = ["No commas in this sentence."]
+
+ # Re.split ~pos:3 regex "1,2,3,4. Commas go brrr.";;
+ - : string list = ["3"; "4. Commas go brrr."]
+ ]}
+*)
val split_gen : ?pos:int -> ?len:int -> re -> string -> string gen
[@@ocaml.deprecated "Use Seq.split"]
+(** @deprecated Use {!module-Seq.split} instead. *)
val split_seq : ?pos:int -> ?len:int -> re -> string -> string Seq.t
[@@ocaml.deprecated "Use Seq.split"]
+(** @deprecated Use {!module-Seq.split} instead. *)
val split_full : ?pos:int -> ?len:int -> re -> string -> split_token list
(** [split re s] splits [s] into chunks separated by [re]. It yields the chunks
along with the separators. For instance this can be used with a
- whitespace-matching re such as ["[\t ]+"]. *)
+ whitespace-matching re such as ["[\t ]+"].
+
+ {5 Examples:}
+ {[
+ # let regex = Re.compile (Re.char ',');;
+ val regex : re = <abstr>
+
+ # Re.split_full regex "Re,Ocaml,Jerome Vouillon";;
+ - : Re.split_token list =
+ [`Text "Re"; `Delim <abstr>; `Text "Ocaml"; `Delim <abstr>;
+ `Text "Jerome Vouillon"]
+
+ # Re.split_full regex "No commas in this sentence.";;
+ - : Re.split_token list = [`Text "No commas in this sentence."]
+
+ # Re.split_full ~pos:3 regex "1,2,3,4. Commas go brrr.";;
+ - : Re.split_token list =
+ [`Delim <abstr>; `Text "3"; `Delim <abstr>; `Text "4. Commas go
brrr."]
+ ]}
+*)
val split_full_gen : ?pos:int -> ?len:int -> re -> string -> split_token gen
[@@ocaml.deprecated "Use Seq.split_full"]
+(** @deprecated Use {!module-Seq.split_full} instead. *)
val split_full_seq : ?pos:int -> ?len:int -> re -> string -> split_token Seq.t
[@@ocaml.deprecated "Use Seq.split_full"]
+(** @deprecated Use {!module-Seq.split_full} instead. *)
module Seq : sig
val all :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-re-1.10.3/lib/fmt.ml
new/ocaml-re-1.10.4/lib/fmt.ml
--- old/ocaml-re-1.10.3/lib/fmt.ml 2021-09-13 21:26:15.000000000 +0200
+++ new/ocaml-re-1.10.4/lib/fmt.ml 2022-04-27 20:13:14.000000000 +0200
@@ -4,19 +4,7 @@
type 'a t = Format.formatter -> 'a -> unit
-(* Only in the stdlib since 4.02, so we copy. *)
-let rec list ?(pp_sep = pp_print_cut) pp ppf = function
- | [] -> ()
- | [v] -> pp ppf v
- | v :: vs ->
- pp ppf v;
- pp_sep ppf ();
- list ~pp_sep pp ppf vs
-
-(* want this name to make sure we don't use pp_print_list from stdlib
- accidentally *)
-let pp_print_list = list
-
+let list = pp_print_list
let str = pp_print_string
let sexp fmt s pp x = fprintf fmt "@[<3>(%s@ %a)@]" s pp x
let pair pp1 pp2 fmt (v1,v2) =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-re-1.10.3/lib_test/test_easy.ml
new/ocaml-re-1.10.4/lib_test/test_easy.ml
--- old/ocaml-re-1.10.3/lib_test/test_easy.ml 2021-09-13 21:26:15.000000000
+0200
+++ new/ocaml-re-1.10.4/lib_test/test_easy.ml 2022-04-27 20:13:14.000000000
+0200
@@ -2,16 +2,6 @@
open OUnit
-module String = struct
- [@@@ocaml.warning "-32-3"]
- let capitalize_ascii = String.capitalize
- let uncapitalize_ascii = String.uncapitalize
- let uppercase_ascii = String.uppercase
- let lowercase_ascii = String.lowercase
-
- include String
-end
-
let pp_str x = x
let quote = Printf.sprintf "'%s'"
let pp_list l =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-re-1.10.3/lib_test/test_re.ml
new/ocaml-re-1.10.4/lib_test/test_re.ml
--- old/ocaml-re-1.10.3/lib_test/test_re.ml 2021-09-13 21:26:15.000000000
+0200
+++ new/ocaml-re-1.10.4/lib_test/test_re.ml 2022-04-27 20:13:14.000000000
+0200
@@ -176,12 +176,16 @@
re_match (seq [bow; char 'a']) "a" [|(0,1)|];
re_match (seq [bow; char 'a']) "bb aa" [|(3,4)|];
re_fail (seq [bow; char 'a']) "ba ba";
+ re_fail bow ";";
+ re_fail bow "";
);
expect_pass "eow" (fun () ->
re_match (seq [char 'a'; eow]) "a" [|(0,1)|];
re_match (seq [char 'a'; eow]) "bb aa" [|(4,5)|];
re_fail (seq [char 'a'; eow]) "ab ab";
+ re_fail eow ";";
+ re_fail eow "";
);
expect_pass "bos" (fun () ->
@@ -222,10 +226,13 @@
re_match (word (str "aa")) "aa" [|(0,2)|];
re_match (word (str "aa")) "bb aa" [|(3,5)|];
re_fail (word (str "aa")) "aaa";
+ re_fail (word (str "")) "";
);
expect_pass "not_boundary" (fun () ->
re_match (seq [not_boundary; char 'b'; not_boundary]) "abc" [|(1,2)|];
+ re_match (seq [char ';'; not_boundary; char ';']) ";;" [|(0,2)|];
+ re_match (seq [not_boundary; char ';'; not_boundary]) ";" [|(0,1)|];
re_fail (seq [not_boundary; char 'a']) "abc";
re_fail (seq [char 'c'; not_boundary]) "abc";
);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-re-1.10.3/nix/default.nix
new/ocaml-re-1.10.4/nix/default.nix
--- old/ocaml-re-1.10.3/nix/default.nix 2021-09-13 21:26:15.000000000 +0200
+++ new/ocaml-re-1.10.4/nix/default.nix 2022-04-27 20:13:14.000000000 +0200
@@ -3,7 +3,7 @@
let
strings = pkgs.lib.strings;
args = {
- inherit (pkgs.ocaml-ng.ocamlPackages_4_12) ocaml;
+ inherit (pkgs.ocaml-ng.ocamlPackages_4_13) ocaml;
selection = ./opam-selection.nix;
src = builtins.filterSource (path: type:
let name = baseNameOf path;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-re-1.10.3/nix/opam-selection.nix
new/ocaml-re-1.10.4/nix/opam-selection.nix
--- old/ocaml-re-1.10.3/nix/opam-selection.nix 2021-09-13 21:26:15.000000000
+0200
+++ new/ocaml-re-1.10.4/nix/opam-selection.nix 2022-04-27 20:13:14.000000000
+0200
@@ -4,6 +4,7 @@
let
lib = self.lib;
pkgs = self.pkgs;
+ selection = self.selection;
repoPath = self.repoPath;
repos =
{
@@ -13,245 +14,232 @@
{
owner = "ocaml";
repo = "opam-repository";
- rev = "5c5a526ec9be1fdb631ef4104fad367ba8939bf3";
- sha256 = "1d8y2dn64814im6lmg3nvaqjd2rdjkwai3lsvlp4nggy324rk58c";
+ rev = "f860491af481cf9d85d9afe006b0463339be2dea";
+ sha256 = "060awz2cbpbb7pmqhn27bvg8cq2arrvdrfzvrqnrvxkc7qsic8wf";
};
src = (pkgs.fetchFromGitHub) fetch;
};
};
- selection = self.selection;
in
{
format-version = 4;
- ocaml-version = "4.12.0";
- repos = repos;
+ inherit repos;
+ ocaml-version = "4.13.1";
selection =
{
base-bytes =
{
- opamInputs =
- {
- ocaml = selection.ocaml;
- ocamlfind = selection.ocamlfind;
+ pname = "base-bytes";
+ version = "base";
+ src = null;
+ opamInputs = {
+ inherit (selection) ocamlfind ocaml;
};
opamSrc = repoPath (repos.opam-repository.src)
{
- hash = "sha256:0a68lmbf68jgm1i3b59j2sc3ha9yhv4678f9mfwwvczw88prq7l3";
package = "packages/base-bytes/base-bytes.base";
+ hash = "sha256:0a68lmbf68jgm1i3b59j2sc3ha9yhv4678f9mfwwvczw88prq7l3";
};
- pname = "base-bytes";
- src = null;
- version = "base";
};
base-threads =
{
+ pname = "base-threads";
+ version = "base";
+ src = null;
opamInputs = {
};
opamSrc = repoPath (repos.opam-repository.src)
{
- hash = "sha256:1c4bpyh61ampjgk5yh3inrgcpf1z1xv0pshn54ycmpn4dyzv0p2x";
package = "packages/base-threads/base-threads.base";
+ hash = "sha256:1c4bpyh61ampjgk5yh3inrgcpf1z1xv0pshn54ycmpn4dyzv0p2x";
};
- pname = "base-threads";
- src = null;
- version = "base";
};
base-unix =
{
+ pname = "base-unix";
+ version = "base";
+ src = null;
opamInputs = {
};
opamSrc = repoPath (repos.opam-repository.src)
{
- hash = "sha256:0mpsvb7684g723ylngryh15aqxg3blb7hgmq2fsqjyppr36iyzwg";
package = "packages/base-unix/base-unix.base";
+ hash = "sha256:0mpsvb7684g723ylngryh15aqxg3blb7hgmq2fsqjyppr36iyzwg";
};
- pname = "base-unix";
- src = null;
- version = "base";
};
dune =
{
+ pname = "dune";
+ version = "2.9.3";
+ src = pkgs.fetchurl
+ {
+ url =
"https://github.com/ocaml/dune/releases/download/2.9.3/dune-site-2.9.3.tbz";;
+ sha256 = "1ml8bxym8sdfz25bx947al7cvsi2zg5lcv7x9w6xb01cmdryqr9y";
+ };
opamInputs =
{
- base-threads = selection.base-threads;
- base-unix = selection.base-unix;
- ocaml = selection.ocaml or null;
+ inherit (selection) base-unix
+ base-threads;
ocamlfind-secondary = selection.ocamlfind-secondary or null;
+ ocaml = selection.ocaml or null;
};
opamSrc = repoPath (repos.opam-repository.src)
{
- hash = "sha256:0014dz25yn6m4b5f0m22jncy26ayq9v8zc7pq9rsg28ja1l4shrk";
- package = "packages/dune/dune.2.9.0";
- };
- pname = "dune";
- src = pkgs.fetchurl
- {
- sha256 = "07m476kgagpd6kzm3jq30yfxqspr2hychah0xfqs14z82zxpq8dv";
- url =
"https://github.com/ocaml/dune/releases/download/2.9.0/dune-2.9.0.tbz";;
+ package = "packages/dune/dune.2.9.3";
+ hash = "sha256:0m4pbbfyhmjw8mb2d0cr2pkypl54g2f098bnwhd2arj21nkdi3l8";
};
- version = "2.9.0";
};
ocaml =
{
+ pname = "ocaml";
+ version = "4.13.1";
+ src = null;
opamInputs =
{
- ocaml-base-compiler = selection.ocaml-base-compiler or null;
- ocaml-config = selection.ocaml-config;
- ocaml-system = selection.ocaml-system or null;
+ inherit (selection)
+ ocaml-config;
ocaml-variants = selection.ocaml-variants or null;
+ ocaml-system = selection.ocaml-system or null;
+ ocaml-base-compiler = selection.ocaml-base-compiler or null;
};
opamSrc = repoPath (repos.opam-repository.src)
{
- hash = "sha256:0xrq7j9zfynk524j69i3and0mqgi32wav751s4cqc1q7pqm47xpc";
- package = "packages/ocaml/ocaml.4.12.0";
+ package = "packages/ocaml/ocaml.4.13.1";
+ hash = "sha256:12aajj2hc636jr6wbv4vba8pmjdndbcvnw7q35gj4agxmrjspziw";
};
- pname = "ocaml";
- src = null;
- version = "4.12.0";
};
ocaml-base-compiler =
{
+ pname = "ocaml-base-compiler";
+ version = "4.13.1";
+ src = pkgs.fetchurl
+ {
+ url = "https://github.com/ocaml/ocaml/archive/4.13.1.tar.gz";;
+ sha256 = "1i7ad8lh5l74wb3yzmhlv529wc75a5sjybzkad7wdl8zrj47jk0r";
+ };
opamInputs = {
};
opamSrc = repoPath (repos.opam-repository.src)
{
- hash = "sha256:0gf3z9qmi976x4iwndfslcim50ickla52x9fp94aqxrgvsy1ypn7";
- package = "packages/ocaml-base-compiler/ocaml-base-compiler.4.12.0";
- };
- pname = "ocaml-base-compiler";
- src = pkgs.fetchurl
- {
- sha256 = "0i37laikik5vwydw1cwygxd8xq2d6n35l20irgrh691njlwpmh5d";
- url = "https://github.com/ocaml/ocaml/archive/4.12.0.tar.gz";;
+ package = "packages/ocaml-base-compiler/ocaml-base-compiler.4.13.1";
+ hash = "sha256:069i5vsndd9lsvdm5wk898nfnc85ww7459nibjg6881ww43w8ck1";
};
- version = "4.12.0";
};
ocaml-config =
{
+ pname = "ocaml-config";
+ version = "2";
+ src = null;
opamInputs =
{
- ocaml-base-compiler = selection.ocaml-base-compiler or null;
- ocaml-system = selection.ocaml-system or null;
ocaml-variants = selection.ocaml-variants or null;
+ ocaml-system = selection.ocaml-system or null;
+ ocaml-base-compiler = selection.ocaml-base-compiler or null;
};
opamSrc = repoPath (repos.opam-repository.src)
{
- hash = "sha256:0h0hgqq9mbywvqygppfdc50gf9ss8a97l4dgsv3hszmzh6gglgrg";
package = "packages/ocaml-config/ocaml-config.2";
+ hash = "sha256:0h0hgqq9mbywvqygppfdc50gf9ss8a97l4dgsv3hszmzh6gglgrg";
};
- pname = "ocaml-config";
- src = null;
- version = "2";
};
ocamlfind =
{
+ pname = "ocamlfind";
+ version = "1.9.3";
+ src = pkgs.fetchurl
+ {
+ url = "http://download.camlcity.org/download/findlib-1.9.3.tar.gz";;
+ sha256 = "0hfcwamcvinmww59b5i4yxbf0kxyzkp5qv3d1c7ybn9q52vgq463";
+ };
opamInputs =
{
+ inherit (selection) ocaml;
graphics = selection.graphics or null;
- ocaml = selection.ocaml;
};
opamSrc = repoPath (repos.opam-repository.src)
{
- hash = "sha256:11avrzm0gdc6mz7dazr8q18ir5429ckc36s2mv0l8722znq8lc3k";
- package = "packages/ocamlfind/ocamlfind.1.9.1";
+ package = "packages/ocamlfind/ocamlfind.1.9.3";
+ hash = "sha256:1wq1lkw3rpgilprlakznsxxf60mcidn3fzi3vjrgjdrnnp9hvh19";
};
- pname = "ocamlfind";
- src = pkgs.fetchurl
- {
- sha256 = "1qhgk25avmz4l4g47g8jvk0k1g9p9d5hbdrwpz2693a8ajyvhhib";
- url = "http://download.camlcity.org/download/findlib-1.9.1.tar.gz";;
- };
- version = "1.9.1";
};
ounit =
{
- opamInputs =
+ pname = "ounit";
+ version = "2.2.5";
+ src = pkgs.fetchurl
{
- ocamlfind = selection.ocamlfind;
- ounit2 = selection.ounit2;
+ url =
"https://github.com/gildor478/ounit/releases/download/v2.2.5/ounit-2.2.5.tbz";;
+ sha256 = "0mdygh7s5giks3iww5xrf5s5hpd38a79ndszc0vnylxfbqmih38v";
};
- opamSrc = repoPath (repos.opam-repository.src)
- {
- hash = "sha256:19yrs98nq81hrdkgb3108a8bhkf8f9l7nm5pvb8f3k014cc3n3x2";
- package = "packages/ounit/ounit.2.2.4";
+ opamInputs = {
+ inherit (selection) ounit2 ocamlfind;
};
- pname = "ounit";
- src = pkgs.fetchurl
+ opamSrc = repoPath (repos.opam-repository.src)
{
- sha256 = "0i9kiqbf2dp12c4qcvbn4abdpdp6h4g5z54ycsh0q8jpv6jnkh5m";
- url =
"https://github.com/gildor478/ounit/releases/download/v2.2.4/ounit-v2.2.4.tbz";;
+ package = "packages/ounit/ounit.2.2.5";
+ hash = "sha256:1xngx19d9xbpnfwsh0xjva7ra6qi8ss186ymhcgk1q8xpfi41f7x";
};
- version = "2.2.4";
};
ounit2 =
{
- opamInputs =
+ pname = "ounit2";
+ version = "2.2.5";
+ src = pkgs.fetchurl
{
- base-bytes = selection.base-bytes;
- base-unix = selection.base-unix;
- dune = selection.dune;
- ocaml = selection.ocaml;
- stdlib-shims = selection.stdlib-shims;
+ url =
"https://github.com/gildor478/ounit/releases/download/v2.2.5/ounit-2.2.5.tbz";;
+ sha256 = "0mdygh7s5giks3iww5xrf5s5hpd38a79ndszc0vnylxfbqmih38v";
};
- opamSrc = repoPath (repos.opam-repository.src)
+ opamInputs =
{
- hash = "sha256:1z5dlin5x6l5s7sbgkirsxgg00pr5l4gq7bdg2287kp4mlm5vgw0";
- package = "packages/ounit2/ounit2.2.2.4";
+ inherit (selection) stdlib-shims ocaml dune base-unix base-bytes;
};
- pname = "ounit2";
- src = pkgs.fetchurl
+ opamSrc = repoPath (repos.opam-repository.src)
{
- sha256 = "0i9kiqbf2dp12c4qcvbn4abdpdp6h4g5z54ycsh0q8jpv6jnkh5m";
- url =
"https://github.com/gildor478/ounit/releases/download/v2.2.4/ounit-v2.2.4.tbz";;
+ package = "packages/ounit2/ounit2.2.2.5";
+ hash = "sha256:0d1bg9z6llzxkp3l1sabbhqahqa4cg81f9l9dxbqdfy3xq057wk2";
};
- version = "2.2.4";
};
re =
{
- opamInputs =
- {
- dune = selection.dune;
- ocaml = selection.ocaml;
- seq = selection.seq;
- };
- opamSrc = "re.opam";
pname = "re";
- src = self.directSrc "re";
version = "development";
+ src = self.directSrc "re";
+ opamInputs = {
+ inherit (selection) seq ocaml dune;
+ };
+ opamSrc = "re.opam";
};
seq =
{
+ pname = "seq";
+ version = "base";
+ src = null;
opamInputs = {
- ocaml = selection.ocaml;
+ inherit (selection) ocaml;
};
opamSrc = repoPath (repos.opam-repository.src)
{
- hash = "sha256:1vm8mk6zm2q3fwnkprl6jib048zr4ysldw0bl74x6wwbxj0vx6k9";
package = "packages/seq/seq.base";
+ hash = "sha256:1vm8mk6zm2q3fwnkprl6jib048zr4ysldw0bl74x6wwbxj0vx6k9";
};
- pname = "seq";
- src = null;
- version = "base";
};
stdlib-shims =
{
- opamInputs =
+ pname = "stdlib-shims";
+ version = "0.3.0";
+ src = pkgs.fetchurl
{
- dune = selection.dune;
- ocaml = selection.ocaml;
+ url =
"https://github.com/ocaml/stdlib-shims/releases/download/0.3.0/stdlib-shims-0.3.0.tbz";;
+ sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs";
+ };
+ opamInputs = {
+ inherit (selection) ocaml dune;
};
opamSrc = repoPath (repos.opam-repository.src)
{
- hash = "sha256:19g9dnaxyh2ajz6pdczdsqzzvsmfrxwx6f613inkr31jw5hrqkiz";
package = "packages/stdlib-shims/stdlib-shims.0.3.0";
+ hash = "sha256:19g9dnaxyh2ajz6pdczdsqzzvsmfrxwx6f613inkr31jw5hrqkiz";
};
- pname = "stdlib-shims";
- src = pkgs.fetchurl
- {
- sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs";
- url =
"https://github.com/ocaml/stdlib-shims/releases/download/0.3.0/stdlib-shims-0.3.0.tbz";;
- };
- version = "0.3.0";
};
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-re-1.10.3/re.opam new/ocaml-re-1.10.4/re.opam
--- old/ocaml-re-1.10.3/re.opam 2021-09-13 21:26:15.000000000 +0200
+++ new/ocaml-re-1.10.4/re.opam 2022-04-27 20:13:14.000000000 +0200
@@ -8,19 +8,19 @@
"Rudi Grinberg"
"Gabriel Radanne"
]
-license: "LGPL-2.0 with OCaml linking exception"
+license: "LGPL-2.0-or-later WITH OCaml-LGPL-linking-exception"
homepage: "https://github.com/ocaml/ocaml-re";
bug-reports: "https://github.com/ocaml/ocaml-re/issues";
dev-repo: "git+https://github.com/ocaml/ocaml-re.git";
build: [
- ["dune" "subst"] {pinned}
+ ["dune" "subst"] {dev}
["dune" "build" "-p" name "-j" jobs]
["dune" "runtest" "-p" name "-j" jobs] {with-test}
]
depends: [
- "ocaml" {>= "4.02"}
+ "ocaml" {>= "4.03"}
"dune" {>= "2.0"}
"ounit" {with-test}
"seq"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-re-1.10.3/shell.nix
new/ocaml-re-1.10.4/shell.nix
--- old/ocaml-re-1.10.3/shell.nix 2021-09-13 21:26:15.000000000 +0200
+++ new/ocaml-re-1.10.4/shell.nix 2022-04-27 20:13:14.000000000 +0200
@@ -8,8 +8,7 @@
pkgs.mkShell {
inputsFrom = [ re ];
buildInputs = (with pkgs; [
- gnumake
- ocamlPackages.ocaml-lsp
+ ocaml-ng.ocamlPackages_4_13.ocaml-lsp
]) ++ (with opam; [
# test
ounit
