diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml index e031f9c51..b1ba2e39c 100644 --- a/.github/workflows/opam.yml +++ b/.github/workflows/opam.yml @@ -24,7 +24,7 @@ jobs: # disabling this for now ocaml-compiler: - - ocaml-base-compiler.5.4.0 + - ocaml-base-compiler.5.5.2 runs-on: ${{ matrix.os }} diff --git a/Makefile b/Makefile index 4389424e3..4f3f58500 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ install: ## Update the package dependencies when new deps are added to dune-proj .PHONY: init create-switch: ## Create a local opam switch - @opam switch create . 5.2.0 --no-install -y + @opam switch create . 5.5.2 --no-install -y .PHONY: init init: create-switch install ## Create a local opam switch, install deps diff --git a/dune-project b/dune-project index 13a81fbf7..14f795be1 100644 --- a/dune-project +++ b/dune-project @@ -40,10 +40,6 @@ (reason (>= 3.12.0)) (ocaml-lsp-server :with-dev-setup) - (opam-check-npm-deps - (and - :dev - :with-dev-setup)) (ocamlformat (and (= 0.28.1) diff --git a/flake.lock b/flake.lock index bc62ad060..b6873baa1 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1769895423, - "narHash": "sha256-TrMaENJ5V+2zNUGrb6dj11rNiQGaRzu/S79dKeOJVyU=", + "lastModified": 1792972641, + "narHash": "sha256-zN77Jq1yPE3l8pCa65ZFzpzTq3HWC1TPWFTCD5feCOo=", "owner": "nix-ocaml", "repo": "nix-overlays", - "rev": "1ccfa0c4e189b360af5efd4a97bdcdb8ba06c532", + "rev": "75604672d0796836d59060a50dc14dee6a21e226", "type": "github" }, "original": { @@ -20,17 +20,17 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1769857600, - "narHash": "sha256-OD08gxDrlLYQQSKzM1lprIYBbzE69E+p0JYImLUNbHk=", + "lastModified": 1792925778, + "narHash": "sha256-aCg6fAHZszDX68IsLPUm/NQ7ZVXMHk74bjHAIr8K5dM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbecbb2032376ee9bd3e95c14a3b070cf3f4e079", + "rev": "acc2ec71996e90e6e011fa14979b13cdc070ec79", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbecbb2032376ee9bd3e95c14a3b070cf3f4e079", + "rev": "acc2ec71996e90e6e011fa14979b13cdc070ec79", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 228d9d89d..e3df6964f 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ let pkgs = nixpkgs.legacyPackages.${system}.extend ( self: super: { - ocamlPackages = super.ocaml-ng.ocamlPackages_5_4; + ocamlPackages = super.ocaml-ng.ocamlPackages_5_5; } ); in diff --git a/reason-react.opam b/reason-react.opam index fda16342c..3212c6d79 100644 --- a/reason-react.opam +++ b/reason-react.opam @@ -23,7 +23,6 @@ depends: [ "reason-react-ppx" {= version} "reason" {>= "3.12.0"} "ocaml-lsp-server" {with-dev-setup} - "opam-check-npm-deps" {dev & with-dev-setup} "ocamlformat" {= "0.28.1" & with-dev-setup} "odoc" {with-doc} ] @@ -46,6 +45,3 @@ depexts: [ ["react"] {npm-version = "^19.1.0"} ["react-dom"] {npm-version = "^19.1.0"} ] -pin-depends: [ - [ "opam-check-npm-deps.dev" "git+https://github.com/ahrefs/opam-check-npm-deps.git#4.1.0"] -] diff --git a/reason-react.opam.template b/reason-react.opam.template index e6a453ca1..71bb69881 100644 --- a/reason-react.opam.template +++ b/reason-react.opam.template @@ -2,6 +2,3 @@ depexts: [ ["react"] {npm-version = "^19.1.0"} ["react-dom"] {npm-version = "^19.1.0"} ] -pin-depends: [ - [ "opam-check-npm-deps.dev" "git+https://github.com/ahrefs/opam-check-npm-deps.git#4.1.0"] -] diff --git a/test/blackbox-tests/dune b/test/blackbox-tests/dune index 83224c3c1..8840bbc51 100644 --- a/test/blackbox-tests/dune +++ b/test/blackbox-tests/dune @@ -1,4 +1,5 @@ (cram (package reason-react) (deps - (package reason-react))) + (package reason-react) + (package reason-react-ppx)))