extra-files are now extra-source

packages/0install/0install.2.10/opam

@@ -31,9 +31,16 @@ Other features include full support for shared libraries (with a SAT solver for
 dependency resolution), sharing between users, and integration with native platform
 package managers. It supports both binary and source packages, and works on Linux,
 Mac OS X, Unix and Windows systems."""
-extra-files: ["0install.install" "md5=db6ee7a35da5d98136e5a56bad08496e"]
 url {
   src:
     "https://downloads.sf.net/project/zero-install/0install/2.10/0install-2.10.tar.bz2"
   checksum: "md5=3db5bca7df2c01f9c74e57b503d9dd39"
 }
+extra-source "0install.install" {
+  src:
+    "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/0install/0install.install"
+  checksum: [
+    "sha256=db9ef395b376617d963fd4c097ebdfe005978f9a3282810f858f89207fa85ab2"
+    "md5=db6ee7a35da5d98136e5a56bad08496e"
+  ]
+}

packages/0install/0install.2.11/opam

@@ -32,9 +32,16 @@ Other features include full support for shared libraries (with a SAT solver for
 dependency resolution), sharing between users, and integration with native platform
 package managers. It supports both binary and source packages, and works on Linux,
 Mac OS X, Unix and Windows systems."""
-extra-files: ["0install.install" "md5=db6ee7a35da5d98136e5a56bad08496e"]
 url {
   src:
     "https://downloads.sf.net/project/zero-install/0install/2.11/0install-2.11.tar.bz2"
   checksum: "md5=1cfe5845bf20fd0c0253c8ca6da7f37e"
 }
+extra-source "0install.install" {
+  src:
+    "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/0install/0install.install"
+  checksum: [
+    "sha256=db9ef395b376617d963fd4c097ebdfe005978f9a3282810f858f89207fa85ab2"
+    "md5=db6ee7a35da5d98136e5a56bad08496e"
+  ]
+}

packages/0install/0install.2.12.1/opam

@@ -33,9 +33,16 @@ Other features include full support for shared libraries (with a SAT solver for
 dependency resolution), sharing between users, and integration with native platform
 package managers. It supports both binary and source packages, and works on Linux,
 Mac OS X, Unix and Windows systems."""
-extra-files: ["0install.install" "md5=db6ee7a35da5d98136e5a56bad08496e"]
 url {
   src:
     "https://downloads.sf.net/project/zero-install/0install/2.12.1/0install-2.12.1.tar.bz2"
   checksum: "md5=e272f9acf4362b613e31c51dcaf5e946"
 }
+extra-source "0install.install" {
+  src:
+    "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/0install/0install.install"
+  checksum: [
+    "sha256=db9ef395b376617d963fd4c097ebdfe005978f9a3282810f858f89207fa85ab2"
+    "md5=db6ee7a35da5d98136e5a56bad08496e"
+  ]
+}

packages/0install/0install.2.12.3/opam

@@ -32,9 +32,16 @@ Other features include full support for shared libraries (with a SAT solver for
 dependency resolution), sharing between users, and integration with native platform
 package managers. It supports both binary and source packages, and works on Linux,
 Mac OS X, Unix and Windows systems."""
-extra-files: ["0install.install" "md5=db6ee7a35da5d98136e5a56bad08496e"]
 url {
   src:
     "https://downloads.sf.net/project/zero-install/0install/2.12.3/0install-2.12.3.tar.bz2"
   checksum: "md5=12d212264699a81e8b07d4410e907633"
 }
+extra-source "0install.install" {
+  src:
+    "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/0install/0install.install"
+  checksum: [
+    "sha256=db9ef395b376617d963fd4c097ebdfe005978f9a3282810f858f89207fa85ab2"
+    "md5=db6ee7a35da5d98136e5a56bad08496e"
+  ]
+}

packages/0install/0install.2.12/opam

@@ -32,8 +32,15 @@ Other features include full support for shared libraries (with a SAT solver for
 dependency resolution), sharing between users, and integration with native platform
 package managers. It supports both binary and source packages, and works on Linux,
 Mac OS X, Unix and Windows systems."""
-extra-files: ["0install.install" "md5=db6ee7a35da5d98136e5a56bad08496e"]
 url {
   src: "https://github.com/0install/0install/archive/v2.12-1.tar.gz"
   checksum: "md5=b314e3964858d56ea8da42816dd5ae87"
 }
+extra-source "0install.install" {
+  src:
+    "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/0install/0install.install"
+  checksum: [
+    "sha256=db9ef395b376617d963fd4c097ebdfe005978f9a3282810f858f89207fa85ab2"
+    "md5=db6ee7a35da5d98136e5a56bad08496e"
+  ]
+}

packages/0install/0install.2.6.2/opam

@@ -29,12 +29,24 @@ Other features include full support for shared libraries (with a SAT solver for
 dependency resolution), sharing between users, and integration with native platform
 package managers. It supports both binary and source packages, and works on Linux,
 Mac OS X, Unix and Windows systems."""
