public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- add mktemp

Browse Source 
- 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
This commit is contained in:
Armijn Hemel 2004-08-03 15:41:08 +00:00
parent 5868736733
commit f063d8c4db
6 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/kernel-headers/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation {
name = "linux-headers-2.4.25-i386"; name = "linux-headers-2.4.25-i386";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { 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"; md5 = "5fc8e9f43fa44ac29ddf9a9980af57d8";
}; };
} }

36
pkgs/system/all-packages-generic.nix
View File

@ -133,6 +133,10 @@ rec {
inherit fetchurl stdenv zlib openssl; inherit fetchurl stdenv zlib openssl;
}; };
mktemp = (import ../tools/security/mktemp) {
inherit fetchurl stdenv;
};
### SHELLS ### SHELLS
bash = (import ../shells/bash) { bash = (import ../shells/bash) {
@ -276,25 +280,25 @@ rec {
inherit fetchurl stdenv x11; inherit fetchurl stdenv x11;
}; };
strategoxt = (import ../development/compilers/strategoxt) { #strategoxt = (import ../development/compilers/strategoxt) {
inherit fetchurl stdenv aterm; # inherit fetchurl stdenv aterm;
sdf = sdf_22; # sdf = sdf_22;
}; #};
strategoxtsvn = (import ../development/compilers/strategoxt/trunk.nix) { #strategoxtsvn = (import ../development/compilers/strategoxt/trunk.nix) {
inherit fetchsvn stdenv autoconf automake libtool which aterm; # inherit fetchsvn stdenv autoconf automake libtool which aterm;
sdf = sdf_22; # sdf = sdf_22;
}; #};
strategoxtdailydist = (import ../development/compilers/strategoxt/dailydist.nix) { #strategoxtdailydist = (import ../development/compilers/strategoxt/dailydist.nix) {
inherit fetchurl stdenv aterm; # inherit fetchurl stdenv aterm;
sdf = sdf_22; # sdf = sdf_22;
}; #};
tiger = (import ../development/compilers/tiger) { #tiger = (import ../development/compilers/tiger) {
inherit fetchurl stdenv aterm strategoxt; # inherit fetchurl stdenv aterm strategoxt;
sdf = sdf_22; # sdf = sdf_22;
}; #};
ghcboot = (import ../development/compilers/ghc/boot.nix) { ghcboot = (import ../development/compilers/ghc/boot.nix) {
inherit fetchurl stdenv perl; inherit fetchurl stdenv perl;

1
pkgs/system/populate-cache.nix
View File

@ -63,6 +63,7 @@ let {
less less
screen screen
openssl openssl
mktemp
;}; ;};

6
pkgs/tools/networking/curl/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, zlib}: {stdenv, fetchurl, zlib}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "curl-7.11.1"; name = "curl-7.12.0";
src = fetchurl { src = fetchurl {
url = http://curl.haxx.se/download/curl-7.11.1.tar.bz2; url = http://losser.st-lab.cs.uu.nl/~armijn/.nix//curl-7.12.0.tar.bz2;
md5 = "c2af7c3364a1a8839516f74961b6bd11"; md5 = "47db6619b849600ba2771074f00da517";
}; };
buildInputs = [zlib]; buildInputs = [zlib];
configureFlags = "--without-ssl"; configureFlags = "--without-ssl";

3
pkgs/tools/security/mktemp/builder.sh Normal file
View File

@ -0,0 +1,3 @@
. $stdenv/setup
genericBuild

12
pkgs/tools/security/mktemp/default.nix Normal file
View File

@ -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";
};
}