Author: simons
Date: Thu Oct 6 10:27:33 2011
New Revision: 29685
URL: http://nixos.org/websvn/nix/?rev=29685&sc=1
Log:
synchronize with trunk
Deleted:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/cppunit/1.10.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/cppunit/include-cstdlib.patch
Modified:
nixpkgs/branches/stdenv-updates/ (props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/xscreensaver/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/xneur/0.8.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/icecat-4/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-wrapper/ (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/debian-build.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/nix-build.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/rpm-build.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/source-tarball.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.10.1.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.10.2.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.8.2.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.8.3.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/aterm/2.8.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/cppunit/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/fltk/fltk11.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.9/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/goocanvas/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pcre/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/readline/readline6.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/autoconf/2.13.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/gnum4/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/misc/tex/pgf/1.x.nix (props changed)
nixpkgs/branches/stdenv-updates/pkgs/misc/tex/pgf/2.x.nix (props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/atheros/r3867.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.25.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.28.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.29.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.33.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/libsmbios/default.nix
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/qemu-kvm/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/util-linux-ng/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/servers/mail/dovecot/1.1.1.nix (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/shells/bash/default.nix (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/make-bootstrap-tools.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/tools/networking/wget/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/cppunit/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/cppunit/default.nix
Thu Oct 6 10:23:31 2011 (r29684)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/cppunit/default.nix
Thu Oct 6 10:27:33 2011 (r29685)
@@ -2,9 +2,16 @@
stdenv.mkDerivation {
name = "cppunit-1.12.0";
-
+
src = fetchurl {
url = mirror://sf/cppunit/cppunit-1.12.0.tar.gz;
sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq";
};
+
+ meta = {
+ homepage = "http://sourceforge.net/apps/mediawiki/cppunit/";;
+ description = "C++ unit testing framework";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.simons ];
+ };
}
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/libsmbios/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/libsmbios/default.nix
Thu Oct 6 10:23:31 2011 (r29684)
+++
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/libsmbios/default.nix
Thu Oct 6 10:27:33 2011 (r29685)
@@ -1,13 +1,16 @@
{ stdenv, fetchurl, pkgconfig, libxml2, perl }:
-stdenv.mkDerivation rec {
- name = "libsmbios-2.2.19";
+let
+ name = "libsmbios-2.2.28";
+in
+stdenv.mkDerivation {
+ inherit name;
src = fetchurl {
url =
"http://linux.dell.com/libsmbios/download/libsmbios/${name}/${name}.tar.gz";;
- sha256 = "0f4wnjml734ssg583r448ypax7vf3f9n8gybzvzg170lc3byayhv";
+ sha256 = "03m0n834w49acwbf5cf9ync1ksnn2jkwaysvy7584y60qpmngb91";
};
-
+
buildInputs = [ pkgconfig libxml2 perl ];
# It tries to install some Python stuff even when Python is disabled.
@@ -16,13 +19,16 @@
# It forgets to install headers.
postInstall =
''
- cp -a src/include/* $out/include
- cp -a out/public-include/* $out/include
- ''; # */
+ cp -va "src/include/"* "$out/include/"
+ cp -va "out/public-include/"* "$out/include/"
+ '';
meta = {
- homepage = http://linux.dell.com/libsmbios/main/index.html;
- description = "A library to obtain BIOS information";
- license = "GPLv2+"; # alternatively, under the Open Software License
version 2.1
+ homepage = "http://linux.dell.com/libsmbios/main";;
+ description = "a library to obtain BIOS information";
+ license = stdenv.lib.licenses.gpl2Plus; # alternatively, under the Open
Software License version 2.1
+
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.simons ];
};
}
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Thu Oct
6 10:23:31 2011 (r29684)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Thu Oct
6 10:27:33 2011 (r29685)
@@ -3178,7 +3178,6 @@
ctl = callPackage ../development/libraries/ctl { };
cppunit = callPackage ../development/libraries/cppunit { };
- cppunit_1_10 = callPackage ../development/libraries/cppunit/1.10.nix { };
cracklib = callPackage ../development/libraries/cracklib { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
