diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-07-08 22:21:32 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-07-08 22:22:17 +0200 |
| commit | 980346592c07e565c90f947a68f4ea1a2f3e3dc2 (patch) | |
| tree | e6b44f9a5458db30026c2a1645aa6e14db1b51fe /pkgs/tools | |
| parent | 800d44984f50947122fa39de559127e416f0ddc8 (diff) | |
| parent | 7e3a1a58cf8e5bf6cac5811493389953090f678a (diff) | |
| download | nixpkgs-980346592c07e565c90f947a68f4ea1a2f3e3dc2.tar nixpkgs-980346592c07e565c90f947a68f4ea1a2f3e3dc2.tar.gz nixpkgs-980346592c07e565c90f947a68f4ea1a2f3e3dc2.tar.bz2 nixpkgs-980346592c07e565c90f947a68f4ea1a2f3e3dc2.tar.lz nixpkgs-980346592c07e565c90f947a68f4ea1a2f3e3dc2.tar.xz nixpkgs-980346592c07e565c90f947a68f4ea1a2f3e3dc2.tar.zst nixpkgs-980346592c07e565c90f947a68f4ea1a2f3e3dc2.zip | |
Merge branch 'staging' into master
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/curl/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/networking/email/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/groff/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/text/groff/site.tmac | 16 |
4 files changed, 23 insertions, 3 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index d1f7c4112c6..daf5a19b01c 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; + separateDebugInfo = stdenv.isLinux; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix index 017da63a1e9..c7a6fbcfd7c 100644 --- a/pkgs/tools/networking/email/default.nix +++ b/pkgs/tools/networking/email/default.nix @@ -8,7 +8,7 @@ let sha256 = "1cxxzhm36civ6vjdgrk7mfmlzkih44kdii6l2xgy4r434s8rzcpn"; }; - srcRoot = "eMail-${eMailSrc.rev}-src"; + srcRoot = eMailSrc.name; dlibSrc = fetchFromGitHub { owner = "deanproxy"; diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index aa9ece8955b..fc6b1abf24d 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -57,8 +57,11 @@ stdenv.mkDerivation rec { # Remove example output with (random?) colors and creation date # to avoid non-determinism in the output. postInstall = '' - rm $doc/share/doc/groff/examples/hdtbl/*color*ps - find $doc/share/doc/groff/ -type f -print0 | xargs -0 sed -i -e 's/%%CreationDate: .*//' + rm "$doc"/share/doc/groff/examples/hdtbl/*color*ps + find "$doc"/share/doc/groff/ -type f -print0 | xargs -0 sed -i -e 's/%%CreationDate: .*//' + for f in 'man.local' 'mdoc.local'; do + cat '${./site.tmac}' >>"$out/share/groff/site-tmac/$f" + done ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/groff/site.tmac b/pkgs/tools/text/groff/site.tmac new file mode 100644 index 00000000000..8ef1040ca4a --- /dev/null +++ b/pkgs/tools/text/groff/site.tmac @@ -0,0 +1,16 @@ +. +.if n \{\ +. \" Character translations for non-keyboard +. \" characters - to make them searchable +. if '\*[.T]'utf8' \{\ +. char \- \N'45' +. char - \N'45' +. char ' \N'39' +. char \' \N'39' +. \} +. +. \" Shut off SGR by default (groff colors) +. \" Require GROFF_SGR envvar defined to turn it on +. if '\V[GROFF_SGR]'' \ +. output x X tty: sgr 0 +.\} |