From bf82af4a1b5bbaf2eaec25efae4539c80a7e1c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Kr=C3=BCger?= <ole.kruger@trili.tech>
Date: Thu, 15 May 2025 16:20:35 +0100
Subject: [PATCH] Nix: Expose package set separately

---
 default.nix         | 33 +++------------------------------
 flake.nix           |  2 ++
 nix/package-set.nix | 30 ++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 30 deletions(-)
 create mode 100644 nix/package-set.nix

diff --git a/default.nix b/default.nix
index 09a46c57509d..d269b2a0b17c 100644
--- a/default.nix
+++ b/default.nix
@@ -4,36 +4,9 @@
 {sources ? import ./nix/sources.nix {}}: let
   pkgs = sources.pkgs;
 
-  overlays = pkgs.callPackage ./nix/overlays.nix {};
-
-  packageSet = pkgs.opamPackages.overrideScope (pkgs.lib.composeManyExtensions [
-    # Set the opam-repository which has the package descriptions.
-    (final: prev: {
-      repository = prev.repository.override {src = sources.opam-repository;};
-    })
-
-    # First overlay simply picks the package versions from Tezos'
-    # opam-repository.
-    overlays.pick-latest-packages
-
-    # Tweak common packages.
-    overlays.common-overlay
-
-    # Overlays for MacOS
-    (
-      if pkgs.stdenv.isDarwin
-      then overlays.darwin-overlay
-      else final: prev: {}
-    )
-
-    # Tweak the dependencies.
-    overlays.fix-rust-packages
-  ]);
-
-  packages =
-    builtins.filter
-    pkgs.lib.attrsets.isDerivation
-    (builtins.attrValues packageSet);
+  packageSet = import ./nix/package-set.nix {inherit sources;};
+
+  packages = builtins.filter pkgs.lib.attrsets.isDerivation (builtins.attrValues packageSet);
 
   packageLibDirs = builtins.filter builtins.pathExists (
     builtins.map (package: "${package}/lib/${package.pname}") packages
diff --git a/flake.nix b/flake.nix
index 5db7516c229f..c57ef9e728e1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -40,6 +40,8 @@
           inherit pkgs opam-repository;
         };
       in {
+        ocamlDependencies = import ./nix/package-set.nix {inherit sources;};
+
         packages.default = import ./default.nix {inherit sources;};
 
         devShells.default = import ./shell.nix {inherit sources;};
diff --git a/nix/package-set.nix b/nix/package-set.nix
new file mode 100644
index 000000000000..7e57bb62130f
--- /dev/null
+++ b/nix/package-set.nix
@@ -0,0 +1,30 @@
+{sources ? import ./nix/sources.nix {}}: let
+  pkgs = sources.pkgs;
+
+  overlays = pkgs.callPackage ./overlays.nix {};
+in
+  pkgs.opamPackages.overrideScope (pkgs.lib.composeManyExtensions [
+    # Set the opam-repository which has the package descriptions.
+    (final: prev: {
+      repository = prev.repository.override {
+        src = sources.opam-repository;
+      };
+    })
+
+    # First overlay simply picks the package versions from Tezos'
+    # opam-repository.
+    overlays.pick-latest-packages
+
+    # Tweak common packages.
+    overlays.common-overlay
+
+    # Overlays for MacOS
+    (
+      if pkgs.stdenv.isDarwin
+      then overlays.darwin-overlay
+      else final: prev: {}
+    )
+
+    # Tweak the dependencies.
+    overlays.fix-rust-packages
+  ])
-- 
GitLab