From 9ba64dc6d9c1c4cb0f1a64f4bed4c2e99694f595 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Thu, 4 Feb 2010 22:33:18 +0000 Subject: [PATCH 1/7] update Amarok to 2.2.2 svn path=/nixpkgs/trunk/; revision=19826 --- pkgs/desktops/kde-4.3/extragear/amarok/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.3/extragear/amarok/default.nix b/pkgs/desktops/kde-4.3/extragear/amarok/default.nix index ca2a84408ef..cf386756dc4 100644 --- a/pkgs/desktops/kde-4.3/extragear/amarok/default.nix +++ b/pkgs/desktops/kde-4.3/extragear/amarok/default.nix @@ -2,10 +2,10 @@ , kdelibs, automoc4, phonon, strigi, soprano, qca2}: stdenv.mkDerivation { - name = "amarok-2.2.1"; + name = "amarok-2.2.2"; src = fetchurl { - url = mirror://kde/stable/amarok/2.2.1/src/amarok-2.2.1.tar.bz2; - sha256 = "020srkfhly2nz3vp2xb5cd02j27r16ygm46z05vpil2csrbv5nzk"; + url = mirror://kde/stable/amarok/2.2.2/src/amarok-2.2.2.tar.bz2; + sha256 = "0kg67b9wz2wi1gyn229vzbib4s0wpgqrjyfqy0032yl9fa2k13bn"; }; includeAllQtDirs=true; inherit mysql loudmouth; From 874b4869a341654e3a4333d7e97c56a4ef25f301 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Feb 2010 10:41:24 +0000 Subject: [PATCH 2/7] * Nix stable updated to 0.14. svn path=/nixpkgs/trunk/; revision=19830 --- pkgs/tools/package-management/nix/default.nix | 23 +++++++++---------- pkgs/top-level/all-packages.nix | 5 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 70e7b749c70..a2685ead6c2 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,25 +1,24 @@ -{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null +{ stdenv, fetchurl, aterm, perl, curl, bzip2, openssl ? null , storeDir ? "/nix/store" , stateDir ? "/nix/var" -, supportOldDBs ? true }: stdenv.mkDerivation rec { - name = "nix-0.13"; + name = "nix-0.14"; src = fetchurl { - url = "http://hydra.nixos.org/build/118589/download/4/${name}.tar.bz2"; - sha256 = "6da44cacb7185e67dff39a2339c42f9c722081bac0dc593565bd89674beb1f94"; + url = "http://hydra.nixos.org/build/281118/download/4/${name}.tar.bz2"; + sha256 = "7df3dd52a7a42354e845302665c3e1f67af287f9cca2bda67f8abb724e52c519"; }; - buildInputs = [perl curl openssl]; + buildInputs = [ perl curl openssl ]; - configureFlags = '' - --with-store-dir=${storeDir} --localstatedir=${stateDir} - --with-aterm=${aterm} --with-bzip2=${bzip2} - ${if supportOldDBs then "--with-bdb=${db4}" else "--disable-old-db-compat"} - --disable-init-state - ''; + configureFlags = + '' + --with-store-dir=${storeDir} --localstatedir=${stateDir} + --with-aterm=${aterm} --with-bzip2=${bzip2} + --disable-init-state + ''; doCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5b0a8ee5f5..7a1979cc6ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8665,19 +8665,20 @@ let nix = makeOverridable (import ../tools/package-management/nix) { inherit fetchurl stdenv perl curl bzip2 openssl; aterm = aterm242fixes; - db4 = db45; - supportOldDBs = getPkgConfig "nix" "OldDBSupport" true; storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; }; # The bleeding edge. + nixUnstable = nix; + /* nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) { inherit fetchurl stdenv perl curl bzip2 openssl; aterm = aterm242fixes; storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; }; + */ nixCustomFun = src: preConfigure: enableScripts: configureFlags: import ../tools/package-management/nix/custom.nix { From 631ea038757bd88e55c10ec9b1aa1d2aee1af05f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Feb 2010 14:13:25 +0000 Subject: [PATCH 3/7] * Fix / disable some packages that give evaluation errors in Hydra. svn path=/nixpkgs/trunk/; revision=19833 --- pkgs/applications/misc/grip/default.nix | 2 +- pkgs/applications/misc/hello/ex-2/default.nix | 4 ++-- pkgs/development/compilers/ghc/6.12.1.nix | 2 +- pkgs/games/jamp/default.nix | 7 ++---- pkgs/lib/platforms.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- pkgs/top-level/release.nix | 24 +++++-------------- 7 files changed, 14 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index f6c43a05c3e..a82715fc13c 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation { homepage = http://nostatic.org/grip; license = "GPLv2"; maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + #platforms = args.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix index 876e0dfb7c5..409ff3745c1 100644 --- a/pkgs/applications/misc/hello/ex-2/default.nix +++ b/pkgs/applications/misc/hello/ex-2/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "hello-2.3"; + name = "hello-2.3x26"; src = fetchurl { url = mirror://gnu/hello/hello-2.3.tar.bz2; sha256 = "0c7vijq8y68bpr7g6dh1gny0bff8qq81vnp4ch8pjzvg56wb3js1"; }; - + meta = { description = "A program that produces a familiar, friendly greeting"; longDescription = '' diff --git a/pkgs/development/compilers/ghc/6.12.1.nix b/pkgs/development/compilers/ghc/6.12.1.nix index 3412cc771ac..b54001a70ea 100644 --- a/pkgs/development/compilers/ghc/6.12.1.nix +++ b/pkgs/development/compilers/ghc/6.12.1.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { inherit homepage; description = "The Glasgow Haskell Compiler"; maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.platforms.linux; + platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/jamp/default.nix b/pkgs/games/jamp/default.nix index b551b9b6dfc..d9ae4ca738b 100644 --- a/pkgs/games/jamp/default.nix +++ b/pkgs/games/jamp/default.nix @@ -24,10 +24,7 @@ rec { meta = { description = "A physics-based game"; - maintainers = [ - a.lib.maintainers.raskin - ]; - platforms = with a.lib.platforms; - linux ++ darwin; + maintainers = [ a.lib.maintainers.raskin ]; + platforms = a.lib.platforms.linux; }; } diff --git a/pkgs/lib/platforms.nix b/pkgs/lib/platforms.nix index d8f9692ae09..5174476f954 100644 --- a/pkgs/lib/platforms.nix +++ b/pkgs/lib/platforms.nix @@ -11,5 +11,5 @@ rec { unix = linux ++ darwin ++ freebsd ++ openbsd; all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd; allBut = platform: lists.filter (x: platform != x) all; - mesaPlatforms = linux ++ darwin ++ freebsd; + mesaPlatforms = linux; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b55c101167a..7b08c048fe5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -369,7 +369,7 @@ rec { license = "GPLv2+"; maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = python.meta.platforms; + platforms = stdenv.lib.platforms.linux; }; }); diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 8eaaeeed943..6b07a54a512 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -67,7 +67,7 @@ let else []; /* Common platform groups on which to test packages. */ - inherit (pkgs.lib.platforms) linux darwin cygwin allBut all; + inherit (pkgs.lib.platforms) linux darwin cygwin allBut all mesaPlatforms; /* Platform groups for specific kinds of applications. */ x11Supported = linux; @@ -119,7 +119,7 @@ in { cksfv = all; classpath = linux; cmake = all; - compiz = linux; + #compiz = linux; consolekit = linux; coreutils = all; cpio = all; @@ -174,7 +174,7 @@ in { ghostscriptX = linux; gimp = linux; git = linux; - gitFull = linux; + #gitFull = linux; glibc = linux; glibcLocales = linux; glxinfo = linux; @@ -264,7 +264,7 @@ in { mcron = linux; mdadm = linux; mercurial = allBut "i686-cygwin"; - mesa = linux ++ darwin; + mesa = mesaPlatforms; midori = linux; mingetty = linux; mk = linux; @@ -322,7 +322,7 @@ in { python = allBut "i686-cygwin"; pythonFull = linux; sbcl = all; - qt3 = allBut "i686-cygwin"; + qt3 = linux; qt4 = linux; qt45 = linux; qt46 = linux; @@ -408,7 +408,7 @@ in { wireshark = linux; wirelesstools = linux; wpa_supplicant = linux; - wxGTK = all; + wxGTK = linux; x11_ssh_askpass = linux; xchm = linux; xfig = x11Supported; @@ -472,10 +472,6 @@ in { gtk = linux; }; - haskellPackages_ghc683 = { - ghc = ghcSupported; - }; - haskellPackages_ghc6102 = { ghc = ghcSupported; }; @@ -570,14 +566,6 @@ in { kernel = linux; }; - kernelPackages_2_6_31_zen = { - kernel = linux; - }; - - kernelPackages_2_6_31_zen_bfs = { - kernel = linux; - }; - kernelPackages_2_6_32 = { aufs = linux; kernel = linux; From e7906f26affbc36d99c67d99cd3e2c237d0f67fe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Feb 2010 14:14:43 +0000 Subject: [PATCH 4/7] * Make copy-tarballs.sh work on release.nix. svn path=/nixpkgs/trunk/; revision=19834 --- doc/release-notes.xml | 2 +- maintainers/scripts/copy-tarballs.sh | 2 +- maintainers/scripts/eval-release.nix | 20 ++++++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 maintainers/scripts/eval-release.nix diff --git a/doc/release-notes.xml b/doc/release-notes.xml index 0a57aa7da18..82a43c2887b 100644 --- a/doc/release-notes.xml +++ b/doc/release-notes.xml @@ -5,7 +5,7 @@ Nixpkgs Release Notes -
Release 0.13 (January NNN, 2010) +
Release 0.13 (February 5, 2010) As always, there are many changes. Some of the most important updates are: diff --git a/maintainers/scripts/copy-tarballs.sh b/maintainers/scripts/copy-tarballs.sh index 76ced8a01d9..c8f35710003 100755 --- a/maintainers/scripts/copy-tarballs.sh +++ b/maintainers/scripts/copy-tarballs.sh @@ -2,7 +2,7 @@ distDir=/data/webserver/tarballs -urls=$(nix-instantiate --eval-only --xml --strict pkgs/top-level/build-for-release.nix \ +urls=$(nix-instantiate --eval-only --xml --strict ./eval-release.nix \ | grep -A2 'name="urls"' \ | grep ' Date: Fri, 5 Feb 2010 14:55:37 +0000 Subject: [PATCH 5/7] * nixpkgs: new version of DBIx-Class-Schema-Loader svn path=/nixpkgs/trunk/; revision=19836 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b4b16609290..9155f8b7a9a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -888,10 +888,10 @@ rec { }; DBIxClassSchemaLoader = buildPerlPackage rec { - name = "DBIx-Class-Schema-Loader-0.04999_09"; + name = "DBIx-Class-Schema-Loader-0.05000"; src = fetchurl { url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; - sha256 = "1v4lqhjh9b6wwd8rayxmvr4nq44z5yffl5jkfccyhcp8lp84ysmf"; + sha256 = "00lwggmwfwi3qbsx9jl5kdi5aszflpiggvksinmsam6sfyfpz2rq"; }; propagatedBuildInputs = [ DBI DBDSQLite DataDump UNIVERSALrequire From 8c8631d9749843b1be9fb524c7b92fc05dd577b1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Feb 2010 19:22:26 +0000 Subject: [PATCH 6/7] * Don't set `platforms' on Google Earth because we don't want Hydra to build it. svn path=/nixpkgs/trunk/; revision=19839 --- pkgs/applications/misc/googleearth/default.nix | 3 +-- pkgs/top-level/all-packages.nix | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 0d4b5fd03fb..550a7666b9d 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -68,7 +68,6 @@ stdenv.mkDerivation { description = "A world sphere viewer"; homepage = http://earth.google.com; license = "unfree"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ stdenv.lib.maintainers.viric ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a1979cc6ec..e03e90596c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7113,11 +7113,11 @@ let }; googleearth = import ../applications/misc/googleearth { - inherit stdenv fetchurl glibc mesa freetype zlib glib; - inherit (xlibs) libSM libICE libXi libXv libXrender libXrandr libXfixes - libXcursor libXinerama libXext libX11; - inherit patchelf05; - }; + inherit stdenv fetchurl glibc mesa freetype zlib glib; + inherit (xlibs) libSM libICE libXi libXv libXrender libXrandr libXfixes + libXcursor libXinerama libXext libX11; + inherit patchelf05; + }; gpsbabel = import ../applications/misc/gpsbabel { inherit fetchurl stdenv zlib expat; From aee659e1e20d6571ef40d28740297554ecff6255 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Feb 2010 22:00:51 +0000 Subject: [PATCH 7/7] * Fix various broken URLs / mirrors. * Updated tcpdump, ImageMagick, lsof. svn path=/nixpkgs/trunk/; revision=19847 --- .../graphics/ImageMagick/default.nix | 4 +- pkgs/build-support/fetchurl/mirrors.nix | 37 +++---------------- pkgs/development/libraries/glefw/default.nix | 4 +- pkgs/development/libraries/glew/default.nix | 9 +++-- .../development/libraries/libpcap/default.nix | 25 +++++-------- .../libraries/tk/{8.5.7.nix => default.nix} | 0 pkgs/development/tools/misc/lsof/default.nix | 10 ++--- pkgs/tools/networking/tcpdump/default.nix | 10 ++--- .../tools/package-management/dpkg/default.nix | 6 +-- pkgs/top-level/all-packages.nix | 6 +-- 10 files changed, 39 insertions(+), 72 deletions(-) rename pkgs/development/libraries/tk/{8.5.7.nix => default.nix} (100%) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 08386806815..57c236297d8 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,13 +1,13 @@ args: with args; -let version = "6.5.5-6"; in +let version = "6.5.9-1"; in stdenv.mkDerivation (rec { name = "ImageMagick-${version}"; src = fetchurl { url = "mirror://imagemagick/${name}.tar.bz2"; - sha256 = "1037nsvfpw7wdgsvvzvi0bn1n5d667d8aj1xam7zgmf7xi6xha3q"; + sha256 = "0a4yhhfqagz28yccydngi31050101jfmq5ljln61g69yy6m47ifg"; }; configureFlags = '' diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 88f4e064fa1..71f1eae86f9 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -141,31 +141,12 @@ rec { http://bitlbee.intergenia.de/ ]; - # ImageMagick mirrors, see http://www.imagemagick.org/script/download.php . + # ImageMagick mirrors, see http://www.imagemagick.org/script/download.php. imagemagick = [ - ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ - ftp://ftp.carnet.hr/pub/misc/imagemagick/ - ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick - http://imagemagick.linux-mirror.org/download - http://image_magick.veidrodis.com/image_magick/ - http://imagemagick.oss-mirror.org/download - ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/ - ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/imagemagick.org - ftp://zoffy.asahi-net.or.jp/pub/graphics/ImageMagick - http://ftp.nluug.nl/pub/ImageMagick - http://ftp.surfnet.nl/pub/ImageMagick/ - ftp://sunsite.icm.edu.pl/packages/ImageMagick/ - ftp://ftp.chg.ru/packages/ImageMagick - http://ftp.chg.ru/packages/ImageMagick - http://ftp.efair.ru/pub/software/graphics/ImageMagick/ - ftp://ftp.efair.ru/pub/software/graphics/ImageMagick/ - ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick - http://www.smudge-it.co.uk/pub/imagemagick/ - ftp://www.rx-host.net/pub/graphics/ImageMagick - ftp://ftp.fifi.org/pub/ImageMagick/ - ftp://ftp.imagemagick.org/pub/ImageMagick - ftp://ftp.imagemagick.net/pub/ImageMagick - http://imagemagick.site2nd.org/imagemagick + http://ftp.nluug.nl/pub/ImageMagick/ + ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ + ftp://ftp.imagemagick.org/pub/ImageMagick/ + ftp://ftp.imagemagick.net/pub/ImageMagick/ ]; # CPAN mirrors. @@ -238,14 +219,6 @@ rec { ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/ ]; - # Tcpdump (see http://www.tcpdump.org/mirrors.html). - tcpdump = [ - ftp://ftp.wiretapped.net/pub/security/packet-capture/tcpdump.org/ - ftp://mirror.aarnet.edu.au/pub/tcpdump/ - ftp://gd.tuwien.ac.at/infosys/security/tcpdump.org/ - ftp://ftp.gwdg.de/pub/misc/tcpdump/ - ]; - # X.org. xorg = [ http://xorg.freedesktop.org/releases/ diff --git a/pkgs/development/libraries/glefw/default.nix b/pkgs/development/libraries/glefw/default.nix index e58244cf818..bf4d0f504de 100644 --- a/pkgs/development/libraries/glefw/default.nix +++ b/pkgs/development/libraries/glefw/default.nix @@ -1,9 +1,10 @@ args: with args; + stdenv.mkDerivation { name = "glefw-2.6"; src = fetchurl { - url = http://prdownloads.sourceforge.net/glfw/glfw-2.6.tar.bz2; + url = mirror://sourceforge/glfw/glfw-2.6.tar.bz2; sha256 = "1jnz7szax7410qrkiwkvq34sxy11w46ybyqbkaczdyvqas6cm1hv"; }; @@ -13,6 +14,7 @@ stdenv.mkDerivation { ensureDir $out make x11-install PREFIX=$out ''; + installPhase=":"; meta = { diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index ff3baabe339..d53d011faba 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,18 +1,19 @@ args: with args; + stdenv.mkDerivation { name = "glew-1.5.2"; src = fetchurl { - url = http://dfn.dl.sourceforge.net/sourceforge/glew/glew-1.5.2.tgz; + url = mirror://sourceforge/glew/glew-1.5.2.tgz; sha256 = "0dh5wpfq7aaldkiwcqmm9w59c2qcglkjv8zazmnm8n5771n3caj8"; }; buildInputs = [mesa x11 libXmu libXi]; meta = { - description = "cross-platform open-source C/C++ extension loading library"; - homepage = http://glew.sourceforge.net/; - license = ["BSD" "GLX" "SGI-B" "GPL2"]; # License description copied from gentoo-1.4.0 + description = "cross-platform open-source C/C++ extension loading library"; + homepage = http://glew.sourceforge.net/; + license = ["BSD" "GLX" "SGI-B" "GPL2"]; # License description copied from gentoo-1.4.0 }; installPhase="GLEW_DEST=\$out make install"; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 5dbbf010be8..fbd73230d73 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,23 +1,18 @@ -{stdenv, fetchurl, flex, bison}: +{ stdenv, fetchurl, flex, bison }: stdenv.mkDerivation rec { name = "libpcap-1.0.0"; + src = fetchurl { - url = [ - "mirror://tcpdump/release/${name}.tar.gz" - "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz" - ]; - sha256 = "1h3kmj485qz1i08xs4sc3a0bmhs1rvq0h7gycs7paap2szhw8552"; + url = "http://www.tcpdump.org/release/${name}.tar.gz"; + sha256 = "1h3kmj485qz1i08xs4sc3a0bmhs1rvq0h7gycs7paap2szhw8552"; }; - buildInputs = [flex bison]; - configureFlags = [ - "${if stdenv.system == "i686-linux" then "--with-pcap=linux" else ""}" - "--with-pcap=linux" - ]; + + buildInputs = [ flex bison ]; + + configureFlags = "--with-pcap=linux"; preInstall = ''ensureDir $out/bin''; - patches = if stdenv.system == "i686-linux" - then [] - else [ ./libpcap_amd64.patch ]; - + + patches = [ ./libpcap_amd64.patch ]; } diff --git a/pkgs/development/libraries/tk/8.5.7.nix b/pkgs/development/libraries/tk/default.nix similarity index 100% rename from pkgs/development/libraries/tk/8.5.7.nix rename to pkgs/development/libraries/tk/default.nix diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 8d793d5004e..08539d2aa94 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -1,15 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "lsof-4.81"; + name = "lsof-4.83"; src = fetchurl { - urls = [ - http://ftp.uni-bayreuth.de/packages/tools/lsof/lsof_4.81.tar.bz2 - ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.81.tar.bz2 - ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/lsof_4.81.tar.bz2 - ]; - sha256 = "1fcamd8qpczgb3kz9b2rhflbq6lyd3lic4i7xl7n99fx76ha1n19"; + url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.83.tar.bz2; + sha256 = "0i7mn4ygmrf0rvxz5vgzhmr8q7bhxrh9h2q7rpip1f9npq5r77xq"; }; unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 0b1937e76af..b7b00599616 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, libpcap}: +{ stdenv, fetchurl, libpcap }: stdenv.mkDerivation rec { - name = "tcpdump-3.9.4"; + name = "tcpdump-4.0.0"; src = fetchurl { - url = "mirror://tcpdump/release/${name}.tar.gz"; - sha256 = "1dbknf6ys7n3mmlb6klr0jh0jgnnq3zd9y44kjdxcbmbdjhp1rvy"; + url = "http://www.tcpdump.org/release/${name}.tar.gz"; + sha256 = "112j0d12l5zsq56akn4n23i98pwblfb7qhblk567ddbl0bz9xsaz"; }; - buildInputs = [libpcap]; + buildInputs = [ libpcap ]; meta = { description = "tcpdump, a famous network sniffer"; diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 2d8adc1350a..e10abe9ac81 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl, zlib, bzip2}: stdenv.mkDerivation { - name = "dpkg-1.14.25"; + name = "dpkg-1.14.28"; src = fetchurl { - url = mirror://debian/pool/main/d/dpkg/dpkg_1.14.25.tar.gz; - sha256 = "1111r1ijyh149h7vby9vc8137hl9778ja3dln7ilkxhc1y1yjp2l"; + url = mirror://debian/pool/main/d/dpkg/dpkg_1.14.28.tar.gz; + sha256 = "1k3h1rv2qd6ha6mpifhjkpasd4dzr8l45jvc49p7fldqm4nzyixc"; }; configureFlags = "--without-dselect --with-admindir=/var/lib/dpkg"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e03e90596c5..ef20e3cc560 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4727,7 +4727,7 @@ let inherit stdenv fetchurl cmake qt4; }; - tk = import ../development/libraries/tk/8.5.7.nix { + tk = import ../development/libraries/tk { inherit fetchurl stdenv tcl x11; }; @@ -8579,8 +8579,8 @@ let }; foldingathome = import ../misc/foldingathome { - inherit fetchurl stdenv; - }; + inherit fetchurl stdenv; + }; freestyle = import ../misc/freestyle { inherit fetchurl freeglut qt4 libpng lib3ds libQGLViewer swig;