colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.tyxml: 4.5.0 → 4.6.0

Browse Source
This commit is contained in:
Vincent Laporte 2024-03-13 05:53:19 +00:00 committed by Vincent Laporte
parent 5e85de911b
commit f224bf3196
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/ocaml-modules/eliom/default.nix
View File

@ -1,6 +1,7 @@
{ buildDunePackage
, lib
, fetchFromGitHub
, fetchpatch
, which
, ocsigen_server
, lwt_react
@ -26,6 +27,12 @@ buildDunePackage rec {
hash = "sha256-REOyxwnQqWOKywVYwN/WP22cNKZv5Nv0OpFVbNBPJN8=";
};
# Compatibility with tyxml 4.6.x
patches = fetchpatch {
url = "https://github.com/ocsigen/eliom/commit/9a6adcce3959a37b971890999331335d07f4f732.patch";
hash = "sha256-rgsqohSAHHljvag3c+HNGEgW9qwmqPq8qfTpX6vVKtg=";
};
nativeBuildInputs = [
which
];

9
pkgs/development/ocaml-modules/lwd/tyxml-lwd.nix
View File

@ -1,12 +1,17 @@
{ lib, fetchurl, buildDunePackage, js_of_ocaml, js_of_ocaml-ppx, lwd, tyxml }:
{ lib, fetchurl, fetchpatch, buildDunePackage, js_of_ocaml, js_of_ocaml-ppx, lwd, tyxml }:
buildDunePackage {
pname = "tyxml-lwd";
inherit (lwd) version src;
# Compatibility with latest Tyxml (4.6.x)
patches = fetchpatch {
url = "https://github.com/let-def/lwd/commit/7f3364ec593b5ccf0d0294b97bcd1e28e4164691.patch";
hash = "sha256-W1HjExZxDKRwsrB9ZTkvHTMKO0K5iZl+FrNqPs6BPGU=";
};
minimalOCamlVersion = "4.08";
duneVersion = "3";
buildInputs = [ js_of_ocaml-ppx ];
propagatedBuildInputs = [ js_of_ocaml lwd tyxml ];

10
pkgs/development/ocaml-modules/ocsigen-start/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, safepass, yojson
{ stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, safepass, yojson
, cohttp-lwt-unix, eliom
, resource-pooling
, ocsigen-ppx-rpc
@ -14,7 +14,13 @@ stdenv.mkDerivation rec {
strictDeps = true;
patches = [ ./templates-dir.patch ];
patches = [ ./templates-dir.patch
# Compatibility with tyxml 4.6.x
(fetchpatch {
url = "https://github.com/ocsigen/ocsigen-start/commit/0b70506f94fcb2e06cb65ce0d6a28b9b84c695f3.patch";
hash = "sha256-p/VvIu9reI8lc9lxWiTrjZvn46vuF00QInYuWPtRVyk=";
})
];
src = fetchFromGitHub {
owner = "ocsigen";

6
pkgs/development/ocaml-modules/tyxml/default.nix
View File

@ -2,13 +2,11 @@
buildDunePackage rec {
pname = "tyxml";
version = "4.5.0";
useDune2 = true;
version = "4.6.0";
src = fetchurl {
url = "https://github.com/ocsigen/tyxml/releases/download/${version}/tyxml-${version}.tbz";
sha256 = "0s30f72m457c3gbdmdwbx7ls9zg806nvm83aiz9qkpglbppwr6n6";
hash = "sha256-v+tnPGtOEgpOykxIRIrdR9w/jQLCtA9j/9zMTpHJAt0=";
};
propagatedBuildInputs = [ uutf re ];