Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update melange-json, melange-jest, caqti #1958

Merged
merged 5 commits into from
Mar 29, 2025
Merged

update melange-json, melange-jest, caqti #1958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b78177c
update melange-json, melange-jest, caqti
anmonteiro Mar 22, 2025
d59f84f
update melange-atdgen-codec-runtime
anmonteiro Mar 24, 2025
e887e6c
dont run tests?
anmonteiro Mar 24, 2025
4c24903
update sedlex and more melange packages
anmonteiro Mar 29, 2025
5c90410
remove mdx buildinput from caqti
anmonteiro Mar 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions ocaml/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,13 +366,20 @@ with oself;
});

caqti = osuper.caqti.overrideAttrs (o: {
version = "2.1.2";
version = "2.2.4";
src = builtins.fetchurl {
url = "https://github.com/paurkedal/ocaml-caqti/releases/download/v2.1.2/caqti-v2.1.2.tbz";
sha256 = "0nw9gvhc4wbnzrwkc9d0p85jqf9vgc5l30pn0ghbaxj3z5gzskds";
url = "https://github.com/paurkedal/ocaml-caqti/releases/download/v2.2.4/caqti-v2.2.4.tbz";
sha256 = "1fzq1brw9na4p22m20xjw19qbk869cj7nkrc2faw0khm40l47smq";
};
propagatedBuildInputs = o.propagatedBuildInputs ++ [ ipaddr mtime dune-site lwt-dllist ];
checkInputs = [ alcotest re ];
propagatedBuildInputs = o.propagatedBuildInputs ++ [
ipaddr
mtime
dune-site
lru
lwt-dllist
];
nativeCheckInputs = [ mdx ];
checkInputs = [ mdx alcotest re ];
doCheck = true;
});

Expand Down Expand Up @@ -1405,8 +1412,8 @@ with oself;
pname = "melange-json-native";
version = "1.3.0";
src = builtins.fetchurl {
url = "https://github.com/melange-community/melange-json/releases/download/1.3.0/melange-json-1.3.0.tbz";
sha256 = "1iasna813gdm3aa4xpl5vqgjsh3yrvhz1253m3w3dickjzhpdlwy";
url = "https://github.com/melange-community/melange-json/releases/download/2.0.0/melange-json-2.0.0.tbz";
sha256 = "1n1avcplidrigkch4y8lnh136g5q06d0xhgzvgips3y399lw2jah";
};
propagatedBuildInputs = [ ppxlib yojson ];
};
Expand Down Expand Up @@ -2336,6 +2343,15 @@ with oself;
# };
# };

sedlex = osuper.sedlex.overrideAttrs (_: {
src = fetchFromGitHub {
owner = "ocaml-community";
repo = "sedlex";
rev = "v3.4";
hash = "sha256-mJMv2zl1UfFJjYdwv68hi7TWP+/oZB9tKHXt13r1SlA=";
};
});

