From aeef0073b954700703694af69fcfe1f46070bc2c Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu, 29 Jun 2006 11:32:42 +0000
Subject: upgrade to 4.0.16, remove builder, since it was just doing a
 genericBuild

svn path=/nixpkgs/trunk/; revision=5535
---
 pkgs/os-specific/linux/shadow/builder.sh  | 3 ---
 pkgs/os-specific/linux/shadow/default.nix | 9 ++++-----
 2 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/shadow/builder.sh

(limited to 'pkgs/os-specific/linux')

diff --git a/pkgs/os-specific/linux/shadow/builder.sh b/pkgs/os-specific/linux/shadow/builder.sh
deleted file mode 100644
index 3a387e3deed..00000000000
--- a/pkgs/os-specific/linux/shadow/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-source $stdenv/setup
-                                                                                
-genericBuild
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 12b1ced1ecb..303d95d3230 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -1,12 +1,11 @@
 {stdenv, fetchurl}:
    
 stdenv.mkDerivation {
-  name = "shadow-4.0.6";
+  name = "shadow-4.0.16";
    
-  builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/shadow-4.0.6.tar.bz2;
-    md5 = "3ca79b02c0aaa82128f4c32cb68ffe4f";
+    url = http://losser.labs.cs.uu.nl/~armijn/.nix/shadow-4.0.16.tar.bz2;
+    md5 = "1d91f7479143d1d705b94180c0d4874b";
   };
-   
+  configureFlags = "--with-selinux=no";
 }
-- 
cgit 1.4.1