diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-13 09:48:20 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-13 09:48:20 +0200 |
| commit | 6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204 (patch) | |
| tree | b55f27e4cc46982ebddabf4935268e4ea38610c9 /pkgs/tools/text | |
| parent | ef93155f60284e7cd694ded81bd15f07997575bc (diff) | |
| parent | 35ce480d69778867c1de820188879bbad6bc2f75 (diff) | |
| download | nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.tar nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.tar.gz nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.tar.bz2 nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.tar.lz nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.tar.xz nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.tar.zst nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/dos2unix/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/par/default.nix | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index 2db82c36a72a..dd0d1bbc9410 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { --replace /usr $out ''; - buildInputs = [ perl gettext ]; + nativeBuildInputs = [ perl gettext ]; meta = with stdenv.lib; { homepage = http://waterlan.home.xs4all.nl/dos2unix.html; diff --git a/pkgs/tools/text/par/default.nix b/pkgs/tools/text/par/default.nix index c7a686201b0d..5f9ca5212d30 100644 --- a/pkgs/tools/text/par/default.nix +++ b/pkgs/tools/text/par/default.nix @@ -28,9 +28,11 @@ stdenv.mkDerivation { ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.nicemice.net/par/; description = "Paragraph reflow for email"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + # See https://fedoraproject.org/wiki/Licensing/Par for license details + license = licenses.free; }; } |