From f063d8c4db4e0b2a0fb994a64c567ec5270fa4fe Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 3 Aug 2004 15:41:08 +0000
Subject: [PATCH] - add mktemp - disable tiger, strategoxt, they don't work and
 give errors - ftp.nl.kernel.org seems to have some problems, replaced with
 ftp.de.kernel.org should be put back eventually

svn path=/nixpkgs/trunk/; revision=1215
---
 .../linux/kernel-headers/default.nix          |  2 +-
 pkgs/system/all-packages-generic.nix          | 36 ++++++++++---------
 pkgs/system/populate-cache.nix                |  1 +
 pkgs/tools/networking/curl/default.nix        |  6 ++--
 pkgs/tools/security/mktemp/builder.sh         |  3 ++
 pkgs/tools/security/mktemp/default.nix        | 12 +++++++
 6 files changed, 40 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/tools/security/mktemp/builder.sh
 create mode 100644 pkgs/tools/security/mktemp/default.nix

diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 40ebac6c1921..11084510cd50 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "linux-headers-2.4.25-i386";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.4/linux-2.4.25.tar.bz2;
+    url = ftp://ftp.de.kernel.org/pub/linux/kernel/v2.4/linux-2.4.25.tar.bz2;
     md5 = "5fc8e9f43fa44ac29ddf9a9980af57d8";
   };
 }
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 87917a287dca..df1312de21f8 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -133,6 +133,10 @@ rec {
     inherit fetchurl stdenv zlib openssl;
   };
 
+  mktemp = (import ../tools/security/mktemp) {
+    inherit fetchurl stdenv;
+  };
+
   ### SHELLS
 
   bash = (import ../shells/bash) {
@@ -276,25 +280,25 @@ rec {
     inherit fetchurl stdenv x11;
   };
 
-  strategoxt = (import ../development/compilers/strategoxt) {
-    inherit fetchurl stdenv aterm;
-    sdf = sdf_22;
-  };
+  #strategoxt = (import ../development/compilers/strategoxt) {
+  #  inherit fetchurl stdenv aterm;
+  #  sdf = sdf_22;
+  #};
 
-  strategoxtsvn = (import ../development/compilers/strategoxt/trunk.nix) {
-    inherit fetchsvn stdenv autoconf automake libtool which aterm;
-    sdf = sdf_22;
-  };
+  #strategoxtsvn = (import ../development/compilers/strategoxt/trunk.nix) {
+  #  inherit fetchsvn stdenv autoconf automake libtool which aterm;
+  #  sdf = sdf_22;
+  #};
 
-  strategoxtdailydist = (import ../development/compilers/strategoxt/dailydist.nix) {
-    inherit fetchurl stdenv aterm;
-    sdf = sdf_22;
-  };
+  #strategoxtdailydist = (import ../development/compilers/strategoxt/dailydist.nix) {
+  #  inherit fetchurl stdenv aterm;
+  #  sdf = sdf_22;
+  #};
 
-  tiger = (import ../development/compilers/tiger) {
-    inherit fetchurl stdenv aterm strategoxt;
-    sdf = sdf_22;
-  };
+  #tiger = (import ../development/compilers/tiger) {
+  #  inherit fetchurl stdenv aterm strategoxt;
+  #  sdf = sdf_22;
+  #};
 
   ghcboot = (import ../development/compilers/ghc/boot.nix) {
     inherit fetchurl stdenv perl;
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index f8afb66d2095..ff6744c34be0 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -63,6 +63,7 @@ let {
     less
     screen
     openssl
+    mktemp
   ;};
 
 
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 16f806b81628..e1f99d5b9aaa 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, zlib}:
 
 stdenv.mkDerivation {
-  name = "curl-7.11.1";
+  name = "curl-7.12.0";
   src = fetchurl {
-    url = http://curl.haxx.se/download/curl-7.11.1.tar.bz2;
-    md5 = "c2af7c3364a1a8839516f74961b6bd11";
+    url = http://losser.st-lab.cs.uu.nl/~armijn/.nix//curl-7.12.0.tar.bz2;
+    md5 = "47db6619b849600ba2771074f00da517";
   };
   buildInputs = [zlib];
   configureFlags = "--without-ssl";
diff --git a/pkgs/tools/security/mktemp/builder.sh b/pkgs/tools/security/mktemp/builder.sh
new file mode 100644
index 000000000000..8397626c00fd
--- /dev/null
+++ b/pkgs/tools/security/mktemp/builder.sh
@@ -0,0 +1,3 @@
+. $stdenv/setup
+ 
+genericBuild
diff --git a/pkgs/tools/security/mktemp/default.nix b/pkgs/tools/security/mktemp/default.nix
new file mode 100644
index 000000000000..279448baded9
--- /dev/null
+++ b/pkgs/tools/security/mktemp/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl}:
+  
+stdenv.mkDerivation {
+  name = "mktemp-1.5";
+  
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.mktemp.org/pub/mktemp/mktemp-1.5.tar.gz;
+    md5 = "9a35c59502a228c6ce2be025fc6e3ff2";
+  };
+  
+}