public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge ^/nixpkgs/trunk

Browse Source 
I need the latest KDE-related changes

svn path=/nixpkgs/branches/stdenv-updates/; revision=32806
This commit is contained in:
Yury G. Kudryashov
2012-03-05 21:01:47 +00:00
parent f99db36748 296eff8fbd
commit b7642bfdfb
14 changed files with 65 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/exiv2/default.nix
View File

@@ -1,11 +1,11 @@
{stdenv, fetchurl, zlib, expat}:
stdenv.mkDerivation rec {
name = "exiv2-0.21";
name = "exiv2-0.22";
src = fetchurl {
url = "http://www.exiv2.org/${name}.tar.gz";
sha256 = "1r9phzb1h9v8smw1pix2k9lyr44n4nyba15x7qh45c0pwsjdf9yq";
sha256 = "0ynf4r4fqijaa9yb0wfddk0a151p8cbcqxab54dyhc1xk83saf6k";
};
propagatedBuildInputs = [zlib expat];

12
pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
View File

@@ -1,15 +1,17 @@
{ cabal, HDBC, mtl, parsec, postgresql, time, utf8String }:
{ cabal, convertible, HDBC, mtl, parsec, postgresql, time
, utf8String
}:
cabal.mkDerivation (self: {
pname = "HDBC-postgresql";
version = "2.3.2.0";
sha256 = "0fwza9h2ghl70x44c4snfybnnfsj1mwlf5a1x12ddl1fbj6fx6gs";
version = "2.3.2.1";
sha256 = "1ji10w4d91dp3ci7pn1jd8nb3wasszwlsy1lfbb4mqnr15c9vnpb";
isLibrary = true;
isExecutable = true;
buildDepends = [ HDBC mtl parsec time utf8String ];
buildDepends = [ convertible HDBC mtl parsec time utf8String ];
extraLibraries = [ postgresql ];
meta = {
homepage = "http://software.complete.org/hdbc-postgresql";
homepage = "http://github.com/hdbc/hdbc-postgresql";
description = "PostgreSQL driver for HDBC";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

4
pkgs/development/libraries/haskell/HsOpenSSL/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "HsOpenSSL";
version = "0.10.1.2";
sha256 = "0najn3749s6jxqavpxw7q58jzsvli06sxjgkvs3lidasv6jhwmxh";
version = "0.10.1.3";
sha256 = "0r6gns729nfaxlig0sxlal5cx4ipyjk62zrmwn5i1i7lighp10y0";
buildDepends = [ network time ];
extraLibraries = [ openssl ];
meta = {

4
pkgs/development/libraries/haskell/happstack/happstack-server.nix
View File

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "happstack-server";
version = "6.6.3";
sha256 = "0l1cv1syx1j8xvy5sjl6cj7l4zyizkmv6z8g038n8fwgsw130hm9";
version = "6.6.4";
sha256 = "1bdgazyrin7flfqi5ix8pp3ldisb101s4p8539h19xc8jw22x6sk";
isLibrary = true;
isExecutable = true;
buildDepends = [

18
pkgs/development/libraries/haskell/hledger-web/default.nix
View File

@@ -1,23 +1,23 @@
{ cabal, aeson, blazeHtml, cabalFileTh, clientsession, cmdargs
, dataObject, dataObjectYaml, failure, fileEmbed, filepath, hamlet
, hledger, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe
, shakespeareCss, shakespeareJs, shakespeareText, text, time
, transformers, wai, waiExtra, warp, yesod, yesodCore, yesodForm
, yesodJson, yesodStatic
, hledger, hledgerLib, httpEnumerator, HUnit, ioStorage, parsec
, regexpr, safe, shakespeareCss, shakespeareJs, shakespeareText
, text, time, tlsExtra, transformers, wai, waiExtra, warp, yesod
, yesodCore, yesodForm, yesodJson, yesodStatic
}:
cabal.mkDerivation (self: {
pname = "hledger-web";
version = "0.17";
sha256 = "1b5k76p27pvxc91gns3aimy3zcy6m366nnpwzbm214v6ka82imfi";
version = "0.17.1";
sha256 = "0cix0k2skbrcbjhj876cx4mizjvkqnr91s092a3lg4rv40dhgwa9";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson blazeHtml cabalFileTh clientsession cmdargs dataObject
dataObjectYaml failure fileEmbed filepath hamlet hledger hledgerLib
HUnit ioStorage parsec regexpr safe shakespeareCss shakespeareJs
shakespeareText text time transformers wai waiExtra warp yesod
yesodCore yesodForm yesodJson yesodStatic
httpEnumerator HUnit ioStorage parsec regexpr safe shakespeareCss
shakespeareJs shakespeareText text time tlsExtra transformers wai
waiExtra warp yesod yesodCore yesodForm yesodJson yesodStatic
];
meta = {
homepage = "http://hledger.org";

4
pkgs/development/libraries/haskell/persistent/default.nix
View File

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "persistent";
version = "0.8.0.1";
sha256 = "1lsmsx0zxa3h83z29r6h3r94czg7c8apid9mah48f8hxlfynbqhi";
version = "0.8.0.2";
sha256 = "10v11fnx7dhj2gg09k3ji054iywbpazs789vhfxn56wfg6rz59wb";
buildDepends = [
aeson attoparsec base64Bytestring blazeHtml conduit liftedBase
monadControl mtl pathPieces poolConduit text time transformers

4
pkgs/development/libraries/haskell/system-fileio/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "system-fileio";
version = "0.3.5";
sha256 = "0d1baliykfpg15bzknx98slr0qa5yjr3va3w8hs02wgx6sp3wsy2";
version = "0.3.7";
sha256 = "0vjjpn3fq0s2assfg3p3wpk60jsrjp1f6i0djm3abdbmc53gqyi0";
buildDepends = [ systemFilepath text time ];
meta = {
homepage = "https://john-millikin.com/software/haskell-filesystem/";

10
pkgs/development/libraries/haskell/xml-conduit/default.nix
View File

@@ -1,16 +1,16 @@
{ cabal, attoparsec, attoparsecConduit, blazeBuilder
, blazeBuilderConduit, conduit, dataDefault, failure
, blazeBuilderConduit, conduit, dataDefault, failure, monadControl
, systemFilepath, text, transformers, xmlTypes
}:
cabal.mkDerivation (self: {
pname = "xml-conduit";
version = "0.5.3";
sha256 = "09jphn19g6v9z1b75iyqcdyn75n7inbhib8g9fgfzwd7q8rdd3yc";
version = "0.5.3.1";
sha256 = "124c88x3ww1414c7s3wx7z1kqy37m9mwihiwyamgz25lg502n8gb";
buildDepends = [
attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
conduit dataDefault failure systemFilepath text transformers
xmlTypes
conduit dataDefault failure monadControl systemFilepath text
transformers xmlTypes
];
meta = {
homepage = "http://github.com/snoyberg/xml";

4
pkgs/development/libraries/libexif/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, gettext }:
stdenv.mkDerivation rec {
name = "libexif-0.6.19";
name = "libexif-0.6.20";
src = fetchurl {
url = "mirror://sourceforge/libexif/${name}.tar.bz2";
sha256 = "1gfa07bzs2lk0n887f1lvz5b9a7abyc3f5zaf39w4sf23hk9axpr";
sha256 = "05fphfmgrni6838v0lkcqv88fbw7r1mdw3ypy3bh567vv05x4wm7";
};
buildInputs = [ gettext ];

20
pkgs/development/libraries/libexif/no-po.patch
View File

@@ -1,20 +0,0 @@
diff -rc libexif-0.6.14/Makefile.in libexif-0.6.14.new/Makefile.in
*** libexif-0.6.14/Makefile.in 2007-05-10 17:14:58.000000000 +0200
--- libexif-0.6.14.new/Makefile.in 2007-05-13 23:04:05.000000000 +0200
***************
*** 224,230 ****
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
! SUBDIRS = m4m po libexif test doc binary
@SHIP_BINARIES_TRUE@README_W32_XDIST = README-Win32.txt
EXTRA_DIST = @PACKAGE_TARNAME@.spec autogen.sh $(README_W32_XDIST)
ACLOCAL_AMFLAGS = -I auto-m4 -I m4m
--- 224,230 ----
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
! SUBDIRS = m4m libexif test binary
@SHIP_BINARIES_TRUE@README_W32_XDIST = README-Win32.txt
EXTRA_DIST = @PACKAGE_TARNAME@.spec autogen.sh $(README_W32_XDIST)
ACLOCAL_AMFLAGS = -I auto-m4 -I m4m