diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 60ff93be9..eedf8c098 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - 414-LTS schedule: # Prime the caches every Monday - cron: 0 1 * * MON @@ -22,9 +22,6 @@ jobs: - windows-latest ocaml-compiler: - "4.14" - include: - - os: ubuntu-latest - ocaml-compiler: 5.1.x runs-on: ${{ matrix.os }} diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index bde3332ab..47f05782d 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -2,7 +2,7 @@ name: Changelog check on: pull_request: - branches: [master] + branches: [414-LTS] types: [opened, synchronize, reopened, labeled, unlabeled] jobs: diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index f770986f6..55d39fe4b 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -3,7 +3,7 @@ on: pull_request: push: branches: - - master + - 414-LTS jobs: # tests: # runs-on: ubuntu-latest diff --git a/flake.lock b/flake.lock index 8bd3a456c..30cec1fec 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -18,98 +18,43 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "merlin5_1": { - "flake": false, - "locked": { - "lastModified": 1727427299, - "narHash": "sha256-P9+3BPBWrulS/1r03CqMdicFcgEcLK1Gy7pCAcYt3n4=", - "owner": "ocaml", - "repo": "merlin", - "rev": "650a7865bc37a646250f7c52fa6644d9d4a5218b", - "type": "github" - }, - "original": { - "owner": "ocaml", - "ref": "501", - "repo": "merlin", - "type": "github" - } - }, - "merlin5_1": { + "merlin4_14": { "flake": false, "locked": { - "lastModified": 1727427098, - "narHash": "sha256-ijy7MvHaVOyj99I4M7jqqollbou3ilzcWUctJCuLES4=", + "lastModified": 1732638333, + "narHash": "sha256-5v7VB6D/5upS3YRMyqIKBOP1QOUi5oHTiWKj7APkiFc=", "owner": "ocaml", "repo": "merlin", - "rev": "0eaccc1b8520d605b1e00685e1c3f8acb5da534c", + "rev": "2b9cd21c24a687ca4dc6d0a191942b13903eae82", "type": "github" }, "original": { "owner": "ocaml", - "ref": "main", + "ref": "v4.18-414", "repo": "merlin", "type": "github" } }, "nixpkgs": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1727603600, - "narHash": "sha256-bffkUWgbvlDEXPR0QUyHKPuI1FdMmIZvRwIWPP14SYQ=", - "owner": "nix-ocaml", - "repo": "nix-overlays", - "rev": "b5c11f8e03530ab94cd251871bd1a0abcf7bef54", - "type": "github" - }, - "original": { - "owner": "nix-ocaml", - "repo": "nix-overlays", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { - "lastModified": 1727552795, - "narHash": "sha256-IZJVvM+8Jwk8RgWygbfAZ7mnLk0DxGI/2HBDSNxCIio=", - "owner": "NixOS", + "lastModified": 1732617236, + "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "602fb03c3a4aaeb33ea15ae1c921325c593531b1", + "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", - "rev": "602fb03c3a4aaeb33ea15ae1c921325c593531b1", "type": "github" } }, "root": { "inputs": { "flake-utils": "flake-utils", - "merlin5_1": "merlin5_1", - "merlin5_2": "merlin5_2", + "merlin4_14": "merlin4_14", "nixpkgs": "nixpkgs" } }, @@ -127,21 +72,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 5ec6f57a3..53888938a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,13 +1,9 @@ { inputs = { flake-utils.url = "github:numtide/flake-utils"; - nixpkgs.url = "github:nix-ocaml/nix-overlays"; - merlin5_2 = { - url = "github:ocaml/merlin/main"; - flake = false; - }; - merlin5_1 = { - url = "github:ocaml/merlin/501"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + merlin4_14 = { + url = "github:ocaml/merlin/v4.18-414"; flake = false; }; }; @@ -30,7 +26,7 @@ }); dune-release = prev.dune-release.overrideAttrs (_: { doCheck = false; }); - ocamlPackages = prev.ocamlPackages.overrideScope' (oself: osuper: + ocamlPackages = prev.ocamlPackages.overrideScope (oself: osuper: let fixPreBuild = o: { propagatedBuildInputs = o.propagatedBuildInputs ++ [ oself.pp ]; @@ -58,13 +54,11 @@ in rec { jsonrpc = buildDunePackage (basePackage // { pname = "jsonrpc"; - doCheck = false; propagatedBuildInputs = with pkgs.ocamlPackages; [ ]; }); lsp = buildDunePackage (basePackage // { pname = "lsp"; - doCheck = false; propagatedBuildInputs = with pkgs.ocamlPackages; [ jsonrpc yojson @@ -72,19 +66,12 @@ uutf ]; checkInputs = let p = pkgs.ocamlPackages; - in [ - p.stdune - p.cinaps - p.ppx_expect - p.ppx_yojson_conv - (ocamlformat pkgs) - ]; + in [ p.cinaps p.ppx_expect p.ppx_yojson_conv (ocamlformat pkgs) ]; }); ocaml-lsp = with pkgs.ocamlPackages; buildDunePackage (basePackage // { pname = package; - doCheck = false; checkInputs = let p = pkgs.ocamlPackages; in [ p.ppx_expect @@ -137,64 +124,21 @@ overlays = [ (ocamlVersionOverlay ocaml) (overlay merlin) ]; inherit system; }; -<<<<<<< HEAD - pkgs_5_1 = - makeNixpkgs (ocaml: ocaml.ocamlPackages_5_1) inputs.merlin5_1; - pkgs_5_2 = - makeNixpkgs (ocaml: ocaml.ocamlPackages_5_2) inputs.merlin5_2; - localPackages_5_1 = makeLocalPackages pkgs_5_1; - localPackages_5_2 = makeLocalPackages pkgs_5_2; -||||||| 4e741568 (Compatibility with merlin-lib 5.1-502 (#1233)) - pkgs_4_14 = - makeNixpkgs (ocaml: ocaml.ocamlPackages_4_14) inputs.merlin4_14; - pkgs_5_2 = - makeNixpkgs (ocaml: ocaml.ocamlPackages_5_2) inputs.merlin5_2; - localPackages_4_14 = makeLocalPackages pkgs_4_14; - localPackages_5_2 = makeLocalPackages pkgs_5_2; -======= pkgs_4_14 = makeNixpkgs (ocaml: ocaml.ocamlPackages_4_14) inputs.merlin4_14; - pkgs_5_1 = - makeNixpkgs (ocaml: ocaml.ocamlPackages_5_1) inputs.merlin5_1; localPackages_4_14 = makeLocalPackages pkgs_4_14; - localPackages_5_1 = makeLocalPackages pkgs_5_1; ->>>>>>> parent of 4e741568 (Compatibility with merlin-lib 5.1-502 (#1233)) devShell = localPackages: nixpkgs: nixpkgs.mkShell { buildInputs = [ nixpkgs.ocamlPackages.utop ]; - inputsFrom = - builtins.map (x: x.overrideAttrs (p: n: { doCheck = true; })) - (builtins.attrValues localPackages); + inputsFrom = builtins.attrValues localPackages; }; in { -<<<<<<< HEAD - packages = (localPackages_5_2 // { - default = localPackages_5_2.ocaml-lsp; - ocaml_5_1 = localPackages_5_1; - }); -||||||| 4e741568 (Compatibility with merlin-lib 5.1-502 (#1233)) - packages = - (localPackages_5_2 // { default = localPackages_5_2.ocaml-lsp; }); -======= packages = (localPackages_4_14 // { default = localPackages_4_14.ocaml-lsp; }); ->>>>>>> parent of 4e741568 (Compatibility with merlin-lib 5.1-502 (#1233)) devShells = { -<<<<<<< HEAD - default = devShell localPackages_5_2 pkgs_5_2; -||||||| 4e741568 (Compatibility with merlin-lib 5.1-502 (#1233)) - ocaml4_11 = devShell localPackages_4_14 pkgs_4_14; - - default = devShell localPackages_5_2 pkgs_5_2; -======= default = devShell localPackages_4_14 pkgs_4_14; - ocaml5_1 = devShell localPackages_5_1 pkgs_5_1; ->>>>>>> parent of 4e741568 (Compatibility with merlin-lib 5.1-502 (#1233)) - - ocaml5_1 = devShell localPackages_5_1 pkgs_5_1; - release = pkgsWithoutOverlays.mkShell { buildInputs = [ pkgsWithoutOverlays.dune-release ]; };