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: e0129b64f386
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f71384c3839b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 7, 2018

  1. odt2txt: 0.4 -> 0.5

    Version 0.4 failed to build for me on MacOS 10.12.6 (16G1314). (Might be related to the removed libiconv-hacks.) Version 0.5 as specified builds cleanly. Not tested on any other platforms though.
    
    Also 0.4 is from 2008 while 0.5 was released in 2014.
    
    The old homepage now redirects to the GitHub repo.
    daniels authored Jun 7, 2018
    Copy the full SHA
    876b640 View commit details

Commits on Jun 8, 2018

  1. Merge pull request #41647 from daniels/patch-1

    odt2txt: 0.4 -> 0.5
    Mic92 authored Jun 8, 2018
    Copy the full SHA
    f71384c View commit details
Showing with 5 additions and 4 deletions.
  1. +5 −4 pkgs/tools/text/odt2txt/default.nix
9 changes: 5 additions & 4 deletions pkgs/tools/text/odt2txt/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, zlib, libiconv }:

stdenv.mkDerivation rec {
name = "odt2txt-0.4";
name = "odt2txt-${version}";
version = "0.5";

src = fetchurl {
url = "${meta.homepage}/${name}.tar.gz";
sha256 = "1y36s7w2ng0r4nismxb3hb3zvsim8aimvvblz9hgnanw3kwbvx55";
url = "${meta.homepage}/archive/v${version}.tar.gz";
sha256 = "23a889109ca9087a719c638758f14cc3b867a5dcf30a6c90bf6a0985073556dd";
};

configurePhase="export makeFlags=\"DESTDIR=$out\"";
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {

meta = {
description = "Simple .odt to .txt converter";
homepage = http://stosberg.net/odt2txt;
homepage = https://github.com/dstosberg/odt2txt;
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.gpl2;
maintainers = [ ];