From 6d90ce1c60bca4b815d765ee7a11fe9b5d8ecbef Mon Sep 17 00:00:00 2001 From: Marek Kubica Date: Wed, 21 Aug 2019 15:56:14 +0200 Subject: [PATCH 01/10] Attempt to package augeas --- packages/augeas/augeas.0.6/opam | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 packages/augeas/augeas.0.6/opam diff --git a/packages/augeas/augeas.0.6/opam b/packages/augeas/augeas.0.6/opam new file mode 100644 index 00000000000..1ccdf686eed --- /dev/null +++ b/packages/augeas/augeas.0.6/opam @@ -0,0 +1,27 @@ +opam-version: "2.0" +authors: ["Richard W.M. Jones " "Pino Toscano "] +maintainer: "Marek Kubica " +homepage: "http://augeas.net/" +dev-repo: "git://git.annexia.org/ocaml-augeas.git" +build: [ + ["./configure" "--prefix" prefix] + [make] + [make "install"] +] +depends: [ + "ocamlfind" +] +synopsis: "Bindings to the Augeas configuration editing tool" +description: """Bindings to the Augeas configuration editing tool + +It parses configuration files in their native formats and transforms them into +a tree. Configuration changes are made by manipulating this tree and saving it +back into native config files.""" +url { + src: + "https://people.redhat.com/~rjones/augeas/files/ocaml-augeas-0.6.tar.gz" + checksum: [ + "sha256=8aba99ddacd08768ebeef4a2138361d13b41a30317fce7503140cd86a1307611" + "sha512=e747f5c09d3821b41d98e3f12c8dfe9bb13a69d6ccaaf954f4bb33e8e4d9d62603ae26fe9f93f10b2705872526b1863a1c20e0c8a53858fdf60f8cb8cbf50b7a" + ] +} From 6afd1513149fabf4f865f740c83e8cd76cbb6bcf Mon Sep 17 00:00:00 2001 From: Marek Kubica Date: Wed, 21 Aug 2019 16:23:34 +0200 Subject: [PATCH 02/10] Add depexts for various distributions Thanks to Pino Toscano for figuring out some of the package names. --- packages/augeas/augeas.0.6/opam | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/augeas/augeas.0.6/opam b/packages/augeas/augeas.0.6/opam index 1ccdf686eed..0ae1ac89a48 100644 --- a/packages/augeas/augeas.0.6/opam +++ b/packages/augeas/augeas.0.6/opam @@ -17,6 +17,18 @@ description: """Bindings to the Augeas configuration editing tool It parses configuration files in their native formats and transforms them into a tree. Configuration changes are made by manipulating this tree and saving it back into native config files.""" +depexts: [ + ["libaugeas-dev"] {os-family = "debian"} + ["augeas-devel"] {os-distribution = "centos"} + ["augeas-devel"] {os-distribution = "ol"} + ["augeas-devel"] {os-distribution = "fedora"} + ["augeas-devel"] {os-family = "suse"} + ["libaugeas-devel"] {os-distribution = "mageia"} + ["augeas"] {os = "macos" & os-distribution = "homebrew"} + ["augeas"] {os-distribution = "alpine"} + ["augeas"] {os-distribution = "nixos"} + ["augeas"] {os-distribution = "arch"} +] url { src: "https://people.redhat.com/~rjones/augeas/files/ocaml-augeas-0.6.tar.gz" From e1ea0892a6f4e8fa4955b790a94b6e2b18f3c94d Mon Sep 17 00:00:00 2001 From: Marek Kubica Date: Wed, 21 Aug 2019 16:31:15 +0200 Subject: [PATCH 03/10] Add libxml2 A conf-libxml2 might be handy, actually. --- packages/augeas/augeas.0.6/opam | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/augeas/augeas.0.6/opam b/packages/augeas/augeas.0.6/opam index 0ae1ac89a48..5e94985e292 100644 --- a/packages/augeas/augeas.0.6/opam +++ b/packages/augeas/augeas.0.6/opam @@ -18,16 +18,16 @@ It parses configuration files in their native formats and transforms them into a tree. Configuration changes are made by manipulating this tree and saving it back into native config files.""" depexts: [ - ["libaugeas-dev"] {os-family = "debian"} - ["augeas-devel"] {os-distribution = "centos"} - ["augeas-devel"] {os-distribution = "ol"} - ["augeas-devel"] {os-distribution = "fedora"} - ["augeas-devel"] {os-family = "suse"} - ["libaugeas-devel"] {os-distribution = "mageia"} - ["augeas"] {os = "macos" & os-distribution = "homebrew"} - ["augeas"] {os-distribution = "alpine"} - ["augeas"] {os-distribution = "nixos"} - ["augeas"] {os-distribution = "arch"} + ["libaugeas-dev" "libxml2-dev"] {os-family = "debian"} + ["augeas-devel" "libxml2-devel"] {os-distribution = "centos"} + ["augeas-devel" "libxml2-devel"] {os-distribution = "ol"} + ["augeas-devel" "libxml2-devel"] {os-distribution = "fedora"} + ["augeas-devel" "libxml2-devel"] {os-family = "suse"} + ["libaugeas-devel" "libxml2-devel"] {os-distribution = "mageia"} + ["augeas" "libxml2"] {os = "macos" & os-distribution = "homebrew"} + ["augeas" "libxml2"] {os-distribution = "alpine"} + ["augeas" "libxml2"] {os-distribution = "nixos"} + ["augeas" "libxml2"] {os-distribution = "arch"} ] url { src: From f1e3e9abbbc15f3a1c3c732d1c2312a86ed4976e Mon Sep 17 00:00:00 2001 From: Marek Kubica Date: Wed, 21 Aug 2019 16:33:07 +0200 Subject: [PATCH 04/10] Require pkg-config for build --- packages/augeas/augeas.0.6/opam | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/augeas/augeas.0.6/opam b/packages/augeas/augeas.0.6/opam index 5e94985e292..eaf1204fba3 100644 --- a/packages/augeas/augeas.0.6/opam +++ b/packages/augeas/augeas.0.6/opam @@ -9,6 +9,7 @@ build: [ [make "install"] ] depends: [ + "conf-pkg-config" "ocamlfind" ] synopsis: "Bindings to the Augeas configuration editing tool" From 9dedcc68422ba614ec32324ed27efa56b9efefde Mon Sep 17 00:00:00 2001 From: Marek Kubica Date: Wed, 21 Aug 2019 16:38:44 +0200 Subject: [PATCH 05/10] Fix dependency names on Alpine Linux --- packages/augeas/augeas.0.6/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/augeas/augeas.0.6/opam b/packages/augeas/augeas.0.6/opam index eaf1204fba3..6fed6a547ed 100644 --- a/packages/augeas/augeas.0.6/opam +++ b/packages/augeas/augeas.0.6/opam @@ -26,7 +26,7 @@ depexts: [ ["augeas-devel" "libxml2-devel"] {os-family = "suse"} ["libaugeas-devel" "libxml2-devel"] {os-distribution = "mageia"} ["augeas" "libxml2"] {os = "macos" & os-distribution = "homebrew"} - ["augeas" "libxml2"] {os-distribution = "alpine"} + ["augeas-dev" "libxml2-dev"] {os-distribution = "alpine"} ["augeas" "libxml2"] {os-distribution = "nixos"} ["augeas" "libxml2"] {os-distribution = "arch"} ] From 31c85b3a87840fa2fb6348b9b5a9274022c95c62 Mon Sep 17 00:00:00 2001 From: Marek Kubica Date: Wed, 21 Aug 2019 16:43:24 +0200 Subject: [PATCH 06/10] Remove libxml2 again Should be pulled in as dependency of augeas anyway. --- packages/augeas/augeas.0.6/opam | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/augeas/augeas.0.6/opam b/packages/augeas/augeas.0.6/opam index 6fed6a547ed..15475fc354c 100644 --- a/packages/augeas/augeas.0.6/opam +++ b/packages/augeas/augeas.0.6/opam @@ -19,16 +19,16 @@ It parses configuration files in their native formats and transforms them into a tree. Configuration changes are made by manipulating this tree and saving it back into native config files.""" depexts: [ - ["libaugeas-dev" "libxml2-dev"] {os-family = "debian"} - ["augeas-devel" "libxml2-devel"] {os-distribution = "centos"} - ["augeas-devel" "libxml2-devel"] {os-distribution = "ol"} - ["augeas-devel" "libxml2-devel"] {os-distribution = "fedora"} - ["augeas-devel" "libxml2-devel"] {os-family = "suse"} - ["libaugeas-devel" "libxml2-devel"] {os-distribution = "mageia"} - ["augeas" "libxml2"] {os = "macos" & os-distribution = "homebrew"} - ["augeas-dev" "libxml2-dev"] {os-distribution = "alpine"} - ["augeas" "libxml2"] {os-distribution = "nixos"} - ["augeas" "libxml2"] {os-distribution = "arch"} + ["libaugeas-dev"] {os-family = "debian"} + ["augeas-devel"] {os-distribution = "centos"} + ["augeas-devel"] {os-distribution = "ol"} + ["augeas-devel"] {os-distribution = "fedora"} + ["augeas-devel"] {os-family = "suse"} + ["libaugeas-devel"] {os-distribution = "mageia"} + ["augeas"] {os = "macos" & os-distribution = "homebrew"} + ["augeas-dev"] {os-distribution = "alpine"} + ["augeas"] {os-distribution = "nixos"} + ["augeas"] {os-distribution = "arch"} ] url { src: From 5791782eed789235b7d9acf1dae425e26cb9df50 Mon Sep 17 00:00:00 2001 From: Marek Kubica Date: Wed, 21 Aug 2019 18:18:26 +0200 Subject: [PATCH 07/10] Add bug report email Address supplied by rwmj directly --- packages/augeas/augeas.0.6/opam | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/augeas/augeas.0.6/opam b/packages/augeas/augeas.0.6/opam index 15475fc354c..42d574a2eff 100644 --- a/packages/augeas/augeas.0.6/opam +++ b/packages/augeas/augeas.0.6/opam @@ -3,6 +3,7 @@ authors: ["Richard W.M. Jones " "Pino Toscano " homepage: "http://augeas.net/" dev-repo: "git://git.annexia.org/ocaml-augeas.git" +bug-reports: "augeas-devel@redhat.com" build: [ ["./configure" "--prefix" prefix] [make] From a2cb4744a9cb57d49dcb65425e420b8fecbebbdb Mon Sep 17 00:00:00 2001 From: Marek Kubica Date: Thu, 22 Aug 2019 00:32:56 +0200 Subject: [PATCH 08/10] Make ocamlfind build dependency Thanks @kit-ty-kate Co-Authored-By: Kate --- packages/augeas/augeas.0.6/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/augeas/augeas.0.6/opam b/packages/augeas/augeas.0.6/opam index 42d574a2eff..f58b2f353ca 100644 --- a/packages/augeas/augeas.0.6/opam +++ b/packages/augeas/augeas.0.6/opam @@ -11,7 +11,7 @@ build: [ ] depends: [ "conf-pkg-config" - "ocamlfind" + "ocamlfind" {build} ] synopsis: "Bindings to the Augeas configuration editing tool" description: """Bindings to the Augeas configuration editing tool From 3972152f17fead22506962072859f4df041bcb09 Mon Sep 17 00:00:00 2001 From: Marek Kubica Date: Thu, 22 Aug 2019 00:33:18 +0200 Subject: [PATCH 09/10] Make pkg-config build dependency Thanks @kit-ty-kate Co-Authored-By: Kate --- packages/augeas/augeas.0.6/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/augeas/augeas.0.6/opam b/packages/augeas/augeas.0.6/opam index f58b2f353ca..447eba6dd45 100644 --- a/packages/augeas/augeas.0.6/opam +++ b/packages/augeas/augeas.0.6/opam @@ -10,7 +10,7 @@ build: [ [make "install"] ] depends: [ - "conf-pkg-config" + "conf-pkg-config" {build} "ocamlfind" {build} ] synopsis: "Bindings to the Augeas configuration editing tool" From 081eda7f058e8a1abfba69d27226d71880e68f68 Mon Sep 17 00:00:00 2001 From: Marek Kubica Date: Thu, 22 Aug 2019 00:33:45 +0200 Subject: [PATCH 10/10] Split into build & install Thanks @kit-ty-kate Co-Authored-By: Kate --- packages/augeas/augeas.0.6/opam | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/augeas/augeas.0.6/opam b/packages/augeas/augeas.0.6/opam index 447eba6dd45..a0787beb455 100644 --- a/packages/augeas/augeas.0.6/opam +++ b/packages/augeas/augeas.0.6/opam @@ -7,6 +7,8 @@ bug-reports: "augeas-devel@redhat.com" build: [ ["./configure" "--prefix" prefix] [make] +] +install: [ [make "install"] ] depends: [