diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2020-12-06 09:33:38 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2020-12-08 17:33:12 +0100 |
| commit | 57f2285079d724cf3b7ef016d25476edf1309198 (patch) | |
| tree | a9cd22a1fe8cc81d18c80f6487a9ee98a67701b6 /pkgs/applications/misc/stog | |
| parent | 24b4e1094ea65a4f76b77fecb72e92bb03eeedce (diff) | |
| download | nixpkgs-57f2285079d724cf3b7ef016d25476edf1309198.tar nixpkgs-57f2285079d724cf3b7ef016d25476edf1309198.tar.gz nixpkgs-57f2285079d724cf3b7ef016d25476edf1309198.tar.bz2 nixpkgs-57f2285079d724cf3b7ef016d25476edf1309198.tar.lz nixpkgs-57f2285079d724cf3b7ef016d25476edf1309198.tar.xz nixpkgs-57f2285079d724cf3b7ef016d25476edf1309198.tar.zst nixpkgs-57f2285079d724cf3b7ef016d25476edf1309198.zip | |
stog: fix compatibility with uri ≥ 4.0.0
Diffstat (limited to 'pkgs/applications/misc/stog')
| -rw-r--r-- | pkgs/applications/misc/stog/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/stog/uri.patch | 13 |
2 files changed, 14 insertions, 1 deletions
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 = |