Author: urkud
Date: Fri Jan 27 17:49:20 2012
New Revision: 31888
URL: https://nixos.org/websvn/nix/?rev=31888&sc=1
Log:
svn merge ^/nixpkgs/trunk
Added:
nixpkgs/branches/libpng15/pkgs/applications/graphics/k3d/
- copied from r31887, nixpkgs/trunk/pkgs/applications/graphics/k3d/
nixpkgs/branches/libpng15/pkgs/applications/graphics/openscad/
- copied from r31887, nixpkgs/trunk/pkgs/applications/graphics/openscad/
nixpkgs/branches/libpng15/pkgs/development/libraries/CGAL/
- copied from r31887, nixpkgs/trunk/pkgs/development/libraries/CGAL/
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/pool-conduit/
- copied from r31887,
nixpkgs/trunk/pkgs/development/libraries/haskell/pool-conduit/
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/resource-pool/
- copied from r31887,
nixpkgs/trunk/pkgs/development/libraries/haskell/resource-pool/
nixpkgs/branches/libpng15/pkgs/development/libraries/opencsg/
- copied from r31887, nixpkgs/trunk/pkgs/development/libraries/opencsg/
nixpkgs/branches/libpng15/pkgs/development/tools/parsing/ebnf2ps/
- copied from r31887,
nixpkgs/trunk/pkgs/development/tools/parsing/ebnf2ps/
Deleted:
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch
Modified:
nixpkgs/branches/libpng15/ (props changed)
nixpkgs/branches/libpng15/pkgs/applications/networking/newsreaders/kwooty/default.nix
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/default.nix
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/l10n/default.nix
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/support/akonadi/default.nix
nixpkgs/branches/libpng15/pkgs/development/compilers/sbcl/src-for-default.nix
nixpkgs/branches/libpng15/pkgs/development/interpreters/ruby/rubygems.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/glew/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/fclabels/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/ghc-mod/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/hakyll/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/pool/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/hwloc/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/java/smack/default.nix
nixpkgs/branches/libpng15/pkgs/development/tools/haskell/hlint/default.nix
nixpkgs/branches/libpng15/pkgs/development/tools/misc/gdb/default.nix
nixpkgs/branches/libpng15/pkgs/misc/tex/texlive/moderncv.nix
nixpkgs/branches/libpng15/pkgs/os-specific/linux/bluez/default.nix
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-3.2.nix
nixpkgs/branches/libpng15/pkgs/servers/xmpp/ejabberd/default.nix
nixpkgs/branches/libpng15/pkgs/tools/package-management/nix/unstable.nix
nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
nixpkgs/branches/libpng15/pkgs/top-level/haskell-packages.nix
Modified:
nixpkgs/branches/libpng15/pkgs/applications/networking/newsreaders/kwooty/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/applications/networking/newsreaders/kwooty/default.nix
Fri Jan 27 16:43:39 2012 (r31887)
+++
nixpkgs/branches/libpng15/pkgs/applications/networking/newsreaders/kwooty/default.nix
Fri Jan 27 17:49:20 2012 (r31888)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gcc, cmake, qt4, gettext
+{ stdenv, fetchurl, cmake, qt4, gettext
, kdelibs, kdebase_workspace, perl
, openssl, phonon, automoc4
, libX11, libXext, libXft
@@ -27,7 +27,7 @@
'';
buildInputs =
- [ gcc perl cmake qt4 gettext automoc4 openssl
+ [ stdenv perl cmake qt4 gettext automoc4 openssl
kdelibs kdebase_workspace phonon
libX11 libXext libXft
];
Modified: nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/default.nix Fri Jan 27
16:43:39 2012 (r31887)
+++ nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/default.nix Fri Jan 27
17:49:20 2012 (r31888)
@@ -52,5 +52,8 @@
full = stdenv.lib.attrValues kde.modules;
- l10n = callPackage ./l10n { inherit release; };
+ l10n = callPackage ./l10n {
+ inherit release;
+ inherit (kde.manifest) stable;
+ };
}
Modified: nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix Fri Jan
27 16:43:39 2012 (r31887)
+++ nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix Fri Jan
27 17:49:20 2012 (r31888)
@@ -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/libpng15/pkgs/desktops/kde-4.8/l10n/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/l10n/default.nix Fri Jan
27 16:43:39 2012 (r31887)
+++ nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/l10n/default.nix Fri Jan
27 17:49:20 2012 (r31888)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kdelibs, gettext, release }:
+{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
let
@@ -11,7 +11,7 @@
name = "kde-l10n-${saneName}-${release}";
src = fetchurl {
- url =
"mirror://kde/unstable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2";
+ url = "mirror://kde/${if stable then "" else
"un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2";
name = "${name}.tar.bz2";
inherit sha256;
};
Modified:
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/support/akonadi/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/support/akonadi/default.nix
Fri Jan 27 16:43:39 2012 (r31887)
+++ nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/support/akonadi/default.nix
Fri Jan 27 17:49:20 2012 (r31888)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4,
soprano }:
stdenv.mkDerivation rec {
- name = "akonadi-1.6.90";
+ name = "akonadi-1.7.0";
src = fetchurl {
url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
- sha256 = "0a35wkrrdk4k7kw1d4rvq4w4wwlmz9vk2nb4c2yibpn9rmc6ighn";
+ sha256 = "105mjr6n1g6kl0djp2l8jr8b7j4s9gy2ls43g1wf3py1hf6j5fdz";
};
buildInputs = [ qt4 soprano libxslt boost ];
Modified:
nixpkgs/branches/libpng15/pkgs/development/compilers/sbcl/src-for-default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/compilers/sbcl/src-for-default.nix
Fri Jan 27 16:43:39 2012 (r31887)
+++
nixpkgs/branches/libpng15/pkgs/development/compilers/sbcl/src-for-default.nix
Fri Jan 27 17:49:20 2012 (r31888)
@@ -1,9 +1,9 @@
rec {
- version="1.0.54";
- name="sbcl-1.0.54";
- hash="1ip13hz5zsys3vy68y3x0fapxs87xk0gqi6bdp68vyznz2a0v1cd";
-
url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.54/sbcl-1.0.54-source.tar.bz2";;
-
advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.54/sbcl-1.0.54-source.tar.bz2";;
+ version="1.0.55";
+ name="sbcl-1.0.55";
+ hash="1b87s99d000khjpg8i7bcp28mph8812axwfh64a6qarhkixnl8g3";
+
url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.55/sbcl-1.0.55-source.tar.bz2";;
+
advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.55/sbcl-1.0.55-source.tar.bz2";;
}
Modified:
nixpkgs/branches/libpng15/pkgs/development/interpreters/ruby/rubygems.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/interpreters/ruby/rubygems.nix
Fri Jan 27 16:43:39 2012 (r31887)
+++ nixpkgs/branches/libpng15/pkgs/development/interpreters/ruby/rubygems.nix
Fri Jan 27 17:49:20 2012 (r31888)
@@ -1,10 +1,10 @@
args : with args;
rec {
- version = "1.8.10";
+ version = "1.8.15";
src = fetchurl {
url = "http://production.cf.rubygems.org/rubygems/${name}.tgz";;
- sha256 = "0ll5swf4mi4nbgnr5jcyzmnlwb1zr2md9kvsgy3d1f485bb1n59q";
+ sha256 = "0crfdaxpcv13x40mb0ccm5n0r3dknw7w7xl87icj99kyqmfx8k51";
};
buildInputs = [ruby makeWrapper];
Modified: nixpkgs/branches/libpng15/pkgs/development/libraries/glew/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/libraries/glew/default.nix
Fri Jan 27 16:43:39 2012 (r31887)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/glew/default.nix
Fri Jan 27 17:49:20 2012 (r31888)
@@ -1,16 +1,20 @@
{ stdenv, fetchurl, mesa, x11, libXmu, libXi }:
-stdenv.mkDerivation {
- name = "glew-1.5.2";
+stdenv.mkDerivation rec {
+ name = "glew-1.7.0";
src = fetchurl {
- url = mirror://sourceforge/glew/glew-1.5.2.tgz;
- sha256 = "0dh5wpfq7aaldkiwcqmm9w59c2qcglkjv8zazmnm8n5771n3caj8";
+ url = "mirror://sourceforge/glew/${name}.tgz";
+ sha256 = "02aw6sc4v1434m7awfcxqb0v987i2ykg3fncnp21i9g1n4zsclqn";
};
buildInputs = [ mesa x11 libXmu libXi ];
- installPhase = "GLEW_DEST=\$out make install";
+ installPhase = "
+ GLEW_DEST=\$out make install
+ mkdir -pv \$out/share/doc/glew
+ cp -r README.txt LICENSE.txt doc \$out/share/doc/glew
+ ";
meta = {
description = "Cross-platform open-source C/C++ extension loading library";
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/fclabels/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/fclabels/default.nix
Fri Jan 27 16:43:39 2012 (r31887)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/fclabels/default.nix
Fri Jan 27 17:49:20 2012 (r31888)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "fclabels";
- version = "1.1.0.1";
- sha256 = "0nzqx1d4hwailfkcb9g03hagws9j6valqd5yp7972kmhbq0c8h3s";
+ version = "1.1.0.2";
+ sha256 = "19p3ghjmc6jrgzifm5vrsd3cp5xmccw811zczcmsk1xjr4ady95r";
buildDepends = [ mtl transformers ];
meta = {
description = "First class accessor labels";
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/ghc-mod/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/ghc-mod/default.nix
Fri Jan 27 16:43:39 2012 (r31887)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/ghc-mod/default.nix
Fri Jan 27 17:49:20 2012 (r31888)
@@ -1,4 +1,4 @@
-{ cabal, attoparsec, attoparsecEnumerator, ghcPaths, hlint, regexPosix, emacs,
emacs23Packages }:
+{ cabal, attoparsec, attoparsecEnumerator, ghcPaths, hlint, regexPosix,
emacsPackages }:
cabal.mkDerivation (self: {
pname = "ghc-mod";
@@ -7,8 +7,7 @@
buildDepends = [
attoparsec attoparsecEnumerator ghcPaths hlint regexPosix
];
-# buildTools = [emacs emacs23];
- propagatedBuildInputs = [emacs emacs23Packages.haskellMode];
+ propagatedBuildInputs = [emacsPackages.emacs emacsPackages.haskellMode];
isExecutable = true;
postInstall = ''
cd $out/share/$pname-$version
@@ -20,11 +19,14 @@
'';
meta = {
+ homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";;
description = "Happy Haskell programming on Emacs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
+ self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.bluescreen303
+ self.stdenv.lib.maintainers.simons
];
};
})
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/hakyll/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/hakyll/default.nix
Fri Jan 27 16:43:39 2012 (r31887)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/hakyll/default.nix
Fri Jan 27 17:49:20 2012 (r31888)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "hakyll";
- version = "3.2.4.1";
- sha256 = "0ijym3k8f9za6cd1dnf8qx0jk85r5kz4f8gy7bn50jclcslnfl0n";
+ version = "3.2.5.0";
+ sha256 = "1y1dqfbas7ym1jghq3i7zhqcny01paqfrszj0aakg6ys2jjx0m29";
buildDepends = [
binary blazeHtml citeprocHs cryptohash hamlet mtl pandoc parsec
regexBase regexPcre snapCore snapServer tagsoup time
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/pool/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/pool/default.nix
Fri Jan 27 16:43:39 2012 (r31887)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/pool/default.nix
Fri Jan 27 17:49:20 2012 (r31888)
@@ -2,12 +2,12 @@
cabal.mkDerivation (self: {
pname = "pool";
- version = "0.1.2";
- sha256 = "05lrinyk9gxdf67vwdav93ral2y8qsb33i9y5k91vlcjfp7w516q";
+ version = "0.1.2.1";
+ sha256 = "1fwwnwxk3kprr2z9y7bwa1qwxfkzwcb2n5l6vkq1c5s8gjls581c";
buildDepends = [ monadControl transformers ];
meta = {
homepage = "http://www.yesodweb.com/book/persistent";;
- description = "Thread-safe resource pools";
+ description = "Thread-safe resource pools. (deprecated)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
Modified: nixpkgs/branches/libpng15/pkgs/development/libraries/hwloc/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/libraries/hwloc/default.nix
Fri Jan 27 16:43:39 2012 (r31887)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/hwloc/default.nix
Fri Jan 27 17:49:20 2012 (r31888)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11 }:
stdenv.mkDerivation rec {
- name = "hwloc-1.3";
+ name = "hwloc-1.4";
src = fetchurl {
- url =
"http://www.open-mpi.org/software/hwloc/v1.3/downloads/${name}.tar.bz2";;
- sha256 = "10zlz0hng7scjx1xn8jflx3gbga5djbhxhj94k5kszrivc8zh8xy";
+ url =
"http://www.open-mpi.org/software/hwloc/v1.4/downloads/${name}.tar.bz2";;
+ sha256 = "1qcii99vn65jwgqpq8d2k4sksk734kkg223p58ck7v76q27h288y";
};
# XXX: libX11 is not directly needed, but needed as a propagated dep of
Cairo.
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/java/smack/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/libraries/java/smack/default.nix
Fri Jan 27 16:43:39 2012 (r31887)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/java/smack/default.nix
Fri Jan 27 17:49:20 2012 (r31888)
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
- name = "smack-3_0_4";
+ name = "smack-3_2_1";
builder = ./builder.sh;
src = fetchurl {
- url =
http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_0_4.tar.gz;
- sha256 = "075nn7vwfjr2a9j6ycikkbssxhai82vpvll9123r83rar3ds3li6";
+ url =
http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_2_1.tar.gz;
+ sha256 = "0lljrxky66gc73caaflia2wgmlpry2cdj00bz1gd1vqrzd3pg3gd";
};
}
Modified:
nixpkgs/branches/libpng15/pkgs/development/tools/haskell/hlint/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/tools/haskell/hlint/default.nix
Fri Jan 27 16:43:39 2012 (r31887)
+++ nixpkgs/branches/libpng15/pkgs/development/tools/haskell/hlint/default.nix
Fri Jan 27 17:49:20 2012 (r31888)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hlint";
- version = "1.8.20";
- sha256 = "0nkvlvax2yv8lqq7axnghdw38fj6r44y78ss23yxqqav7q046vyh";
+ version = "1.8.21";
+ sha256 = "1vjl1qncxia9352469k9v28283f17xk0xhb28by6crchz596xln6";
isLibrary = true;
isExecutable = true;
buildDepends = [
Modified: nixpkgs/branches/libpng15/pkgs/development/tools/misc/gdb/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/tools/misc/gdb/default.nix
Fri Jan 27 16:43:39 2012 (r31887)
+++ nixpkgs/branches/libpng15/pkgs/development/tools/misc/gdb/default.nix
Fri Jan 27 17:49:20 2012 (r31888)
@@ -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/libpng15/pkgs/misc/tex/texlive/moderncv.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/misc/tex/texlive/moderncv.nix Fri Jan
27 16:43:39 2012 (r31887)
+++ nixpkgs/branches/libpng15/pkgs/misc/tex/texlive/moderncv.nix Fri Jan
27 17:49:20 2012 (r31888)
@@ -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/libpng15/pkgs/os-specific/linux/bluez/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/os-specific/linux/bluez/default.nix Fri Jan
27 16:43:39 2012 (r31887)
+++ nixpkgs/branches/libpng15/pkgs/os-specific/linux/bluez/default.nix Fri Jan
27 17:49:20 2012 (r31888)
@@ -9,11 +9,11 @@
in
stdenv.mkDerivation rec {
- name = "bluez-4.96";
+ name = "bluez-4.98";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${name}.tar.gz";
- sha256 = "16gshw7xgl0k3j3qgkdqmgvzqz6fdcna909ibvawl2brsw7xavy0";
+ sha256 =
"9a5b655bada7c7a1921cb3bac83b8a32bbe49893e4c7a1377cdc1b0d35f7d233";
};
buildInputs =
Modified: nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-3.2.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-3.2.nix
Fri Jan 27 16:43:39 2012 (r31887)
+++ nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-3.2.nix
Fri Jan 27 17:49:20 2012 (r31888)
@@ -214,7 +214,7 @@
import ./generic.nix (
rec {
- version = "3.2.1";
+ version = "3.2.2";
testing = false;
modDirVersion = version;
@@ -225,7 +225,7 @@
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/"
else ""}linux-${version}.tar.bz2";
- sha256 = "0kplzd61zblbsqzhggwk5lca0diqd8crhrd7d7jd6gc8jcyiwavy";
+ sha256 =
"9f20bd2332db32e2d5b0fc346762d486faab19e0dd059c82964116421bb7cceb";
};
config = configWithPlatform stdenv.platform;
Modified: nixpkgs/branches/libpng15/pkgs/servers/xmpp/ejabberd/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/servers/xmpp/ejabberd/default.nix Fri Jan
27 16:43:39 2012 (r31887)
+++ nixpkgs/branches/libpng15/pkgs/servers/xmpp/ejabberd/default.nix Fri Jan
27 17:49:20 2012 (r31888)
@@ -1,11 +1,11 @@
{stdenv, fetchurl, expat, erlang, zlib, openssl, pam, lib}:
stdenv.mkDerivation rec {
- version = "2.1.4";
- name = "ejabberd-2.1.4";
+ version = "2.1.10";
+ name = "ejabberd-2.1.10";
src = fetchurl {
- url =
http://www.process-one.net/downloads/ejabberd/2.1.4/ejabberd-2.1.4.tar.gz;
- sha256 =
"205ee09e38c57527cfa1a4be6ca664cec2e8c6b40eeffaac008735fcdc5e7527";
+ url =
http://www.process-one.net/downloads/ejabberd/2.1.10/ejabberd-2.1.10.tar.gz;
+ sha256 = "1gijv6d90w9fq0as2l0mp0fn65jihgd86nxry98pv6liks4fbhlx";
};
buildInputs = [ expat erlang zlib openssl pam ];
patchPhase = ''
Modified:
nixpkgs/branches/libpng15/pkgs/tools/package-management/nix/unstable.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/tools/package-management/nix/unstable.nix
Fri Jan 27 16:43:39 2012 (r31887)
+++ nixpkgs/branches/libpng15/pkgs/tools/package-management/nix/unstable.nix
Fri Jan 27 17:49:20 2012 (r31888)
@@ -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/libpng15/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Fri Jan 27
16:43:39 2012 (r31887)
+++ nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Fri Jan 27
17:49:20 2012 (r31888)
@@ -3154,13 +3154,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;
};
@@ -3266,6 +3264,8 @@
celt = callPackage ../development/libraries/celt {};
celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {};
+ cgal = callPackage ../development/libraries/CGAL {};
+
cgui = callPackage ../development/libraries/cgui {};
check = callPackage ../development/libraries/check { };
@@ -4412,6 +4412,8 @@
opencascade = callPackage ../development/libraries/opencascade { };
+ opencsg = callPackage ../development/libraries/opencsg { };
+
openct = callPackage ../development/libraries/openct { };
opencv = callPackage ../development/libraries/opencv {
@@ -5041,9 +5043,7 @@
dovecot_1_1_1 = callPackage ../servers/mail/dovecot/1.1.1.nix { };
dovecot_2_0 = callPackage ../servers/mail/dovecot/2.0.nix { };
- ejabberd = callPackage ../servers/xmpp/ejabberd {
- erlang = erlangR13B ;
- };
+ ejabberd = callPackage ../servers/xmpp/ejabberd { };
couchdb = callPackage ../servers/http/couchdb {
spidermonkey = spidermonkey_185;
@@ -5956,7 +5956,7 @@
linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor
linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34);
linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor
linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35);
linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor
linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36);
- linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor linux_3_2
pkgs.linuxPackages_3_2);
+ linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2
pkgs.linuxPackages_3_2);
linuxPackages_3_2_powertop = recurseIntoAttrs (linuxPackagesFor
linux_3_2_powertop pkgs.linuxPackages_3_2_powertop);
# The current default kernel / kernel modules.
@@ -7100,6 +7100,8 @@
jwm = callPackage ../applications/window-managers/jwm { };
+ k3d = callPackage ../applications/graphics/k3d {};
+
keepnote = callPackage ../applications/office/keepnote {
pygtk = pyGtkGlade;
};
@@ -7323,6 +7325,8 @@
neon = neon029;
};
+ openscad = callPackage ../applications/graphics/openscad {};
+
opera = callPackage ../applications/networking/browsers/opera {
inherit (pkgs.gtkLibs) gdk_pixbuf atk;
inherit (pkgs.kde4) kdelibs;
Modified: nixpkgs/branches/libpng15/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/top-level/haskell-packages.nix Fri Jan
27 16:43:39 2012 (r31887)
+++ nixpkgs/branches/libpng15/pkgs/top-level/haskell-packages.nix Fri Jan
27 17:49:20 2012 (r31888)
@@ -683,7 +683,9 @@
ghcEvents = callPackage ../development/libraries/haskell/ghc-events {};
- ghcMod = callPackage ../development/libraries/haskell/ghc-mod {};
+ ghcMod = callPackage ../development/libraries/haskell/ghc-mod {
+ emacsPackages = pkgs.emacs23Packages;
+ };
ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};
@@ -1076,6 +1078,8 @@
pool = callPackage ../development/libraries/haskell/pool {};
+ poolConduit = callPackage ../development/libraries/haskell/pool-conduit {};
+
ppm = callPackage ../development/libraries/haskell/ppm {};
prettyShow = callPackage ../development/libraries/haskell/pretty-show {};
@@ -1176,6 +1180,8 @@
repr = callPackage ../development/libraries/haskell/repr {};
+ resourcePool = callPackage ../development/libraries/haskell/resource-pool {};
+
RSA = callPackage ../development/libraries/haskell/RSA {};
safe = callPackage ../development/libraries/haskell/safe {};
@@ -1521,6 +1527,10 @@
cpphs = callPackage ../development/tools/misc/cpphs {};
+ ebnf2ps = callPackage ../development/tools/parsing/ebnf2ps {
+ inherit (pkgs) fetchurl;
+ };
+
frown = callPackage ../development/tools/parsing/frown {};
haddock_2_4_2 = callPackage
../development/tools/documentation/haddock/2.4.2.nix {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
