Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 19e37edc78ba
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1e70a7e5a81f
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 16, 2020

  1. 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.
    @akirak @alyssais
    akirak authored and alyssais committed Jan 16, 2020
    Copy the full SHA
    1e70a7e View commit details
Showing with 9 additions and 384 deletions.
  1. +9 −10 pkgs/tools/text/unoconv/default.nix
  2. +0 −374 pkgs/tools/text/unoconv/unoconv-python3.patch
19 changes: 9 additions & 10 deletions pkgs/tools/text/unoconv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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"
'';
Loading