diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-23 22:00:42 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-23 22:00:42 -0400 |
| commit | 84d00355e8b288a0700ea1590897b75297ec3877 (patch) | |
| tree | 5006e56e8ac8441f5af8fcef632ead1a0e561bb2 /pkgs/tools/text | |
| parent | dc552fd2ff745d5942ceb1ec2d1016a80f7f7307 (diff) | |
| parent | 6088a4793f2a83921b197a9185034934fcd96d02 (diff) | |
Merge remote-tracking branch 'NixOS/master' into staging
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/diffstat/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/mawk/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/unoconv/unoconv-python3.patch | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix index 1490f0900b9d..fa5718ce4d36 100644 --- a/pkgs/tools/text/diffstat/default.nix +++ b/pkgs/tools/text/diffstat/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { insertions, deletions, and modifications per-file. It is useful for reviewing large, complex patch files. ''; - homepage = http://invisible-island.net/diffstat/; + homepage = https://invisible-island.net/diffstat/; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index ed54f9d349ee..9fed14c6d550 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Interpreter for the AWK Programming Language"; - homepage = http://invisible-island.net/mawk/mawk.html; + homepage = https://invisible-island.net/mawk/mawk.html; license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; platforms = with platforms; unix; diff --git a/pkgs/tools/text/unoconv/unoconv-python3.patch b/pkgs/tools/text/unoconv/unoconv-python3.patch index b23f5d54c18f..2c6e9c719411 100644 --- a/pkgs/tools/text/unoconv/unoconv-python3.patch +++ b/pkgs/tools/text/unoconv/unoconv-python3.patch @@ -360,7 +360,7 @@ index 30e6706..f72cf08 100755 - print >>sys.stderr, " http://github.com/dagwieers/unoconv/issues" + print("unoconv: Cannot find a suitable office installation on your system.", file=sys.stderr) + print("ERROR: Please locate your office installation and send your feedback to:", file=sys.stderr) -+ print(" http://github.com/dagwieers/unoconv/issues", file=sys.stderr) ++ print(" https://github.com/dagwieers/unoconv/issues", file=sys.stderr) sys.exit(1) ### Now that we have found a working pyuno library, let's import some classes |