From 57f2285079d724cf3b7ef016d25476edf1309198 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 6 Dec 2020 09:33:38 +0100 Subject: [PATCH] =?UTF-8?q?stog:=20fix=20compatibility=20with=20uri=20?= =?UTF-8?q?=E2=89=A5=204.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/stog/default.nix | 2 +- pkgs/applications/misc/stog/uri.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/stog/uri.patch diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix index 038d04adeaa..7b497dc60e4 100644 --- a/pkgs/applications/misc/stog/default.nix +++ b/pkgs/applications/misc/stog/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - patches = [ ./install.patch ]; + patches = [ ./install.patch ./uri.patch ]; meta = with stdenv.lib; { description = "XML documents and web site compiler"; diff --git a/pkgs/applications/misc/stog/uri.patch b/pkgs/applications/misc/stog/uri.patch new file mode 100644 index 00000000000..08063a38add --- /dev/null +++ b/pkgs/applications/misc/stog/uri.patch @@ -0,0 +1,13 @@ +diff --git a/src/stog_url.ml b/src/stog_url.ml +index 5d30a43f..c67bfc36 100644 +--- a/src/stog_url.ml ++++ b/src/stog_url.ml +@@ -40,7 +40,7 @@ let of_string s = + with _ -> + failwith (Printf.sprintf "Malformed URL %S" s) + ;; +-let to_string = Uri.to_string ;; ++let to_string u = Uri.to_string u;; + + let path url = + let l =