diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-02-13 13:49:29 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-02-13 13:49:29 +0000 |
commit | 48eb3bd187a1b46e8cb709666ce11c993b5ee644 (patch) | |
tree | 9ddbc35a2cc8d205d26cbeb93c705df49c5ccc76 | |
parent | 039d22f2d4ad09a2c5ba41d14f3345763588e542 (diff) | |
parent | 6ed4d1fe5a012b4eac87932b1246df748e148a8f (diff) | |
download | nixpkgs-48eb3bd187a1b46e8cb709666ce11c993b5ee644.tar nixpkgs-48eb3bd187a1b46e8cb709666ce11c993b5ee644.tar.gz nixpkgs-48eb3bd187a1b46e8cb709666ce11c993b5ee644.tar.bz2 nixpkgs-48eb3bd187a1b46e8cb709666ce11c993b5ee644.tar.lz nixpkgs-48eb3bd187a1b46e8cb709666ce11c993b5ee644.tar.xz nixpkgs-48eb3bd187a1b46e8cb709666ce11c993b5ee644.tar.zst nixpkgs-48eb3bd187a1b46e8cb709666ce11c993b5ee644.zip |
* Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14073
-rw-r--r-- | pkgs/applications/misc/thinking-rock/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl | 2 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.2/default.nix | 31 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.2/libs/default.nix | 19 | ||||
-rw-r--r-- | pkgs/development/libraries/libpcap/libpcap_amd64.patch | 26 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-4/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/perl-modules/BerkeleyDB/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/misc/cgdb/default.nix | 17 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 21 |
9 files changed, 66 insertions, 64 deletions
diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix index 721f3f4e74f..aff60990b69 100644 --- a/pkgs/applications/misc/thinking-rock/default.nix +++ b/pkgs/applications/misc/thinking-rock/default.nix @@ -3,7 +3,7 @@ args.stdenv.mkDerivation { name = "thinkingrock-2.0.1-binary"; src = args.fetchurl { - url = mirror://sourceforge.net/thinkingrock/tr-2.0.1.tar.gz; + url = mirror://sourceforge/thinkingrock/tr-2.0.1.tar.gz; sha256 = "1fsanxh0li8yqsspagx1w1ykmvfnm6h44i6gd02v05abx8q25jk1"; }; diff --git a/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl b/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl index 91d21f76143..d3952ccff3c 100644 --- a/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl +++ b/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl @@ -81,7 +81,7 @@ xkb_symbols "altgr-intl" { key <AB02> { [ x, X, oe, OE ] }; key <AB03> { [ c, C, copyright, cent ] }; key <AB04> { [ v, V, registered, registered ] }; - key <AB05> { [ b, B ] }; + key <AB05> { [ b, B, emdash, endash ] }; key <AB06> { [ n, N, ntilde, Ntilde ] }; key <AB07> { [ m, M, mu, mu ] }; key <AB08> { [ comma, less, ccedilla, Ccedilla ] }; diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix index b90e5163559..0376b4006c4 100644 --- a/pkgs/desktops/kde-4.2/default.nix +++ b/pkgs/desktops/kde-4.2/default.nix @@ -1,36 +1,31 @@ -{stdenv, fetchurl, cmake, qt4, xlibs, bzip2, libxml2, libxslt, perl, exiv2, aspell, -pthread_stubs, gst_all, xineLib, fam, log4cxx, cluceneCore, redland, avahi, jdk, -pcre, jasper, openexr, shared_mime_info, giflib}: +pkgs: rec { ### SUPPORT automoc4 = import ./support/automoc4 { - inherit stdenv fetchurl cmake; - inherit qt4; + inherit (pkgs) stdenv fetchurl cmake; + inherit (pkgs) qt4; }; phonon = import ./support/phonon { - inherit stdenv fetchurl cmake; - inherit qt4 pthread_stubs gst_all xineLib; - inherit (xlibs) libXau libXdmcp; + inherit (pkgs) stdenv fetchurl cmake; + inherit (pkgs) qt4 pthread_stubs gst_all xineLib; + inherit (pkgs.xlibs) libXau libXdmcp; inherit automoc4; }; strigi = import ./support/strigi { - inherit stdenv fetchurl cmake perl; - inherit bzip2 qt4 libxml2 exiv2 fam log4cxx cluceneCore; + inherit (pkgs) stdenv fetchurl cmake perl; + inherit (pkgs) bzip2 qt4 libxml2 exiv2 fam log4cxx cluceneCore; }; soprano = import ./support/soprano { - inherit stdenv fetchurl cmake; - inherit qt4 jdk cluceneCore redland; + inherit (pkgs) stdenv fetchurl cmake; + inherit (pkgs) qt4 jdk cluceneCore redland; }; ### LIBS - kdelibs = import ./libs { - inherit stdenv fetchurl cmake perl; - inherit qt4 bzip2 pcre fam libxml2 libxslt shared_mime_info giflib jasper; - inherit openexr aspell avahi; - inherit automoc4 phonon strigi soprano; - }; + kdelibs = import ./libs (pkgs // { + inherit automoc4 phonon strigi soprano; + }); } diff --git a/pkgs/desktops/kde-4.2/libs/default.nix b/pkgs/desktops/kde-4.2/libs/default.nix index 66248f78d99..c6ef7fc4767 100644 --- a/pkgs/desktops/kde-4.2/libs/default.nix +++ b/pkgs/desktops/kde-4.2/libs/default.nix @@ -1,15 +1,20 @@ -{stdenv, fetchurl, cmake, perl, - qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper, - openexr, aspell, avahi, - automoc4, phonon, strigi, soprano}: +{ stdenv, fetchurl, cmake, perl +, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper +, openexr, aspell, avahi +, automoc4, phonon, strigi, soprano, ... +}: stdenv.mkDerivation { name = "kdelibs-4.2.0"; + src = fetchurl { url = mirror://kde/stable/4.2.0/src/kdelibs-4.2.0.tar.bz2; md5 = "2d830a922195fefe6e073111850247ac"; }; - buildInputs = [ cmake perl qt4 stdenv.gcc.libc bzip2 pcre fam libxml2 libxslt - shared_mime_info giflib jasper openexr aspell avahi - automoc4 phonon strigi soprano ]; + + buildInputs = [ + cmake perl qt4 stdenv.gcc.libc bzip2 pcre fam libxml2 libxslt + shared_mime_info giflib jasper openexr aspell avahi + automoc4 phonon strigi soprano + ]; } diff --git a/pkgs/development/libraries/libpcap/libpcap_amd64.patch b/pkgs/development/libraries/libpcap/libpcap_amd64.patch new file mode 100644 index 00000000000..6b563e15d2d --- /dev/null +++ b/pkgs/development/libraries/libpcap/libpcap_amd64.patch @@ -0,0 +1,26 @@ +diff --git a/pcap.c b/pcap.c +index 010ef74..0bfb191 100644 +--- a/pcap.c ++++ b/pcap.c +@@ -211,7 +211,7 @@ pcap_set_buffer_size(pcap_t *p, int buffer_size) + return 0; + } + +-int ++pcap_t * + pcap_activate(pcap_t *p) + { + int status; +diff --git a/pcap/pcap.h b/pcap/pcap.h +index ea18edc..3910a2d 100644 +--- a/pcap/pcap.h ++++ b/pcap/pcap.h +@@ -263,7 +263,7 @@ int pcap_can_set_rfmon(pcap_t *); + int pcap_set_rfmon(pcap_t *, int); + int pcap_set_timeout(pcap_t *, int); + int pcap_set_buffer_size(pcap_t *, int); +-int pcap_activate(pcap_t *); ++pcap_t *pcap_activate(pcap_t *); + + pcap_t *pcap_open_live(const char *, int, int, int, char *); + pcap_t *pcap_open_dead(int, int); diff --git a/pkgs/development/libraries/qt-4/default.nix b/pkgs/development/libraries/qt-4/default.nix index d8f8fec2bb5..f93ea9e8272 100644 --- a/pkgs/development/libraries/qt-4/default.nix +++ b/pkgs/development/libraries/qt-4/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { -system-zlib -system-libpng -system-libjpeg -fast -qt-gif -confirm-license -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql - -qdbus -cups -glib -xfixes + -qdbus -cups -glib -xfixes -dbus-linked -fontconfig -I${freetype}/include/freetype2 ''; diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix index 59826ee8a44..a6309d028e8 100644 --- a/pkgs/development/perl-modules/BerkeleyDB/default.nix +++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix @@ -1,11 +1,11 @@ -{fetchurl, perl, db4}: +{buildPerlPackage, fetchurl, db4}: -import ../generic perl { - name = "BerkeleyDB-0.27"; +buildPerlPackage rec { + name = "BerkeleyDB-0.36"; src = fetchurl { - url = http://nixos.org/tarballs/BerkeleyDB-0.27.tar.gz; - md5 = "43aa72c0c6941af0d656d749ad543e96"; + url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; + sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1"; }; preConfigure = '' diff --git a/pkgs/tools/misc/cgdb/default.nix b/pkgs/tools/misc/cgdb/default.nix deleted file mode 100644 index 71dba9a712f..00000000000 --- a/pkgs/tools/misc/cgdb/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -args: -args.stdenv.mkDerivation { - name = "cgdb-0.6.4"; - - src = args.fetchurl { - url = http://prdownloads.sourceforge.net/cgdb/cgdb-0.6.4.tar.gz; - sha256 = "10c03p3bbr1glyw7j2i2sv97riiksw972pdamcqdqrzzfdcly54w"; - }; - - buildInputs =(with args; [readline ncurses]); - - meta = { - description = "curses interface to gdb"; - homepage = http://cgdb.sourceforge.net/; - license ="GPLv2"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d006caded77..f1e3b8403b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -481,10 +481,6 @@ let inherit fetchurl stdenv; }; - cgdb = import ../tools/misc/cgdb { - inherit fetchurl stdenv ncurses readline; - }; - ccrypt = import ../tools/security/ccrypt { inherit fetchurl stdenv; }; @@ -4084,12 +4080,13 @@ let url = mirror://cpan/authors/id/C/CL/CLKAO/Algorithm-Annotate-0.10.tar.gz; sha256 = "1y92k4nqkscfwpriv8q7c90rjfj85lvwq1k96niv2glk8d37dcf9"; }; + propagatedBuildInputs = [perlAlgorithmDiff]; }; - perlAlgorithmDiff = buildPerlPackage { - name = "Algorithm-Diff-1.15"; + perlAlgorithmDiff = buildPerlPackage rec { + name = "Algorithm-Diff-1.1901"; src = fetchurl { - url = mirror://cpan/authors/id/T/TY/TYEMQ/Algorithm-Diff-1.1901.zip; + url = "mirror://cpan/authors/id/T/TY/TYEMQ/${name}.zip"; sha256 = "0qk60fi49mpyvnfpjd2dzcmya8x3g5zfgb2hrnl7a5krn045g6i2"; }; buildInputs = [unzip]; @@ -4129,7 +4126,7 @@ let }; perlBerkeleyDB = import ../development/perl-modules/BerkeleyDB { - inherit fetchurl perl db4; + inherit buildPerlPackage fetchurl db4; }; perlBitVector = buildPerlPackage { @@ -8967,13 +8964,9 @@ let openexr = openexr_1_6_1 ; }); - kde42 = import ../desktops/kde-4.2 { - inherit stdenv fetchurl cmake jdk; - inherit xlibs qt4 bzip2 libxml2 libxslt perl pcre exiv2 aspell; - inherit pthread_stubs gst_all xineLib fam log4cxx cluceneCore; - inherit redland avahi jasper shared_mime_info giflib; + kde42 = import ../desktops/kde-4.2 (pkgs // { openexr = openexr_1_6_1; - }; + }); kdebase = import ../desktops/kde/kdebase { inherit |