nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-27 22:44:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #266686 from r-ryantm/auto-update/whois

Browse Source 
whois: 5.5.19 -> 5.5.20
This commit is contained in:
Nick Cao 2023-11-11 09:56:00 -05:00 committed by GitHub
commit 1fac53cc22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/networking/whois/clang.patch
View File

@ -1,11 +0,0 @@
--- a/utils.h
+++ b/utils.h
@@ -15,7 +15,7 @@
#endif
/* Portability macros */
-#ifdef __GNUC__
+#if defined __GNUC__ && ! defined __clang__
# define NORETURN __attribute__((noreturn))
# define MALLOC_FREE __attribute__((malloc(free)))
# define NONNULL __attribute__((returns_nonnull))

8
pkgs/tools/networking/whois/default.nix
View File

@ -1,20 +1,16 @@
{ lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }: { lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "5.5.19"; version = "5.5.20";
pname = "whois"; pname = "whois";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rfc1036"; owner = "rfc1036";
repo = "whois"; repo = "whois";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-4mFn5cY7ipAU4vOiHC2s69fxYJwShQEQ1eA8t5JvOP0="; hash = "sha256-0vQ6GBBtNA6Phlqhl3NZvEJqoyZ1um7VdkpsIRKhsm4=";
}; };
patches = [
./clang.patch
];
nativeBuildInputs = [ perl gettext pkg-config ]; nativeBuildInputs = [ perl gettext pkg-config ];
buildInputs = [ libidn2 libiconv ]; buildInputs = [ libidn2 libiconv ];