mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

Merge pull request #45642 from bb010g/update-mandoc

Browse source 
mandoc: 1.13.4 -> 1.14.4
This commit is contained in:
Jörg Thalheim 2018-08-27 08:30:19 +01:00 committed by GitHub
parent 614e789ac9 df4696cf2d
commit 78efb59cbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View file

@ -425,6 +425,11 @@
github = "Baughn";
name = "Svein Ove Aas";
};
bb010g = {
email = "me@bb010g.com";
github = "bb010g";
name = "Brayden Banks";
};
bbarker = {
email = "brandon.barker@gmail.com";
github = "bbarker";

16
pkgs/tools/misc/mandoc/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "mandoc-${version}";
version = "1.13.4";
version = "1.14.4";
src = fetchurl {
url = "http://mdocml.bsd.lv/snapshots/mdocml-${version}.tar.gz";
sha256 = "1vz0g5nvjbz1ckrg9cn6ivlnb13bcl1r6nc4yzb7300qvfnw2m8a";
url = "https://mandoc.bsd.lv/snapshots/mandoc-${version}.tar.gz";
sha256 = "24eb72103768987dcc63b53d27fdc085796330782f44b3b40c4660b1e1ee9b9c";
};
buildInputs = [ zlib ];
@ -19,17 +19,23 @@ stdenv.mkDerivation rec {
HAVE_MANPATH=1
LD_OHASH="-lutil"
BUILD_DB=0
CC=${stdenv.cc.targetPrefix}cc
'';
patches = [
./remove-broken-cc-check.patch
];
preConfigure = ''
echo $configureLocal > configure.local
'';
meta = with stdenv.lib; {
homepage = http://mdocml.bsd.lv/;
homepage = https://mandoc.bsd.lv/;
description = "suite of tools compiling mdoc and man";
downloadPage = "http://mandoc.bsd.lv/snapshots/";
license = licenses.bsd3;
platforms = platforms.all;
maintainers = with maintainers; [ ramkromberg ];
maintainers = with maintainers; [ bb010g ramkromberg ];
};
}

11
pkgs/tools/misc/mandoc/remove-broken-cc-check.patch Normal file
View file

@ -0,0 +1,11 @@
--- mandoc-1.14.4.org/configure 2018-08-08 15:51:51.000000000 +0100
+++ mandoc-1.14.4/configure 2018-08-27 08:19:40.391912427 +0100
@@ -40,7 +40,7 @@
OSNAME=
UTF8_LOCALE=
-CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -`
+CC=
CFLAGS=
LDADD=
LDFLAGS=