ngi-nix · ju1m · Feb 5, 2026 · Feb 5, 2026 · Feb 5, 2026 · Feb 5, 2026
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -25,9 +25,7 @@
 
   inputs.nix-filter.url = "github:numtide/nix-filter/3e1fff9";
 
-  # FixMe(maint/upstream): merge this branch upstream
-  #inputs.opam-nix.url = "github:tweag/opam-nix";
-  inputs.opam-nix.url = "github:ju1m/opam-nix/materialize-monorepo";
+  inputs.opam-nix.url = "github:tweag/opam-nix";
   inputs.opam-nix.inputs.nixpkgs.follows = "nixpkgs";
   inputs.opam-nix.inputs.flake-utils.follows = "flake-utils";
   inputs.opam-nix.inputs.opam-repository.follows = "opam-repository";

diff --git a/...e/dnsvizor/monorepo-materialized/hvt.json → ...e/dnsvizor/materialized/hvt/monorepo.json b/...e/dnsvizor/monorepo-materialized/hvt.json → ...e/dnsvizor/materialized/hvt/monorepo.json
diff --git a/...e/dnsvizor/packages-materialized/hvt.json → ...e/dnsvizor/materialized/hvt/packages.json b/...e/dnsvizor/packages-materialized/hvt.json → ...e/dnsvizor/materialized/hvt/packages.json
diff --git a/.../dnsvizor/monorepo-materialized/muen.json → .../dnsvizor/materialized/muen/monorepo.json b/.../dnsvizor/monorepo-materialized/muen.json → .../dnsvizor/materialized/muen/monorepo.json
diff --git a/.../dnsvizor/packages-materialized/muen.json → .../dnsvizor/materialized/muen/packages.json b/.../dnsvizor/packages-materialized/muen.json → .../dnsvizor/materialized/muen/packages.json
diff --git a/...dnsvizor/monorepo-materialized/qubes.json → ...dnsvizor/materialized/qubes/monorepo.json b/...dnsvizor/monorepo-materialized/qubes.json → ...dnsvizor/materialized/qubes/monorepo.json
diff --git a/...dnsvizor/packages-materialized/qubes.json → ...dnsvizor/materialized/qubes/packages.json b/...dnsvizor/packages-materialized/qubes.json → ...dnsvizor/materialized/qubes/packages.json
diff --git a/...e/dnsvizor/monorepo-materialized/spt.json → ...e/dnsvizor/materialized/spt/monorepo.json b/...e/dnsvizor/monorepo-materialized/spt.json → ...e/dnsvizor/materialized/spt/monorepo.json
diff --git a/...e/dnsvizor/packages-materialized/spt.json → ...e/dnsvizor/materialized/spt/packages.json b/...e/dnsvizor/packages-materialized/spt.json → ...e/dnsvizor/materialized/spt/packages.json
diff --git a/.../dnsvizor/monorepo-materialized/unix.json → .../dnsvizor/materialized/unix/monorepo.json b/.../dnsvizor/monorepo-materialized/unix.json → .../dnsvizor/materialized/unix/monorepo.json
diff --git a/.../dnsvizor/packages-materialized/unix.json → .../dnsvizor/materialized/unix/packages.json b/.../dnsvizor/packages-materialized/unix.json → .../dnsvizor/materialized/unix/packages.json
diff --git a/...nsvizor/monorepo-materialized/virtio.json → ...nsvizor/materialized/virtio/monorepo.json b/...nsvizor/monorepo-materialized/virtio.json → ...nsvizor/materialized/virtio/monorepo.json
diff --git a/...nsvizor/packages-materialized/virtio.json → ...nsvizor/materialized/virtio/packages.json b/...nsvizor/packages-materialized/virtio.json → ...nsvizor/materialized/virtio/packages.json
diff --git a/...e/dnsvizor/monorepo-materialized/xen.json → ...e/dnsvizor/materialized/xen/monorepo.json b/...e/dnsvizor/monorepo-materialized/xen.json → ...e/dnsvizor/materialized/xen/monorepo.json
diff --git a/...e/dnsvizor/packages-materialized/xen.json → ...e/dnsvizor/materialized/xen/packages.json b/...e/dnsvizor/packages-materialized/xen.json → ...e/dnsvizor/materialized/xen/packages.json