From e0afec2edc5e6238a640e290817c9e060b0d9e9f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 17:58:43 +0100 Subject: [PATCH] pwdutils: Remove MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This package no longer builds and is obsolete (use ‘shadow’ instead). --- pkgs/os-specific/linux/pwdutils/default.nix | 42 ------------------- .../linux/pwdutils/sys-stat-h.patch | 37 ---------------- pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/release-small.nix | 1 - pkgs/top-level/release.nix | 1 - 5 files changed, 83 deletions(-) delete mode 100644 pkgs/os-specific/linux/pwdutils/default.nix delete mode 100644 pkgs/os-specific/linux/pwdutils/sys-stat-h.patch diff --git a/pkgs/os-specific/linux/pwdutils/default.nix b/pkgs/os-specific/linux/pwdutils/default.nix deleted file mode 100644 index 98b9ab70735..00000000000 --- a/pkgs/os-specific/linux/pwdutils/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchurl, pam, gnutls, libnscd }: - -stdenv.mkDerivation rec { - name = "pwdutils-3.2.6"; - - src = fetchurl { - url = "mirror://kernel/linux/utils/net/NIS/${name}.tar.bz2"; - sha256 = "1pyawvv9x0hiachn1mb257s6hm92dh1ykczgp7ik8z6jl020z3n7"; - }; - - buildInputs = [ pam gnutls libnscd ]; - - patches = [ ./sys-stat-h.patch ]; - - postPatch = - '' for i in src/tst-* - do - sed -i "$i" -e's|/bin/bash|/bin/sh|g' - done - ''; - - configureFlags = "--disable-ldap --enable-gnutls --exec-prefix=$(out)"; - - # FIXME: The test suite seems to make assumptions that don't hold in Nix - # chroots. - doCheck = false; - - meta = { - description = "Linux pwdutils, utilities to manage passwd information"; - - longDescription = - '' Pwdutils is a collection of utilities to manage the passwd - information stored in local files, NIS, NIS+ or LDAP and can replace - the shadow suite complete. - ''; - - license = "GPLv2"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/pwdutils/sys-stat-h.patch b/pkgs/os-specific/linux/pwdutils/sys-stat-h.patch deleted file mode 100644 index 5b5bc8440d5..00000000000 --- a/pkgs/os-specific/linux/pwdutils/sys-stat-h.patch +++ /dev/null @@ -1,37 +0,0 @@ -Fix builds with current glibc git, which appears to be stricter -about . - ---- pwdutils-3.2.6/src/useradd.c~ 2008-10-16 13:46:07.000000000 +0200 -+++ pwdutils-3.2.6/src/useradd.c 2010-04-26 11:24:43.000000000 +0200 -@@ -18,6 +18,7 @@ - #include "config.h" - #endif - -+#include - #include - #include - #include - ---- pwdutils-3.2.6/src/userdel.c~ 2006-11-29 14:20:39.000000000 +0100 -+++ pwdutils-3.2.6/src/userdel.c 2010-04-26 11:26:08.000000000 +0200 -@@ -18,6 +18,7 @@ - #include "config.h" - #endif - -+#include - #include - #include - #include - -diff -ubB --show-c-function pwdutils-3.2.6/src/usermod.c\~ pwdutils-3.2.6/src/usermod.c ---- pwdutils-3.2.6/src/usermod.c~ 2006-11-29 14:20:41.000000000 +0100 -+++ pwdutils-3.2.6/src/usermod.c 2010-04-26 11:27:41.000000000 +0200 -@@ -18,6 +18,7 @@ - #include "config.h" - #endif - -+#include - #include - #include - #include - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f747716d105..c34954c9eb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6163,8 +6163,6 @@ let "procps-ng" = callPackage ../os-specific/linux/procps-ng { }; - pwdutils = callPackage ../os-specific/linux/pwdutils { }; - qemu_kvm = callPackage ../os-specific/linux/qemu-kvm { }; firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 5cf610bda52..97a158430ca 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -146,7 +146,6 @@ with (import ./release-lib.nix); policykit = linux; portmap = linux; procps = linux; - pwdutils = linux; python = allBut "i686-cygwin"; pythonFull = linux; readline = all; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index ea2ab956704..c734935b27a 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -229,7 +229,6 @@ with (import ./release-lib.nix); postfix = linux; ppl = all; procps = linux; - pwdutils = linux; pthreadmanpages = linux; pygtk = linux; pyqt4 = linux;