-extra-files: [
-  ["gui_gtk_dir.patch" "md5=0a14e57ca2b2a914a5433b3a2ca2abb1"]
-  ["0install.install" "md5=db6ee7a35da5d98136e5a56bad08496e"]
-]
 url {
   src:
     "https://downloads.sf.net/project/zero-install/0install/2.6.2/0install-2.6.2.tar.bz2"
   checksum: "md5=8931211adbfe984640a029c48f7b992f"
 }
+extra-source "gui_gtk_dir.patch" {
+  src:
+    "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/0install/gui_gtk_dir.patch"
+  checksum: [
+    "sha256=ef4c291794ed4ca7f024c671f48a8aaa2dcd9d12c1ab73829373a7d904e537e1"
+    "md5=0a14e57ca2b2a914a5433b3a2ca2abb1"
+  ]
+}
+extra-source "0install.install" {
+  src:
+    "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/0install/0install.install"
+  checksum: [
+    "sha256=db9ef395b376617d963fd4c097ebdfe005978f9a3282810f858f89207fa85ab2"
+    "md5=db6ee7a35da5d98136e5a56bad08496e"
+  ]
+}

packages/0install/0install.2.8/opam

@@ -29,12 +29,24 @@ Other features include full support for shared libraries (with a SAT solver for
 dependency resolution), sharing between users, and integration with native platform
 package managers. It supports both binary and source packages, and works on Linux,
 Mac OS X, Unix and Windows systems."""
-extra-files: [
-  ["gui_gtk_dir.patch" "md5=0a14e57ca2b2a914a5433b3a2ca2abb1"]
-  ["0install.install" "md5=db6ee7a35da5d98136e5a56bad08496e"]
-]
 url {
   src:
     "https://downloads.sf.net/project/zero-install/0install/2.8/0install-2.8.tar.bz2"
   checksum: "md5=25520678fcb91603a876a3dd2db24dc3"
 }
+extra-source "gui_gtk_dir.patch" {
+  src:
+    "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/0install/gui_gtk_dir.patch"
+  checksum: [
+    "sha256=ef4c291794ed4ca7f024c671f48a8aaa2dcd9d12c1ab73829373a7d904e537e1"
+    "md5=0a14e57ca2b2a914a5433b3a2ca2abb1"
+  ]
+}
+extra-source "0install.install" {
+  src:
+    "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/0install/0install.install"
+  checksum: [
+    "sha256=db9ef395b376617d963fd4c097ebdfe005978f9a3282810f858f89207fa85ab2"
+    "md5=db6ee7a35da5d98136e5a56bad08496e"
+  ]
+}

packages/0install/0install.2.9.1/opam

@@ -31,9 +31,16 @@ Other features include full support for shared libraries (with a SAT solver for
 dependency resolution), sharing between users, and integration with native platform
 package managers. It supports both binary and source packages, and works on Linux,
 Mac OS X, Unix and Windows systems."""
-extra-files: ["0install.install" "md5=db6ee7a35da5d98136e5a56bad08496e"]
 url {
   src:
     "https://downloads.sf.net/project/zero-install/0install/2.9.1/0install-2.9.1.tar.bz2"
   checksum: "md5=37093e67e3ae21a89f3b7fb217941437"
 }
+extra-source "0install.install" {
+  src:
+    "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/0install/0install.install"
+  checksum: [
+    "sha256=db9ef395b376617d963fd4c097ebdfe005978f9a3282810f858f89207fa85ab2"
+    "md5=db6ee7a35da5d98136e5a56bad08496e"
+  ]
+}

packages/CamlGI/CamlGI.0.6/opam

@@ -15,9 +15,16 @@ OCaml. It is written 100% in OCaml so should run on many
 platforms. The library supports multiple simultaneous connections and
 request multiplexing while presenting an easy to use interface."""
 flags: light-uninstall
-extra-files: ["CamlGI.install" "md5=acc08ae06568a4adae93766201b0f98a"]
 url {
   src:
     "http://downloads.sourceforge.net/project/ocaml-cgi/CamlGI/0.6/CamlGI-0.6.tar.gz"
   checksum: "md5=f53aab889a265dcb9ad0e0f7110577a5"
 }
+extra-source "CamlGI.install" {
+  src:
+    "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/CamlGI/CamlGI.install"
+  checksum: [
+    "sha256=32391fdf7dd1311f48534f84711d9c0203712c7e3db4538eb40e59d4161f8154"
+    "md5=acc08ae06568a4adae93766201b0f98a"
+  ]
+}