From 67df25eb434d3f2c8ec75fc36699c62a9ab3e526 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sat, 7 Oct 2023 17:30:25 -0700 Subject: [PATCH] prepare release 0.20 --- dune-project | 31 +++++++++++++++++++ flake.lock | 73 +++++++-------------------------------------- flake.nix | 28 ++++------------- melange-webapi.opam | 16 +++------- 4 files changed, 50 insertions(+), 98 deletions(-) diff --git a/dune-project b/dune-project index 5b9a9ad..ee402af 100644 --- a/dune-project +++ b/dune-project @@ -3,3 +3,34 @@ (using melange 0.1) (name melange-webapi) + +(generate_opam_files true) + +(source + (github melange-community/melange-webapi)) + +(authors "Cheng Lou ") + +(maintainers + "Javier Ch\195\161varri " + "David Sancho ") + +(homepage "https://github.com/melange-community/melange-webapi") + +(bug_reports "https://github.com/melange-community/melange-webapi/issues") + +(license "MIT") + +(package + (name melange-webapi) + (synopsis "Melange bindings to the DOM") + (description "Melange bindings to the DOM and other Web APIs.") + (depends + (ocaml + (>= "5.1")) + (melange + (>= "2.0.0")) + melange-fetch + (reason + (>= "3.10")) + (ocaml-lsp-server :with-test))) diff --git a/flake.lock b/flake.lock index 23fcec7..63d5a8a 100644 --- a/flake.lock +++ b/flake.lock @@ -18,65 +18,13 @@ "type": "github" } }, - "melange-compiler-libs": { - "inputs": { - "flake-utils": [ - "melange-src", - "flake-utils" - ], - "nixpkgs": [ - "melange-src", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1694035969, - "narHash": "sha256-QJnOPSxduX34SAPJJXORukEusOLUe/rpMdOI2qOxnGo=", - "owner": "melange-re", - "repo": "melange-compiler-libs", - "rev": "6e6646c6f8b6e2d785e12b8c38e14af2e8e47893", - "type": "github" - }, - "original": { - "owner": "melange-re", - "repo": "melange-compiler-libs", - "type": "github" - } - }, - "melange-src": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "melange-compiler-libs": "melange-compiler-libs", - "nix-filter": [ - "nix-filter" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1694652454, - "narHash": "sha256-pTpVWB3d831iy85K2N7yliLIvswBmW7xpOI48TfluXE=", - "owner": "melange-re", - "repo": "melange", - "rev": "465101328e0e1ec90e246b0a2e8622e6cbdc0584", - "type": "github" - }, - "original": { - "owner": "melange-re", - "repo": "melange", - "type": "github" - } - }, "nix-filter": { "locked": { - "lastModified": 1694434370, - "narHash": "sha256-7yfdTR4mCvWZ39Q6HUcsa18tr0mg+fJZSaHE/63rwoo=", + "lastModified": 1694857738, + "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=", "owner": "numtide", "repo": "nix-filter", - "rev": "d6381c442f79f2f1fdfde00521c3d15d6c21218e", + "rev": "41fd48e00c22b4ced525af521ead8792402de0ea", "type": "github" }, "original": { @@ -93,11 +41,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1694726758, - "narHash": "sha256-eaDW64+DyLe6qtNfAD/rckzYY3DagHcqGimQ3lDnBsc=", + "lastModified": 1696724056, + "narHash": "sha256-k3Dtpz2ZBxAJy3ZXjh8lGDO4AFJmm0vrZEnr4ToPM/4=", "owner": "nix-ocaml", "repo": "nix-overlays", - "rev": "93add9ca2d495db927496e032312dcc937e2b944", + "rev": "d70da22bd7e5c547d333f3a42297cab02dcfb2ea", "type": "github" }, "original": { @@ -108,24 +56,23 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1694669921, - "narHash": "sha256-6ESpJ6FsftHV96JO/zn6je07tyV2dlLR7SdLsmkegTY=", + "lastModified": 1696696958, + "narHash": "sha256-ZBV9KMsJfEyE3IPULbdtwQqOH6C7uIlo7t61ux5il7g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f2ea252d23ebc9a5336bf6a61e0644921f64e67c", + "rev": "a1b4cc2f6a6a40f4d16045c9e3ffc89bb25e672c", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "f2ea252d23ebc9a5336bf6a61e0644921f64e67c", + "rev": "a1b4cc2f6a6a40f4d16045c9e3ffc89bb25e672c", "type": "github" } }, "root": { "inputs": { "flake-utils": "flake-utils", - "melange-src": "melange-src", "nix-filter": "nix-filter", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index fdf8ca8..65fd6f6 100644 --- a/flake.nix +++ b/flake.nix @@ -7,35 +7,18 @@ url = "github:nix-ocaml/nix-overlays"; inputs.flake-utils.follows = "flake-utils"; }; - inputs.melange-src = { - url = "github:melange-re/melange"; - inputs.nix-filter.follows = "nix-filter"; - inputs.flake-utils.follows = "flake-utils"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - outputs = { self, nixpkgs, flake-utils, nix-filter, melange-src }: + outputs = { self, nixpkgs, flake-utils, nix-filter }: flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages."${system}".appendOverlays [ (self: super: { - ocamlPackages = super.ocaml-ng.ocamlPackages_5_1.overrideScope' (oself: osuper: { - ppxlib = osuper.ppxlib.overrideAttrs (_: { - src = super.fetchFromGitHub { - owner = "ocaml-ppx"; - repo = "ppxlib"; - rev = "4026b795d9b9bd44beaf11b790a7f9a26fc0aa63"; - hash = "sha256-dRWHkE9aZS7gQp5CAT8qCX/uKYEbiIy7our5XXgMHGI="; - }; - - }); - }); + ocamlPackages = super.ocaml-ng.ocamlPackages_5_1; }) - melange-src.overlays.default ]; inherit (pkgs) nodejs_latest lib stdenv darwin; - melange-json = with pkgs.ocamlPackages; buildDunePackage { + melange-webapi = with pkgs.ocamlPackages; buildDunePackage { pname = "melange-webapi"; version = "dev"; @@ -48,20 +31,19 @@ }; mkShell = { buildInputs ? [ ] }: pkgs.mkShell { - inputsFrom = [ melange-json ]; + inputsFrom = [ melange-webapi ]; nativeBuildInputs = with pkgs; [ yarn nodejs_latest ] ++ (with pkgs.ocamlPackages; [ ocamlformat merlin - melange-jest ]); inherit buildInputs; }; in rec { - packages.default = melange-json; + packages.default = melange-webapi; devShells = { default = mkShell { }; release = mkShell { diff --git a/melange-webapi.opam b/melange-webapi.opam index 5b7f1fc..45179d8 100644 --- a/melange-webapi.opam +++ b/melange-webapi.opam @@ -6,17 +6,14 @@ maintainer: [ "Javier Chávarri " "David Sancho " ] -authors: [ - "chenglou" -] +authors: ["Cheng Lou "] license: "MIT" -homepage: "https://github.com/melange-community/melange-webapi/" -doc: "https://github.com/melange-community/melange-webapi/" +homepage: "https://github.com/melange-community/melange-webapi" bug-reports: "https://github.com/melange-community/melange-webapi/issues" depends: [ "dune" {>= "3.8"} - "ocaml" - "melange" {>= "2.0"} + "ocaml" {>= "5.1"} + "melange" {>= "2.0.0"} "melange-fetch" "reason" {>= "3.10"} "ocaml-lsp-server" {with-test} @@ -37,8 +34,3 @@ build: [ ] ] dev-repo: "git+https://github.com/melange-community/melange-webapi.git" -pin-depends: [ - [ "melange.2.0.0" "git+https://github.com/melange-re/melange.git#e114ad55d185badeb32b3c766c9ab547495eac1b" ] - [ "reason.3.10.0" "git+https://github.com/reasonml/reason.git#972261dab3b651ff8ab9b8b9fcc32940595073dc" ] - [ "melange-fetch.dev" "git+https://github.com/melange-community/melange-fetch.git#796f941b6b85eb7e6182ac6e4f40708bfde7a9a9" ] -]