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

* Sync with the trunk.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=16160
This commit is contained in:
Eelco Dolstra
2009-07-03 11:55:17 +00:00
parent ae03990f6a c713cfa0be
commit 222ab9d494
53 changed files with 1796 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/libraries/buddy/default.nix
View File

@@ -1,20 +1,21 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, bison }:
stdenv.mkDerivation rec {
name = "buddy-2.4";
src = fetchurl {
url = "mirror://sourceforge/buddy/${name}.tar.gz";
sha256 = "0dl86l9xkl33wnkz684xa9axhcxx2zzi4q5lii0axnb9lsk81pyk";
};
buildInputs = [ bison ];
patches = [ ./gcc-4.3.3-fixes.patch ];
configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3";
doCheck = true;
meta = {
homepage = "http://sourceforge.net/projects/buddy/";
description = "binary decision diagram package";
license = "as-is";
};
src = fetchurl {
url = "mirror://sourceforge/buddy/${name}.tar.gz";
sha256 = "0dl86l9xkl33wnkz684xa9axhcxx2zzi4q5lii0axnb9lsk81pyk";
};
configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3";
doCheck = true;
}

22
pkgs/development/libraries/buddy/gcc-4.3.3-fixes.patch Normal file
View File

@@ -0,0 +1,22 @@
diff -uwr buddy-2.4.orig/examples/bddcalc/parser.yxx buddy-2.4/examples/bddcalc/parser.yxx
--- buddy-2.4.orig/examples/bddcalc/parser.yxx 2009-07-02 17:12:48.000000000 +0200
+++ buddy-2.4/examples/bddcalc/parser.yxx 2009-07-02 17:18:36.000000000 +0200
@@ -7,6 +7,7 @@
%{
#include <string>
+#include <cstdlib>
#include <stdarg.h>
#include <fstream>
#include <getopt.h>
diff -uwr buddy-2.4.orig/src/bddtest.cxx buddy-2.4/src/bddtest.cxx
--- buddy-2.4.orig/src/bddtest.cxx 2009-07-02 17:12:48.000000000 +0200
+++ buddy-2.4/src/bddtest.cxx 2009-07-02 17:14:05.000000000 +0200
@@ -28,6 +28,7 @@
========================================================================*/
#include <string>
+#include <cstdlib>
#include "bdd.h"
#include "bvec.h"

9
pkgs/development/libraries/libsamplerate/default.nix
View File

@@ -23,9 +23,10 @@ stdenv.mkDerivation {
description = "Sample Rate Converter for audio";
homepage = http://www.mega-nerd.com/SRC/index.html;
# you can choose one of the following licenses:
license = [ "GPL"
{ url=http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf;
name="libsamplerate Commercial Use License";
} ];
license = [
"GPL"
# http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf
"libsamplerate Commercial Use License"
];
};
}

6
pkgs/development/libraries/libunistring/default.nix
View File

@@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
name = "libunistring-0.9";
name = "libunistring-0.9.1";
src = fetchurl {
url = "mirror://gnu/libunistring/${name}.tar.gz";
sha256 = "0j5f9nd6i5irvc9gk4ffgx3kgii3izhbm9adzv6svvkzwfiqsyrx";
sha256 = "0cisnd4psxhgwlb8ak4hn74zdayp9s48i5rzrl6xmni1dqz6j6y5";
};
doCheck = true;
@@ -37,5 +37,7 @@ stdenv.mkDerivation rec {
'';
license = "LGPLv3+";
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}

5
pkgs/development/libraries/ncurses-diet/builder.sh
View File

@@ -1,5 +0,0 @@
source $stdenv/setup
configureFlags="--includedir=$out/include --without-cxx-binding"
genericBuild

10
pkgs/development/libraries/ncurses-diet/default.nix
View File

@@ -1,10 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "ncurses-5.5";
builder = ./builder.sh;
src = fetchurl {
url = mirror://gnu/ncurses/ncurses-5.5.tar.gz;
md5 = "e73c1ac10b4bfc46db43b2ddfd6244ef";
};
}

46
pkgs/development/libraries/nettle/default.nix Normal file
View File

@@ -0,0 +1,46 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
name = "nettle-2.0";
src = fetchurl {
# Eventually use `mirror://gnu/'.
url = "ftp://ftp.lysator.liu.se/pub/security/lsh/${name}.tar.gz";
sha256 = "1mnb2zx6yxfzkkv8hnrjzhjviybd45z92wq4y5sv1gskp4qf5fb5";
};
doCheck = true;
meta = {
description = "GNU Nettle, a cryptographic library";
longDescription = ''
Nettle is a cryptographic library that is designed to fit
easily in more or less any context: In crypto toolkits for
object-oriented languages (C++, Python, Pike, ...), in
applications like LSH or GNUPG, or even in kernel space. In
most contexts, you need more than the basic cryptographic
algorithms, you also need some way to keep track of available
algorithms, their properties and variants. You often have
some algorithm selection process, often dictated by a protocol
you want to implement.
And as the requirements of applications differ in subtle and
not so subtle ways, an API that fits one application well can
be a pain to use in a different context. And that is why
there are so many different cryptographic libraries around.
Nettle tries to avoid this problem by doing one thing, the
low-level crypto stuff, and providing a simple but general
interface to it. In particular, Nettle doesn't do algorithm
selection. It doesn't do memory allocation. It doesn't do any
I/O.
'';
license = "GPLv2+";
homepage = http://www.lysator.liu.se/~nisse/nettle/;
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}

20
pkgs/development/libraries/openssl/darwin-arch.patch Normal file
View File

@@ -0,0 +1,20 @@
diff -rc openssl-0.9.8k-orig/Configure openssl-0.9.8k/Configure
*** openssl-0.9.8k-orig/Configure Tue Jun 30 15:45:36 2009
--- openssl-0.9.8k/Configure Tue Jun 30 15:46:15 2009
***************
*** 518,524 ****
"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
"darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
"darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
! "darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
--- 518,524 ----
"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
"darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
"darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
! "darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

2
pkgs/development/libraries/openssl/default.nix
View File

@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
configureScript = "./config";
configureFlags = "shared";
#patches = if stdenv.system == "i686-darwin" then [ ./darwin-arch.patch ] else [];
meta = {
homepage = http://www.openssl.org/;

8
pkgs/development/libraries/sqlite/default.nix
View File

@@ -1,22 +1,26 @@
{stdenv, fetchurl, readline, static ? false}:
stdenv.mkDerivation rec {
name = "sqlite-3.6.12";
name = "sqlite-3.6.16";
# Note: don't use the "amalgamation" source release, since it
# doesn't install sqlite3.pc.
src = fetchurl {
url = "http://www.sqlite.org/${name}.tar.gz";
sha256 = "00cj6bda0kqqn6m3g8k4n4w1rnj76mgk47hf03j0d3w0j0g3rhln";
sha256 = "1kadzd5c82x3i7vd0cfqxc3r8a2smc04fhsxpl07jxjlva4khvqc";
};
buildInputs = [readline];
configureFlags = ''
--enable-load-extension
${if static then "--disable-shared --enable-static" else ""}
--with-readline-inc=-I${readline}/include
'';
NIX_CFLAGS_COMPILE = "-DSQLITE_ENABLE_COLUMN_METADATA=1";
NIX_CFLAGS_LINK = "-ldl"; # needed for --enable-load-extension
meta = {
homepage = http://www.sqlite.org/;
description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";