From 8395ebb77cd0656bc461053fe723be46fc3575ee Mon Sep 17 00:00:00 2001 From: Nathan Rebours Date: Wed, 13 Jan 2021 15:02:38 +0100 Subject: [PATCH 1/4] [new release] opam-monorepo (0.2.1) CHANGES: ### Fixed - Fix `--recurse-opam` option for the monorepo lock phase: correctly perform special directory filtering, add an error message when two versions of the same package opam file exist in the source tree, perform package name filtering before checking for uniqueness (ocamllabs/opam-monorepo#151, @TheLortex) --- .../opam-monorepo/opam-monorepo.0.2.1/opam | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 packages/opam-monorepo/opam-monorepo.0.2.1/opam diff --git a/packages/opam-monorepo/opam-monorepo.0.2.1/opam b/packages/opam-monorepo/opam-monorepo.0.2.1/opam new file mode 100644 index 00000000000..8597d74236f --- /dev/null +++ b/packages/opam-monorepo/opam-monorepo.0.2.1/opam @@ -0,0 +1,47 @@ +opam-version: "2.0" +synopsis: "Assemble and manage fully vendored Dune repositories" +description: """ +The opam monorepo plugin provides a convenient interface to bridge the +opam package manager with having a local copy of all the source +code required to build a project using the dune build tool.""" +maintainer: ["anil@recoil.org"] +authors: [ + "Anil Madhavapeddy" "Nathan Rebours" "Lucas Pluvinage" "Jules Aguillon" +] +license: "ISC" +homepage: "https://github.com/ocamllabs/opam-monorepo" +bug-reports: "https://github.com/ocamllabs/opam-monorepo/issues" +depends: [ + "dune" {>= "2.6"} + "ocaml" {>= "4.08.0" & < "4.12"} +] +dev-repo: "git+https://github.com/ocamllabs/opam-monorepo.git" +build: [ "dune" "build" "-p" name "-j" jobs "@install" "@runtest" {with-test} ] +flags: [ plugin ] +depexts: [ + ["devel/pkgconf"] {os = "openbsd"} + ["pkg-config"] {os-distribution = "cygwinports"} + ["pkg-config"] {os-family = "debian"} + ["pkg-config"] {os = "macos" & os-distribution = "homebrew"} + ["pkgconf"] {os = "freebsd"} + ["pkgconf"] {os-distribution = "alpine"} + ["pkgconf"] {os-distribution = "arch"} + ["pkgconf-pkg-config"] {os-distribution = "centos" & os-version >= "8"} + ["pkgconf-pkg-config"] {os-distribution = "rhel" & os-version >= "8"} + ["pkgconfig"] {os-distribution = "fedora"} + ["pkgconfig"] {os-distribution = "mageia"} + ["pkgconfig"] {os-distribution = "nixos"} + ["pkgconfig"] {os-distribution = "ol"} + ["pkgconfig"] {os = "macos" & os-distribution = "macports"} + ["pkgconfig"] {os-distribution = "centos" & os-version <= "7"} + ["pkgconfig"] {os-distribution = "rhel" & os-version <= "7"} +] +x-commit-hash: "89ecff43af77614a58c11ffc565af9dd26dca555" +url { + src: + "https://github.com/ocamllabs/opam-monorepo/releases/download/0.2.1/opam-monorepo-0.2.1.tbz" + checksum: [ + "sha256=e066eaf0dedcc7733f8d0eb0e53f36f4d07ef55a2cccc0e526e25b23df25b6f8" + "sha512=358815be8d7a73a49eb4bc4e926cd85cec33207a1871bac3d35e3cf76a828c4135a6601fa1af8e423c7c1878b543aebbda7466d227a1e69b4a4a586ea6290679" + ] +} From 46e842828bd8ed68336e09dccca837a1fcee6991 Mon Sep 17 00:00:00 2001 From: Nathan Rebours Date: Wed, 13 Jan 2021 15:12:25 +0100 Subject: [PATCH 2/4] Update opam-monorepo.0.2.0 with missing depexts --- .../opam-monorepo/opam-monorepo.0.2.0/opam | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/packages/opam-monorepo/opam-monorepo.0.2.0/opam b/packages/opam-monorepo/opam-monorepo.0.2.0/opam index fbc116468b3..ead21f8c492 100644 --- a/packages/opam-monorepo/opam-monorepo.0.2.0/opam +++ b/packages/opam-monorepo/opam-monorepo.0.2.0/opam @@ -18,6 +18,24 @@ depends: [ dev-repo: "git+https://github.com/ocamllabs/opam-monorepo.git" build: [ "dune" "build" "-p" name "-j" jobs "@install" "@runtest" {with-test} "@doc" {with-doc} ] flags: [ plugin ] +depexts: [ + ["devel/pkgconf"] {os = "openbsd"} + ["pkg-config"] {os-distribution = "cygwinports"} + ["pkg-config"] {os-family = "debian"} + ["pkg-config"] {os = "macos" & os-distribution = "homebrew"} + ["pkgconf"] {os = "freebsd"} + ["pkgconf"] {os-distribution = "alpine"} + ["pkgconf"] {os-distribution = "arch"} + ["pkgconf-pkg-config"] {os-distribution = "centos" & os-version >= "8"} + ["pkgconf-pkg-config"] {os-distribution = "rhel" & os-version >= "8"} + ["pkgconfig"] {os-distribution = "fedora"} + ["pkgconfig"] {os-distribution = "mageia"} + ["pkgconfig"] {os-distribution = "nixos"} + ["pkgconfig"] {os-distribution = "ol"} + ["pkgconfig"] {os = "macos" & os-distribution = "macports"} + ["pkgconfig"] {os-distribution = "centos" & os-version <= "7"} + ["pkgconfig"] {os-distribution = "rhel" & os-version <= "7"} +] x-commit-hash: "641f6ea8e6ce56f716efb723dd974c653aa96ef6" url { src: From 81611265c29a692f934014a9cf4483188ab17ec0 Mon Sep 17 00:00:00 2001 From: Kate Date: Thu, 14 Jan 2021 14:40:13 +0000 Subject: [PATCH 3/4] opam-monorepo.0.2.0: Avoid duplication by depending on conf-pkg-config --- .../opam-monorepo/opam-monorepo.0.2.0/opam | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/packages/opam-monorepo/opam-monorepo.0.2.0/opam b/packages/opam-monorepo/opam-monorepo.0.2.0/opam index ead21f8c492..c9267176d99 100644 --- a/packages/opam-monorepo/opam-monorepo.0.2.0/opam +++ b/packages/opam-monorepo/opam-monorepo.0.2.0/opam @@ -14,28 +14,11 @@ bug-reports: "https://github.com/ocamllabs/opam-monorepo/issues" depends: [ "dune" {>= "2.6"} "ocaml" {>= "4.08.0" & < "4.12"} + "conf-pkg-config" {build} ] dev-repo: "git+https://github.com/ocamllabs/opam-monorepo.git" build: [ "dune" "build" "-p" name "-j" jobs "@install" "@runtest" {with-test} "@doc" {with-doc} ] flags: [ plugin ] -depexts: [ - ["devel/pkgconf"] {os = "openbsd"} - ["pkg-config"] {os-distribution = "cygwinports"} - ["pkg-config"] {os-family = "debian"} - ["pkg-config"] {os = "macos" & os-distribution = "homebrew"} - ["pkgconf"] {os = "freebsd"} - ["pkgconf"] {os-distribution = "alpine"} - ["pkgconf"] {os-distribution = "arch"} - ["pkgconf-pkg-config"] {os-distribution = "centos" & os-version >= "8"} - ["pkgconf-pkg-config"] {os-distribution = "rhel" & os-version >= "8"} - ["pkgconfig"] {os-distribution = "fedora"} - ["pkgconfig"] {os-distribution = "mageia"} - ["pkgconfig"] {os-distribution = "nixos"} - ["pkgconfig"] {os-distribution = "ol"} - ["pkgconfig"] {os = "macos" & os-distribution = "macports"} - ["pkgconfig"] {os-distribution = "centos" & os-version <= "7"} - ["pkgconfig"] {os-distribution = "rhel" & os-version <= "7"} -] x-commit-hash: "641f6ea8e6ce56f716efb723dd974c653aa96ef6" url { src: From 3816dfe553322bb3328bf4b00d4c8e481ab8d863 Mon Sep 17 00:00:00 2001 From: Kate Date: Thu, 14 Jan 2021 14:40:39 +0000 Subject: [PATCH 4/4] opam-monorepo.0.2.1: Avoid duplication by depending on conf-pkg-config --- .../opam-monorepo/opam-monorepo.0.2.1/opam | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/packages/opam-monorepo/opam-monorepo.0.2.1/opam b/packages/opam-monorepo/opam-monorepo.0.2.1/opam index 8597d74236f..59f118a7915 100644 --- a/packages/opam-monorepo/opam-monorepo.0.2.1/opam +++ b/packages/opam-monorepo/opam-monorepo.0.2.1/opam @@ -14,28 +14,11 @@ bug-reports: "https://github.com/ocamllabs/opam-monorepo/issues" depends: [ "dune" {>= "2.6"} "ocaml" {>= "4.08.0" & < "4.12"} + "conf-pkg-config" {build} ] dev-repo: "git+https://github.com/ocamllabs/opam-monorepo.git" build: [ "dune" "build" "-p" name "-j" jobs "@install" "@runtest" {with-test} ] flags: [ plugin ] -depexts: [ - ["devel/pkgconf"] {os = "openbsd"} - ["pkg-config"] {os-distribution = "cygwinports"} - ["pkg-config"] {os-family = "debian"} - ["pkg-config"] {os = "macos" & os-distribution = "homebrew"} - ["pkgconf"] {os = "freebsd"} - ["pkgconf"] {os-distribution = "alpine"} - ["pkgconf"] {os-distribution = "arch"} - ["pkgconf-pkg-config"] {os-distribution = "centos" & os-version >= "8"} - ["pkgconf-pkg-config"] {os-distribution = "rhel" & os-version >= "8"} - ["pkgconfig"] {os-distribution = "fedora"} - ["pkgconfig"] {os-distribution = "mageia"} - ["pkgconfig"] {os-distribution = "nixos"} - ["pkgconfig"] {os-distribution = "ol"} - ["pkgconfig"] {os = "macos" & os-distribution = "macports"} - ["pkgconfig"] {os-distribution = "centos" & os-version <= "7"} - ["pkgconfig"] {os-distribution = "rhel" & os-version <= "7"} -] x-commit-hash: "89ecff43af77614a58c11ffc565af9dd26dca555" url { src: