summary refs log tree commit diff
path: root/pkgs/tools/text/unoconv/default.nix
diff options
context:
space:
mode:
authorAkira Komamura <akira.komamura@gmail.com>2020-01-17 00:42:11 +0900
committerAlyssa Ross <hi@alyssa.is>2020-01-16 21:34:29 +0000
commit1e70a7e5a81f233f7e45842382cce093e271e4f6 (patch)
treedb921d0a1839ef793b3322f6ab86617e588ac756 /pkgs/tools/text/unoconv/default.nix
parent19e37edc78ba368a1d8ebbd04f9dca6309ec76bb (diff)
downloadnixpkgs-1e70a7e5a81f233f7e45842382cce093e271e4f6.tar
nixpkgs-1e70a7e5a81f233f7e45842382cce093e271e4f6.tar.gz
nixpkgs-1e70a7e5a81f233f7e45842382cce093e271e4f6.tar.bz2
nixpkgs-1e70a7e5a81f233f7e45842382cce093e271e4f6.tar.lz
nixpkgs-1e70a7e5a81f233f7e45842382cce093e271e4f6.tar.xz
nixpkgs-1e70a7e5a81f233f7e45842382cce093e271e4f6.tar.zst
nixpkgs-1e70a7e5a81f233f7e45842382cce093e271e4f6.zip
unoconv: 0.6 -> 0.8.2
Change the source from dag.wieers.com to github, which seems to
officially host the source code of the project now.

Update unoconv from 0.6 to 0.8.2, which includes several important
changes.

Delete the patch, since it has already become part of the project.
Diffstat (limited to 'pkgs/tools/text/unoconv/default.nix')
-rw-r--r--pkgs/tools/text/unoconv/default.nix19
1 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/tools/text/unoconv/default.nix b/pkgs/tools/text/unoconv/default.nix
index 879f903ade9..380b172f702 100644
--- a/pkgs/tools/text/unoconv/default.nix
+++ b/pkgs/tools/text/unoconv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3, libreoffice-unwrapped, asciidoc, makeWrapper
+{ stdenv, fetchFromGitHub, python3, libreoffice-unwrapped, asciidoc, makeWrapper
 # whether to install odt2pdf/odt2doc/... symlinks to unoconv
 , installSymlinks ? true
 }:
@@ -7,19 +7,18 @@
 # will not be able to load the pyuno module from libreoffice).
 
 stdenv.mkDerivation rec {
-  name = "unoconv-0.6";
-
-  src = fetchurl {
-    url = "http://dag.wieers.com/home-made/unoconv/${name}.tar.gz";
-    sha256 = "1m3kv942zf5rzyrbkil0nhmyq9mm3007y64bb3s7w88mhr5n23kr";
+  pname = "unoconv";
+  version = "0.8.2";
+
+  src = fetchFromGitHub {
+    owner = "unoconv";
+    repo = "unoconv";
+    rev = version;
+    sha256 = "0ix605lk0k3hv241jb2kf4jq5744q2wh9x0pzkmay5m126vv8kq4";
   };
 
   buildInputs = [ asciidoc makeWrapper ];
 
-  # We need to use python3 because libreoffice 4.x uses it. This patch comes
-  # from unoconv.git, so it will be a part of the next release.
-  patches = [ ./unoconv-python3.patch ];
-
   preBuild = ''
     makeFlags=prefix="$out"
   '';