flake.lock: Update

[github-actions[bot]]

Automated changes by the update-flake-lock GitHub Action.

Flake lock file updates:

• Updated input 'flake-compat':
    'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17)
  → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04)
• Updated input 'flake-utils':
    'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02)
  → 'github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26' (2024-01-15)
• Added input 'flake-utils/systems':
    'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
• Updated input 'ihaskell':
    'github:ihaskell/ihaskell/1c22a874ac0c8ed019229f4a0cd5a0bfda017357' (2022-12-19)
  → 'github:ihaskell/ihaskell/311a078b6437e382a21b9134d1c10c891820f567' (2024-02-18)
• Removed input 'ihaskell/flake-compat'
• Updated input 'ihaskell/hls':
    'github:haskell/haskell-language-server/311107eabbf0537e0c192b2c377d282505b4eff1' (2021-11-18)
  → 'github:haskell/haskell-language-server/f9211c8da70399b6352f71f3d37eb4f91b781ba1' (2024-02-17)
• Updated input 'ihaskell/hls/flake-compat':
    'github:edolstra/flake-compat/12c64ca55c1014cdc1b16ed5a804aa8576601ff2' (2021-08-02)
  → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04)
• Updated input 'ihaskell/hls/flake-utils':
    'github:numtide/flake-utils/997f7efcb746a9c140ce1f13c72263189225f482' (2021-08-20)
  → follows 'ihaskell/flake-utils'
• Removed input 'ihaskell/hls/gitignore'
• Updated input 'ihaskell/hls/nixpkgs':
    'github:NixOS/nixpkgs/5e47a07e9f2d7ed999f2c7943b0896f5f7321ca3' (2021-09-06)
  → 'github:NixOS/nixpkgs/9a3af09826447de299cc31571b07c0ebb8bc37a0' (2024-01-19)
• Removed input 'ihaskell/hls/pre-commit-hooks'
• Removed input 'ihaskell/hls/pre-commit-hooks/flake-utils'
• Removed input 'ihaskell/hls/pre-commit-hooks/nixpkgs'
• Added input 'ihaskell/nix-filter':
    'github:numtide/nix-filter/3449dc925982ad46246cfc36469baf66e1b64f17' (2024-01-15)
• Removed input 'ihaskell/nixpkgs'
• Added input 'ihaskell/nixpkgs23_11':
    'github:NixOS/nixpkgs/69405156cffbdf2be50153f13cbdf9a0bea38e49' (2024-02-17)
• Added input 'ihaskell/nixpkgsMaster':
    'github:NixOS/nixpkgs/a1ff35c63891ec9e4df75189427a5d81b5882bb9' (2024-02-18)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/6dccdc458512abce8d19f74195bb20fdb067df50' (2023-01-15)
  → 'github:nixos/nixpkgs/cbc4211f0afffe6dfd2478a62615dd5175a13f9a' (2024-02-23)
• Updated input 'nixpkgs-stable':
    'github:nixos/nixpkgs/0874168639713f547c05947c76124f78441ea46c' (2023-01-01)
  → 'github:nixos/nixpkgs/380be19fbd2d9079f677978361792cb25e8a3635' (2023-05-31)
• Updated input 'poetry2nix':
    'github:nix-community/poetry2nix/a5c454a834cd290dd4d33102ab8b4aa37d850e65' (2023-01-17)
  → 'github:nix-community/poetry2nix/3c92540611f42d3fb2d0d084a6c694cd6544b609' (2024-02-22)
• Added input 'poetry2nix/nix-github-actions':
    'github:nix-community/nix-github-actions/5163432afc817cf8bd1f031418d1869e4c9d5547' (2023-12-29)
• Added input 'poetry2nix/nix-github-actions/nixpkgs':
    follows 'poetry2nix/nixpkgs'
• Added input 'poetry2nix/systems':
    'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
• Added input 'poetry2nix/treefmt-nix':
    'github:numtide/treefmt-nix/e504621290a1fd896631ddbc5e9c16f4366c9f65' (2024-02-19)
• Added input 'poetry2nix/treefmt-nix/nixpkgs':
    follows 'poetry2nix/nixpkgs'
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/3e42a77571cc0463efa470dbcffa063977a521ab' (2023-01-18)
  → 'github:cachix/pre-commit-hooks.nix/5df5a70ad7575f6601d91f0efec95dd9bc619431' (2024-02-15)
• Updated input 'pre-commit-hooks/flake-compat':
    'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17)
  → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04)
• Updated input 'pre-commit-hooks/gitignore':
    'github:hercules-ci/gitignore.nix/a20de23b925fd8264fd7fad6454652e142fd7f73' (2022-08-14)
  → 'github:hercules-ci/gitignore.nix/43e1aa1308018f37118e34d3a9cb4f5e75dc11d5' (2023-12-29)
• Updated input 'pre-commit-hooks/nixpkgs-stable':
    'github:NixOS/nixpkgs/2f9fd351ec37f5d479556cd48be4ca340da59b8f' (2023-01-15)
  → 'github:NixOS/nixpkgs/3dc440faeee9e889fe2d1b4d25ad0f430d449356' (2024-01-10)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/eecc44934a0f6c02c02856b38bd3b6af3bec0870' (2023-01-18)
  → 'github:oxalica/rust-overlay/9b24383d77f598716fa0cbb8b48c97249f5ee1af' (2024-02-24)

