Author: urkud
Date: Fri Jan 27 16:43:39 2012
New Revision: 31887
URL: https://nixos.org/websvn/nix/?rev=31887&sc=1
Log:
svn merge ^/nixpkgs/trunk
Deleted:
nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch
Modified:
nixpkgs/branches/stdenv-updates/ (props changed)
nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/gdb/default.nix
nixpkgs/branches/stdenv-updates/pkgs/misc/tex/texlive/moderncv.nix
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/nix/unstable.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix
Fri Jan 27 16:31:54 2012 (r31886)
+++ nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix
Fri Jan 27 16:43:39 2012 (r31887)
@@ -2,8 +2,6 @@
kde {
buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ];
- patches = [ ./kalzium-find-libfacile.patch ];
-
meta = {
description = "Periodic Table of Elements";
};
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/gdb/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/gdb/default.nix
Fri Jan 27 16:31:54 2012 (r31886)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/gdb/default.nix
Fri Jan 27 16:43:39 2012 (r31887)
@@ -14,7 +14,7 @@
basename =
if bleedingEdgeVersion
then "gdb-7.3.20110726"
- else "gdb-7.3.1";
+ else "gdb-7.4";
# Whether (cross-)building for GNU/Hurd. This is an approximation since
# having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and
@@ -40,7 +40,7 @@
url = "mirror://gnu/gdb/${basename}.tar.bz2";
# md5 is provided by the annoucement page
# http://www.gnu.org/s/gdb/download/ANNOUNCEMENT
- md5 = "b89a5fac359c618dda97b88645ceab47";
+ md5 = "95a9a8305fed4d30a30a6dc28ff9d060";
};
# I think python is not a native input, but I leave it
@@ -75,6 +75,8 @@
rm -v $out/share/info/{standards,configure,bfd}.info
'';
+ enableParallelBuilding = true;
+
# TODO: Investigate & fix the test failures.
doCheck = false;
Modified: nixpkgs/branches/stdenv-updates/pkgs/misc/tex/texlive/moderncv.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/misc/tex/texlive/moderncv.nix Fri Jan
27 16:31:54 2012 (r31886)
+++ nixpkgs/branches/stdenv-updates/pkgs/misc/tex/texlive/moderncv.nix Fri Jan
27 16:43:39 2012 (r31887)
@@ -3,7 +3,7 @@
name = "moderncv-2012.01.16";
src = fetchurl {
url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip";;
- sha256 =
"a9d2de7fc03c35c4084915b2788c8d7acfb695f9e27f6cd81427a7dd1a64cb54";
+ sha256 = "1sfpj76p0z128rvxw0svh7dfrvf3zhmi3v7bkzfkll4byij34ni0";
};
buildInputs = [texLive unzip];
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/nix/unstable.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/nix/unstable.nix
Fri Jan 27 16:31:54 2012 (r31886)
+++
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/nix/unstable.nix
Fri Jan 27 16:43:39 2012 (r31887)
@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "nix-1.0pre31729";
+ name = "nix-1.0pre31851";
src = fetchurl {
- url = "http://hydra.nixos.org/build/1867511/download/4/${name}.tar.bz2";;
- sha256 =
"c2e33d5837a686c42deaab1cfcf8ec0e13b0c841d936086d773a2415e4141d2d";
+ url = "http://hydra.nixos.org/build/1937677/download/4/${name}.tar.bz2";;
+ sha256 =
"36f07b6b701da74f07d8c8cc43044306e570b6837555ad523701d86e5f567568";
};
buildNativeInputs = [ perl pkgconfig ];
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Fri Jan
27 16:31:54 2012 (r31886)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Fri Jan
27 16:43:39 2012 (r31887)
@@ -3131,13 +3131,11 @@
uisp = callPackage ../development/tools/misc/uisp { };
gdb = callPackage ../development/tools/misc/gdb {
- readline = readline5;
hurd = gnu.hurdCross;
inherit (gnu) mig;
};
gdbCross = callPackage ../development/tools/misc/gdb {
- readline = readline5;
target = crossSystem;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
