From 6a496b3143a35323ca5c9cba4c87ab627cecfb06 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 6 May 2019 03:55:50 -0500 Subject: [PATCH] libnsl: 1.1.0 -> 1.2.0, drop included patches --- pkgs/development/libraries/libnsl/cdefs.patch | 30 ------------- pkgs/development/libraries/libnsl/default.nix | 12 +++-- pkgs/development/libraries/libnsl/nis_h.patch | 45 ------------------- 3 files changed, 5 insertions(+), 82 deletions(-) delete mode 100644 pkgs/development/libraries/libnsl/cdefs.patch delete mode 100644 pkgs/development/libraries/libnsl/nis_h.patch diff --git a/pkgs/development/libraries/libnsl/cdefs.patch b/pkgs/development/libraries/libnsl/cdefs.patch deleted file mode 100644 index dbbe800a347..00000000000 --- a/pkgs/development/libraries/libnsl/cdefs.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/rpcsvc/nislib.h -+++ b/src/rpcsvc/nislib.h -@@ -19,6 +19,7 @@ - #ifndef __RPCSVC_NISLIB_H__ - #define __RPCSVC_NISLIB_H__ - -+#include - #include - - __BEGIN_DECLS ---- a/src/rpcsvc/ypclnt.h -+++ b/src/rpcsvc/ypclnt.h -@@ -20,6 +20,7 @@ - #ifndef __RPCSVC_YPCLNT_H__ - #define __RPCSVC_YPCLNT_H__ - -+#include - #include - - /* Some defines */ ---- a/src/rpcsvc/ypupd.h -+++ b/src/rpcsvc/ypupd.h -@@ -33,6 +33,7 @@ - #ifndef __RPCSVC_YPUPD_H__ - #define __RPCSVC_YPUPD_H__ - -+#include - #include - - #include diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/development/libraries/libnsl/default.nix index 9e8a46b2e6b..79006484743 100644 --- a/pkgs/development/libraries/libnsl/default.nix +++ b/pkgs/development/libraries/libnsl/default.nix @@ -1,21 +1,19 @@ { stdenv, fetchFromGitHub, autoreconfHook, libtirpc, pkgconfig }: stdenv.mkDerivation rec { - name = "libnsl-${version}"; - version = "1.1.0"; + pname = "libnsl"; + version = "1.2.0"; src = fetchFromGitHub { owner = "thkukuk"; - repo = "libnsl"; - rev = "libnsl-${version}"; - sha256 = "0h8br0gmgw3fp5fmy6bfbj1qlk9hry1ssg25ssjgxbd8spczpscs"; + repo = pname; + rev = "v${version}"; + sha256 = "1chzqhcgh0yia9js8mh92cmhyka7rh32ql6b3mgdk26n94dqzs8b"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libtirpc ]; - patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ ./cdefs.patch ./nis_h.patch ]; - meta = with stdenv.lib; { description = "Client interface library for NIS(YP) and NIS+"; homepage = https://github.com/thkukuk/libnsl; diff --git a/pkgs/development/libraries/libnsl/nis_h.patch b/pkgs/development/libraries/libnsl/nis_h.patch deleted file mode 100644 index 199259df2e8..00000000000 --- a/pkgs/development/libraries/libnsl/nis_h.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/src/rpcsvc/nis.h -+++ b/src/rpcsvc/nis.h -@@ -32,6 +32,7 @@ - #ifndef _RPCSVC_NIS_H - #define _RPCSVC_NIS_H 1 - -+#include - #include - #include - #include -@@ -56,6 +57,34 @@ - * - */ - -+#ifndef rawmemchr -+#define rawmemchr(s,c) memchr((s),(size_t)-1,(c)) -+#endif -+ -+#ifndef __asprintf -+#define __asprintf asprintf -+#endif -+ -+#ifndef __mempcpy -+#define __mempcpy mempcpy -+#endif -+ -+#ifndef __strtok_r -+#define __strtok_r strtok_r -+#endif -+ -+#ifndef __always_inline -+#define __always_inline __attribute__((__always_inline__)) -+#endif -+ -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(exp) ({ \ -+typeof (exp) _rc; \ -+ do { \ -+ _rc = (exp); \ -+ } while (_rc == -1 && errno == EINTR); \ -+ _rc; }) -+#endif - - #ifndef __nis_object_h - #define __nis_object_h