semver = buildDunePackage {
pname = "semver";
version = "0.2.0";
Expand Down
48 changes: 29 additions & 19 deletions ocaml/melange-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ with oself;
pname = "melange-atdgen-codec-runtime";
version = "n/a";
src = builtins.fetchurl {
url = "https://github.com/ahrefs/melange-atdgen-codec-runtime/releases/download/3.0.0/melange-atdgen-codec-runtime-3.0.0.tbz";
sha256 = "1fkw1ynqzmpf9h6jkqzcfv2i2cw4a16wmvbmc8hmgw0wymb99m2n";
url = "https://github.com/ahrefs/melange-atdgen-codec-runtime/releases/download/3.0.1/melange-atdgen-codec-runtime-3.0.1.tbz";
sha256 = "1g5axhl8cqnhwky4nnsdpk4n3vxv95fr44k71kfi3zngvl9rrpya";
};

nativeBuildInputs = [ melange ];
Expand All @@ -18,9 +18,11 @@ with oself;
melange-fetch = buildDunePackage {
pname = "melange-fetch";
version = "n/a";
src = builtins.fetchurl {
url = "https://github.com/melange-community/melange-fetch/releases/download/0.1.0/melange-fetch-0.1.0.tbz";
sha256 = "0y7z8jrwjgim2wgwg1ajjc1g365wgppgl3wza6b3955ahghjgyl8";
src = fetchFromGitHub {
owner = "melange-community";
repo = "melange-fetch";
rev = "a876cc42c2f1c3b0cbf370f1d15bbc788a62d785";
hash = "sha256-has7M1qi5AjBLHQxH2wNg4JvLBV7jHXFQAAhs0OZoLw=";
};
nativeBuildInputs = [ melange ];
propagatedBuildInputs = [ melange ];
Expand All @@ -32,8 +34,8 @@ with oself;
src = fetchFromGitHub {
owner = "ahrefs";
repo = "melange-recharts";
rev = "fda583ba97148e09d5c3961d8278c189ce261b81";
hash = "sha256-ejuXTLhMiRzyC6yJLd5xPzGUoj1fDP2/TaELlFKJJVM=";
rev = "2ff880588550897f8e2752f71d63aed9eae67d35";
hash = "sha256-+YIC5JZGEAiTufZxbA3NTy65WqS77/YROLg0Hez9LUo=";
};
nativeBuildInputs = [ melange reason ];
propagatedBuildInputs = [ melange reason-react ];
Expand All @@ -42,9 +44,11 @@ with oself;
melange-testing-library = buildDunePackage {
pname = "melange-testing-library";
version = "n/a";
src = builtins.fetchurl {
url = "https://github.com/melange-community/melange-testing-library/releases/download/0.1.0/melange-testing-library-0.1.0.tbz";
sha256 = "1mhir158zwpfigb75plgzz93i8jfnfjibdii2vh19vr3gcly7k23";
src = fetchFromGitHub {
owner = "melange-community";
repo = "melange-testing-library";
rev = "45e0bc95270a66d9b6dd77c3ddf1ae72f36f7a19";
hash = "sha256-xr8LTJwCX6IgkycKC1FBRn+YiA/HZDUmNJNsw8MM7N4=";
};
nativeBuildInputs = [ melange reason ];
propagatedBuildInputs = [ melange reason-react ];
Expand All @@ -60,9 +64,11 @@ with oself;
melange-jest = buildDunePackage {
pname = "melange-jest";
version = "n/a";
src = builtins.fetchurl {
url = "https://github.com/melange-community/melange-jest/releases/download/0.1.1/melange-jest-0.1.1.tbz";
sha256 = "1vnn19bz5sqnvrpl6wma50q8a75diyb9ddl19061halga3a410y6";
src = fetchFromGitHub {
owner = "melange-community";
repo = "melange-jest";
rev = "b26885f193ed97ef9ab47447d21a1ddaa75d924a";
hash = "sha256-PD22f/ySEwEtom5d9LNQoRQBQcCbyFIClj1wLnqk2oA=";
};
nativeBuildInputs = [ melange ];
propagatedBuildInputs = [ melange reason-react ];
Expand All @@ -82,9 +88,11 @@ with oself;
melange-webapi = buildDunePackage {
pname = "melange-webapi";
version = "n/a";
src = builtins.fetchurl {
url = "https://github.com/melange-community/melange-webapi/releases/download/0.21.0/melange-webapi-0.21.0.tbz";
sha256 = "1h8j3fy6d0shxv9wjhgmm85ac7f69waz9ay3khw8impiv6h5w00k";
src = fetchFromGitHub {
owner = "melange-community";
repo = "melange-webapi";
rev = "0040e288bc47706e530ed7100d6e7bd80199c6c9";
hash = "sha256-S2q+8ri6jDDwOkY3IUmFMZzx1tNZWl34XdYtmI5W6eQ=";
};
nativeBuildInputs = [ melange reason ];
propagatedBuildInputs = [ melange melange-fetch ];
Expand Down Expand Up @@ -119,9 +127,11 @@ with oself;
reason-react-ppx = buildDunePackage {
pname = "reason-react-ppx";
version = "n/a";
src = builtins.fetchurl {
url = "https://github.com/reasonml/reason-react/releases/download/0.15.0/reason-react-0.15.0.tbz";
sha256 = "1ka3zi9p8kh6f5lmq9s398xpjw1c6l1cmgq0liwgmlprysiwk4zs";
src = fetchFromGitHub {
owner = "reasonml";
repo = "reason-react";
rev = "2452ff8b970cdbc8d31ae9549472a07a85a7093e";
hash = "sha256-N8IjA0kQiY06W8ZuEPof7tZ6re9TlChrAQ1i5AqR4BY=";
};
propagatedBuildInputs = [ ppxlib ];
};
Expand Down
Loading