Running GitHub Actions on this PR

GitHub Actions will not run workflows on pull requests which are opened by a GitHub Action.

To run GitHub Actions workflows on this PR, run:

git branch -D update_flake_lock_action
git fetch origin
git checkout update_flake_lock_action
git commit --amend --no-edit
git push origin update_flake_lock_action --force

[netlify[bot]]

✅ Deploy Preview for tweag-jupyterwith ready!

Name	Link
🔨 Latest commit	8a6d3dd734294b278a38806ec8eb8cbf3729fe6e
🔍 Latest deploy log	https://app.netlify.com/sites/tweag-jupyterwith/deploys/66ca7699ad01400008975e57
😎 Deploy Preview	https://deploy-preview-418--tweag-jupyterwith.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

---

To edit notification comments on pull requests, go to your Netlify site configuration.

[djacu]

I tried pinning the version of ocaml-system in the ocaml module.nix file like so

        ocamlPackages = lib.mkOption {
          type = types.attrs;
          default = { ocaml-system = "4.14.1"; };
          example = lib.literalExpression ''
            {
              hex = "*";
              owl = "*";
            }
          '';
          description = lib.mdDoc ''
            Attribute set of user desired OCaml packages.
          '';
        };

but it didn't fix the issue

resolve> [ERROR] No solution including optional dependencies for jupyter.dev & merlin & ocaml-system.4.14.1:   * Missing dependency:
resolve>             - ocaml-system >= 4.14.1
resolve>             no matching version
error: builder for '/nix/store/xj0w474ymn6xdgqr9ckxl2grlw30v7zh-resolve.drv' failed with exit code 20;
       last 5 log lines:
       > [ERROR] No solution including optional dependencies for jupyter.dev & merlin & ocaml-system.4.14.1:   * Missing dependency:
       >             - ocaml-system >= 4.14.1
       >             no matching version
       >
       >
       For full logs, run 'nix log /nix/store/xj0w474ymn6xdgqr9ckxl2grlw30v7zh-resolve.drv'.
(use '--show-trace' to show detailed location information)

[djacu]

I also tried bumping the version of the ocaml jupyter package in the default.nix file like so

scope = let
    name = "jupyter";
    version = "2.8.2";
    src = pkgs.fetchFromGitHub {
      owner = "akabe";
      repo = "ocaml-jupyter";
      rev = "v${version}";
      sha256 = "sha256-wy5Fn4wrSdNVczXlm4eelb445vWs7itdiMv166XJA/8=";
    };

but that didn't fix it either.

error: builder for '/nix/store/xb58ssjw2c84g5z8a9armqvhg75sh9rj-resolve.drv' failed with exit code 20;
       last 5 log lines:
       > [ERROR] No solution including optional dependencies for jupyter.dev & merlin & ocaml-system.4.14.1:   * Missing dependency:
       >             - ocaml-system >= 4.14.1
       >             no matching version
       >
       >
       For full logs, run 'nix log /nix/store/xb58ssjw2c84g5z8a9armqvhg75sh9rj-resolve.drv'.
(use '--show-trace' to show detailed location information)

Seems like version 2.8.1 should have fixed this.

[balsoft]

Is there any particular reason you want to use ocaml-system (from nixpkgs) rather than ocaml-base-compiler (from opam-repository)?

[balsoft]

With this patch, the example builds:

diff --git a/modules/kernels/ocaml/default.nix b/modules/kernels/ocaml/default.nix
index 6b4f995..049a4ee 100644
--- a/modules/kernels/ocaml/default.nix
+++ b/modules/kernels/ocaml/default.nix
@@ -10,7 +10,7 @@
   # https://github.com/tweag/opam-nix
   opam-nix ? self.inputs.opam-nix,
   # Set of required packages
-  requiredOcamlPackages ? {merlin = "*";},
+  requiredOcamlPackages,
   # Set of user desired packages
   ocamlPackages ? {}, # { hex = "*"; owl = "*"; },
   # List of directories containing .opam files
diff --git a/modules/kernels/ocaml/module.nix b/modules/kernels/ocaml/module.nix
index 9202b09..b00c110 100644
--- a/modules/kernels/ocaml/module.nix
+++ b/modules/kernels/ocaml/module.nix
@@ -30,12 +30,9 @@
 
         requiredOcamlPackages = lib.mkOption {
           type = types.attrs;
-          default = {merlin = "*";};
-          defaultText = lib.literalExpression ''
-            { merlin = "*"; }
-          '';
+          default = { merlin = "*"; ocaml-base-compiler = "4.14.0"; };
           example = lib.literalExpression ''
-            { merlin = "4.7.1-500"; }
+            { merlin = "4.7.1-500"; ocaml-system = "4.14.1"; }
           '';
           description = lib.mdDoc ''
             Attribute set of required OCaml packages.

[balsoft]

FTR, the issue is due to an old version of opam-repository pinned in opam-nix. I'll update it now, and after that update just ocaml-system = "4.14.1" should work.

[djacu]

Is there any particular reason you want to use ocaml-system (from nixpkgs) rather than ocaml-base-compiler (from opam-repository)?

I thought we were using the opam repository. I'd prefer to let opam-nix handle the dependencies at all times if possible and it makes sense.