From c1c3317f6518acea4e02a8d5acfcb84fddb6696f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 17 Feb 2012 18:50:29 +0000 Subject: [PATCH 01/15] vigra: fix install svn path=/nixpkgs/trunk/; revision=32362 --- pkgs/development/libraries/vigra/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 93ed2869d0e..83b921dd49b 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -11,10 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ cmake fftw fftwSinglePrec libtiff libpng libjpeg python boost numpy hdf5 ]; - cmakeFlags = if (stdenv.system == "x86_64-linux") then - "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC" - else - ""; + preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\""; + cmakeFlags = stdenv.lib.optionals (stdenv.system == "x86_64-linux") + [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ]; meta = { description = "Novel computer vision C++ library with customizable algorithms and data structures"; From 453768b1cc646639b63fd2df54132b7f4d0ae6c8 Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Fri, 17 Feb 2012 18:55:36 +0000 Subject: [PATCH 02/15] kde-runtime requires libjpeg as buildInput. svn path=/nixpkgs/trunk/; revision=32363 --- pkgs/desktops/kde-4.7/kde-runtime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.7/kde-runtime.nix b/pkgs/desktops/kde-4.7/kde-runtime.nix index 96b6c3a1c78..d827802bb09 100644 --- a/pkgs/desktops/kde-4.7/kde-runtime.nix +++ b/pkgs/desktops/kde-4.7/kde-runtime.nix @@ -1,11 +1,11 @@ { kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica -, libcanberra, virtuoso, samba, ntrack +, libcanberra, virtuoso, samba, ntrack, libjpeg }: kde { buildInputs = [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica - samba (libcanberra.override { gtk = null; }) ntrack + samba (libcanberra.override { gtk = null; }) ntrack libjpeg ]; passthru.propagatedUserEnvPackages = [ virtuoso ]; From 2fb0d1c6c7bf18b3d7ecbfd0f89828ce8df3bd74 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 17 Feb 2012 20:33:15 +0000 Subject: [PATCH 03/15] Update ruby/rubygems svn path=/nixpkgs/trunk/; revision=32366 --- pkgs/development/interpreters/ruby/ruby-19.nix | 6 +++--- pkgs/development/interpreters/ruby/rubygems.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix index f47d0e524f7..c5c12831c0a 100644 --- a/pkgs/development/interpreters/ruby/ruby-19.nix +++ b/pkgs/development/interpreters/ruby/ruby-19.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { name = "ruby-${version}"; src = fetchurl { - url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.gz"; - sha256 = "0km3ryc0cs578982x6c3y3n3xr920grnpncmznb447snwd10149v"; + url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.bz2"; + sha256 = "09jmxz3lqsi5097233hc1wjnzg6z5f4y7kmlkqhskdaj6125jyn6"; }; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { passthru = rec { majorVersion = "1.9"; minorVersion = "3"; - patchLevel = "0"; + patchLevel = "125"; libPath = "lib/ruby/${majorVersion}"; gemPath = "lib/ruby/gems/${majorVersion}"; }; diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix index 4311c6ad5d4..40a43e27453 100644 --- a/pkgs/development/interpreters/ruby/rubygems.nix +++ b/pkgs/development/interpreters/ruby/rubygems.nix @@ -1,10 +1,10 @@ args : with args; rec { - version = "1.8.15"; + version = "1.8.17"; src = fetchurl { url = "http://production.cf.rubygems.org/rubygems/${name}.tgz"; - sha256 = "0crfdaxpcv13x40mb0ccm5n0r3dknw7w7xl87icj99kyqmfx8k51"; + sha256 = "068sr55r8wiw55bpf93pp07871cbqhxk9cxma6arhd04j7n8ppph"; }; buildInputs = [ruby makeWrapper]; From 86710c1fe6808a981e7a2420af802deb87a56d23 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 17 Feb 2012 21:40:14 +0000 Subject: [PATCH 04/15] Ruby gems: Install all dependent gems in the user environment svn path=/nixpkgs/trunk/; revision=32370 --- pkgs/development/interpreters/ruby/gem.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/interpreters/ruby/gem.nix b/pkgs/development/interpreters/ruby/gem.nix index 289f840aa04..a64f10e268c 100644 --- a/pkgs/development/interpreters/ruby/gem.nix +++ b/pkgs/development/interpreters/ruby/gem.nix @@ -40,6 +40,15 @@ let runHook postInstall ''; + + propagatedUserEnvPkgs = requiredGems; + postFixup = '' + if [ -n "$propagatedUserEnvPkgs" ]; then + mkdir -p "$out/nix-support" + echo "$propagatedUserEnvPkgs" > "$out/nix-support/propagated-user-env-packages" + fi + ''; + }; mb = stdenv.lib.maybeAttr; patchedGem = a: stdenv.mkDerivation (removeAttrs (stdenv.lib.mergeAttrsByFuncDefaults From 609b5589bcebd853ff2139295e33c9525f03f061 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 17 Feb 2012 21:51:06 +0000 Subject: [PATCH 05/15] rubygems will always conflict with ruby's 'gem' command, but if it's installed it should take precedence svn path=/nixpkgs/trunk/; revision=32372 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f58d340f16..25bb8c36f80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2787,7 +2787,7 @@ let rubygemsFun = ruby: builderDefsPackage (import ../development/interpreters/ruby/rubygems.nix) { inherit ruby makeWrapper; }; - rubygems = rubygemsFun ruby; + rubygems = hiPrio (rubygemsFun ruby); rq = callPackage ../applications/networking/cluster/rq { }; From 8096ed3b1252bb081e628f6eacd9d366c4ef77a4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Feb 2012 22:25:47 +0000 Subject: [PATCH 06/15] * man-pages updated to 3.35. svn path=/nixpkgs/trunk/; revision=32375 --- pkgs/data/documentation/man-pages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 1376a92c134..2e732e1acdb 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "man-pages-3.32"; + name = "man-pages-3.35"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.bz2"; - sha256 = "1qr1k6kgx7i4gni9w2h610k2aa2bqdk7p08bmqslfwrzpmkkiawn"; + sha256 = "186zn80k10jg1m4jp5x5x73f7cczydsjcw5zxc5d9lls5wvafp66"; }; preBuild = From e45be4fcafb60502ee5cf2f2afc62707e6d246fd Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 17 Feb 2012 22:34:46 +0000 Subject: [PATCH 07/15] Remove coffee-script rubygem A seeming bug the "nix" rubygem causes activesupport's dependencies to be set incorrectly when execjs is one of the relevant gems. I'll try to fix it, but until then IMO a working activesupport is more important than coffee-script svn path=/nixpkgs/trunk/; revision=32377 --- .../interpreters/ruby/generated.nix | 47 +------------------ 1 file changed, 2 insertions(+), 45 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index c518b46de78..921fc1b57d8 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -17,11 +17,8 @@ g: # Get dependencies from patched gems buildr = g.buildr_1_4_6; bundler = g.bundler_1_0_22; childprocess = g.childprocess_0_3_1; - coffee_script = g.coffee_script_2_2_0; - coffee_script_source = g.coffee_script_source_1_2_0; diff_lcs = g.diff_lcs_1_1_3; erubis = g.erubis_2_7_0; - execjs = g.execjs_1_3_0; ffi = g.ffi_1_0_11; highline = g.highline_1_5_1; hike = g.hike_1_2_1; @@ -63,7 +60,7 @@ g: # Get dependencies from patched gems tzinfo = g.tzinfo_0_3_31; xml_simple = g.xml_simple_1_0_12; }; - gem_nix_args = [ ''autotest-rails'' ''buildr'' ''coffee-script'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; + gem_nix_args = [ ''autotest-rails'' ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; gems = { ZenTest_4_6_2 = { basename = ''ZenTest''; @@ -158,7 +155,7 @@ installed versions.''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; name = ''activesupport-3.2.1''; - requiredGems = [ g.i18n_0_6_0 ]; + requiredGems = [ g.i18n_0_6_0 g.multi_json_1_0_4 ]; sha256 = ''0ajkzsa7467jp7lxgjcsl94nqkvw9d0h492rypljs0f8f1fn744v''; }; arel_3_0_0 = { @@ -278,34 +275,6 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ g.ffi_1_0_11 ]; sha256 = ''0phkpxvwz88kgbi4d2akiqbppf374kn2rwf64hfs99p1j1ksbw5l''; }; - coffee_script_2_2_0 = { - basename = ''coffee_script''; - meta = { - description = ''Ruby CoffeeScript Compiler''; - homepage = ''http://github.com/josh/ruby-coffee-script''; - longDescription = '' Ruby CoffeeScript is a bridge to the JS CoffeeScript compiler. -''; - }; - name = ''coffee-script-2.2.0''; - requiredGems = [ g.coffee_script_source_1_2_0 g.execjs_1_3_0 ]; - sha256 = ''133cp4znfp44wwnv12myw8s0z6qws74ilqmw88iwzkshg689zpdc''; - }; - coffee_script_source_1_2_0 = { - basename = ''coffee_script_source''; - meta = { - description = ''The CoffeeScript Compiler''; - homepage = ''http://jashkenas.github.com/coffee-script/''; - longDescription = '' CoffeeScript is a little language that compiles into JavaScript. - Underneath all of those embarrassing braces and semicolons, - JavaScript has always had a gorgeous object model at its heart. - CoffeeScript is an attempt to expose the good parts of JavaScript - in a simple way. -''; - }; - name = ''coffee-script-source-1.2.0''; - requiredGems = [ ]; - sha256 = ''13cpmlj2m5lyxipdxmnajy12bzwmgc6g2n090gpa0wd5am7xvhkp''; - }; diff_lcs_1_1_2 = { basename = ''diff_lcs''; meta = { @@ -365,18 +334,6 @@ is the MIT license.''; requiredGems = [ ]; sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3''; }; - execjs_1_3_0 = { - basename = ''execjs''; - meta = { - description = ''Run JavaScript code from Ruby''; - homepage = ''https://github.com/sstephenson/execjs''; - longDescription = '' ExecJS lets you run JavaScript code from Ruby. -''; - }; - name = ''execjs-1.3.0''; - requiredGems = [ g.multi_json_1_0_4 ]; - sha256 = ''1sski14wdzfljx2f9j7r09li3rxqwvink8n5v489ykw1sicg6l2s''; - }; ffi_1_0_11 = { basename = ''ffi''; meta = { From 2eb0d0f2464a3db8a2a0b0200ff713c16b7ba6d5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 18 Feb 2012 17:11:57 +0000 Subject: [PATCH 08/15] * Chatzilla updated to 0.9.88. svn path=/nixpkgs/trunk/; revision=32384 --- pkgs/applications/networking/irc/chatzilla/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix index 8ce73c69f3d..5d16c979f6a 100644 --- a/pkgs/applications/networking/irc/chatzilla/default.nix +++ b/pkgs/applications/networking/irc/chatzilla/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip, xulrunner, makeWrapper }: stdenv.mkDerivation rec { - name = "chatzilla-0.9.87"; + name = "chatzilla-0.9.88"; src = fetchurl { # Obtained from http://chatzilla.rdmsoft.com/xulrunner/. - url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.87-xr.zip; - sha256 = "1qwbqngrxyip3k2b71adg271sifvrrxcixkyrsy4vmgl5bwdsl4d"; + url = "http://chatzilla.rdmsoft.com/xulrunner/download/${name}-xr.zip"; + sha256 = "041jpjl7wnbhqm2f8bf2pwp6igjapmy74swac94h54n644wl5nz0"; }; buildInputs = [ unzip makeWrapper ]; From 5178c6fcc64ca1971b7caf8a39376d4072aa0fec Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 18 Feb 2012 18:47:42 +0000 Subject: [PATCH 09/15] * GNUcash updated to 2.4.10. svn path=/nixpkgs/trunk/; revision=32388 --- pkgs/applications/office/gnucash/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index a58c82e1b8b..a2c3ed5d6ba 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -8,15 +8,12 @@ * for a possible solution. */ -let - name = "gnucash-2.4.8"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + name = "gnucash-2.4.10"; src = fetchurl { url = "mirror://sourceforge/gnucash/${name}.tar.bz2"; - sha256 = "06gfgw4sq1b8c9qzinyd3wmcy3i0jyprngr259l0aldv8rvix8aa"; + sha256 = "1k76b6hnsmljggxsq5l9w94krfmhx58ij8jcxf72p0ddnlimdrjj"; }; buildInputs = [ @@ -44,7 +41,7 @@ stdenv.mkDerivation { ''; # The following settings fix failures in the test suite. It's not required otherwise. - NIX_LDFLAGS = "-rpath=${guile}/lib"; + NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib}/lib"; preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash"; doCheck = true; From 045d0a3ea0c58807622fe6ac74f455bcea6314aa Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 19 Feb 2012 09:22:14 +0000 Subject: [PATCH 10/15] xplanet-1.2.2; builds with libpng-1.5 svn path=/nixpkgs/trunk/; revision=32389 --- .../science/astronomy/xplanet/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index 15e04c3835c..6f30e771a63 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -1,21 +1,13 @@ {stdenv, fetchurl, lib, pkgconfig, freetype, pango, libpng, libtiff, giflib, libjpeg}: -stdenv.mkDerivation { - name = "xplanet-1.2.1"; +stdenv.mkDerivation rec { + name = "xplanet-1.2.2"; src = fetchurl { - url = mirror://sourceforge/xplanet/xplanet-1.2.1.tar.gz; - sha256 = "1pp55a1rgjkfcrwc00y3l48fhpqcp3qagd1zbym6zg27fzi5fbgm"; + url = "mirror://sourceforge/xplanet/${name}.tar.gz"; + sha256 = "1jnkrly9njkibxqbg5im4pq9cqjzwmki6jzd318dvlfmnicqr3vg"; }; - patches = - [ # Build on GCC 4.4. - (fetchurl { - url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/x11-misc/xplanet/files/xplanet-1.2.1-gentoo.patch?rev=1.1"; - sha256 = "0mmagjizj4hj057qmpi45w95zlrqda32x96xy44f6126xzj02yd5"; - }) - ]; - buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg ]; meta = { From 26f5bdfde1aa754196b8c02fd62b672fc311e517 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 19 Feb 2012 09:22:20 +0000 Subject: [PATCH 11/15] xplanet: pass netpbm, edit meta svn path=/nixpkgs/trunk/; revision=32390 --- pkgs/applications/science/astronomy/xplanet/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index 6f30e771a63..816119a3b92 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, lib, pkgconfig, freetype, pango, libpng, libtiff, giflib, libjpeg}: +{stdenv, fetchurl, pkgconfig, freetype, pango, libpng, libtiff, giflib +, libjpeg, netpbm}: stdenv.mkDerivation rec { name = "xplanet-1.2.2"; @@ -8,12 +9,13 @@ stdenv.mkDerivation rec { sha256 = "1jnkrly9njkibxqbg5im4pq9cqjzwmki6jzd318dvlfmnicqr3vg"; }; - buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg ]; + buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg netpbm ]; meta = { description = "Renders an image of the earth or other planets into the X root window"; homepage = http://xplanet.sourceforge.net; license = "GPL"; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ stdenv.lib.maintainers.sander stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.all; }; } From aaad871c35d6a3ec520a7dc62278c77aa9f2897c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 19 Feb 2012 09:22:24 +0000 Subject: [PATCH 12/15] inkscape: a couple of upstream patches to fix FTBFS with libpng-1.5 svn path=/nixpkgs/trunk/; revision=32391 --- .../graphics/inkscape/default.nix | 6 +-- .../graphics/inkscape/libpng-1.5.patch | 47 +++++++++++++++++++ 2 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/graphics/inkscape/libpng-1.5.patch diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 19a2346802c..9ef5382eaf9 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool -, gsl, python, pyxml, lxml, poppler }: +, gsl, python, pyxml, lxml, poppler, imagemagick, libwpg }: stdenv.mkDerivation rec { name = "inkscape-0.48.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "10v7ixdz7f8vgk2wv0m81zli9p0f446cm1f4aqlvni1ndsx44fi2"; }; - patches = [ ./configure-python-libs.patch ]; + patches = [ ./configure-python-libs.patch ./libpng-1.5.patch ]; propagatedBuildInputs = [ # Python is used at run-time to execute scripts, e.g., those from @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext - makeWrapper intltool gsl poppler + makeWrapper intltool gsl poppler imagemagick libwpg ]; configureFlags = "--with-python"; diff --git a/pkgs/applications/graphics/inkscape/libpng-1.5.patch b/pkgs/applications/graphics/inkscape/libpng-1.5.patch new file mode 100644 index 00000000000..4c8a7ee5f9b --- /dev/null +++ b/pkgs/applications/graphics/inkscape/libpng-1.5.patch @@ -0,0 +1,47 @@ +Source: upstream revisions 10061 and 10707 + +--- a/src/sp-image.cpp 2011-02-21 07:59:34 +0000 ++++ b/src/sp-image.cpp 2011-02-21 08:57:28 +0000 +@@ -387,9 +387,13 @@ + + #if defined(PNG_iCCP_SUPPORTED) + { +- char* name = 0; ++ png_charp name = 0; + int compression_type = 0; +- char* profile = 0; ++#if (PNG_LIBPNG_VER < 10500) ++ png_charp profile = 0; ++#else ++ png_bytep profile = 0; ++#endif + png_uint_32 proflen = 0; + if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) { + // g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type); + +--- a/src/extension/internal/pdfinput/svg-builder.cpp 2011-10-27 04:55:51 +0000 ++++ b/src/extension/internal/pdfinput/svg-builder.cpp 2011-10-29 20:34:00 +0000 +@@ -1481,7 +1481,7 @@ + return NULL; + } + // Set error handler +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return NULL; + } + +--- a/src/helper/png-write.cpp 2011-08-07 10:53:12 +0000 ++++ b/src/helper/png-write.cpp 2011-10-29 20:34:00 +0000 +@@ -166,8 +166,8 @@ + /* Set error handling. REQUIRED if you aren't supplying your own + * error hadnling functions in the png_create_write_struct() call. + */ +- if (setjmp(png_ptr->jmpbuf)) { +- /* If we get here, we had a problem reading the file */ ++ if (setjmp(png_jmpbuf(png_ptr))) { ++ // If we get here, we had a problem reading the file + fclose(fp); + png_destroy_write_struct(&png_ptr, &info_ptr); + return false; + From 08f6682666ee5b07b01e8b0354cf936da3d0c6bf Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 19 Feb 2012 09:22:33 +0000 Subject: [PATCH 13/15] KDE-4.7: build with qt-4.8 svn path=/nixpkgs/trunk/; revision=32392 --- pkgs/desktops/kde-4.7/default.nix | 9 ++++++--- .../files/kde-wallpapers-buildsystem.patch | 17 +++++++++++++++++ pkgs/desktops/kde-4.7/kde-wallpapers.nix | 7 +++++-- pkgs/desktops/kde-4.7/kde-workspace.nix | 6 ++++-- .../kde-4.7/kdeaccessibility/kmousetool.nix | 4 ++-- .../kde-4.7/kdeartwork/kscreensaver.nix | 6 ++++-- pkgs/desktops/kde-4.7/kdegames.nix | 6 ++++-- pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix | 7 +++++-- pkgs/desktops/kde-4.7/kdelibs.nix | 2 +- pkgs/desktops/kde-4.7/kdemultimedia.nix | 5 +++-- pkgs/desktops/kde-4.7/kdenetwork/kget.nix | 6 +++--- pkgs/desktops/kde-4.7/kdenetwork/kopete.nix | 4 ++-- pkgs/desktops/kde-4.7/kdenetwork/krdc.nix | 4 ++-- pkgs/desktops/kde-4.7/l10n/default.nix | 4 ++-- 14 files changed, 60 insertions(+), 27 deletions(-) create mode 100644 pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index 3bdf825410c..428e1370635 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -1,4 +1,4 @@ -{ callPackage, callPackageOrig, stdenv, qt47 }: +{ callPackage, callPackageOrig, stdenv, qt48 }: let release = "4.7.4"; @@ -44,7 +44,7 @@ kde.modules // kde.individual // akonadi = callPackage ./support/akonadi { }; - qt4 = qt47; + qt4 = qt48; kdebase_workspace = kde.modules.kde_workspace; @@ -52,5 +52,8 @@ kde.modules // kde.individual // full = stdenv.lib.attrValues kde.modules; - l10n = callPackage ./l10n { inherit release; }; + l10n = callPackage ./l10n { + inherit release; + inherit (kde.manifest) stable; + }; } diff --git a/pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch new file mode 100644 index 00000000000..378cdb64694 --- /dev/null +++ b/pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3d3e247..f78db67 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,10 @@ +-find_package(KDE4 REQUIRED) +-include(KDE4Defaults) ++project(kde-wallpapers NONE) ++if( WALLPAPER_INSTALL_DIR ) ++ message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}") ++else() ++ find_package(KDE4 REQUIRED) ++ include(KDE4Defaults) ++endif() + + install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE) + diff --git a/pkgs/desktops/kde-4.7/kde-wallpapers.nix b/pkgs/desktops/kde-4.7/kde-wallpapers.nix index 60298e567fb..97773ffadcd 100644 --- a/pkgs/desktops/kde-4.7/kde-wallpapers.nix +++ b/pkgs/desktops/kde-4.7/kde-wallpapers.nix @@ -1,8 +1,11 @@ -{ kde, kdelibs }: +{ kde, cmake }: kde { + buildNativeInputs = [ cmake ]; - buildInputs = [ kdelibs ]; + patches = [ ./files/kde-wallpapers-buildsystem.patch ]; + + cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers"; outputHashAlgo = "sha256"; outputHashMode = "recursive"; diff --git a/pkgs/desktops/kde-4.7/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix index 55c243f60dd..fe51032f757 100644 --- a/pkgs/desktops/kde-4.7/kde-workspace.nix +++ b/pkgs/desktops/kde-4.7/kde-workspace.nix @@ -1,13 +1,13 @@ { kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate, consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi, - pykde4 + pykde4, libjpeg, pkgconfig, libXft, libXxf86misc }: kde { buildInputs = - [ kdelibs qimageblitz libdbusmenu_qt pykde4 + [ kdelibs qimageblitz libdbusmenu_qt pykde4 libjpeg libXft libXxf86misc xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp xorg.libpthreadstubs @@ -15,6 +15,8 @@ kde { libusb python libqalculate consolekit kdepimlibs pam prison akonadi ]; + buildNativeInputs = [ pkgconfig ]; + preConfigure = '' # Fix incorrect path to kde4-config. diff --git a/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix index 42306049c5d..8e0caa76ed9 100644 --- a/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix +++ b/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, libXtst }: +{ kde, kdelibs, libXtst, libXt }: kde { - buildInputs = [ kdelibs libXtst ]; + buildInputs = [ kdelibs libXtst libXt ]; meta = { description = "A program that clicks the mouse for you"; diff --git a/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix index cc195c8de90..72676e35f71 100644 --- a/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix +++ b/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix @@ -1,7 +1,9 @@ -{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2 }: +{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }: kde { - buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 ]; + buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ]; + + buildNativeInputs = [ pkgconfig ]; preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake"; diff --git a/pkgs/desktops/kde-4.7/kdegames.nix b/pkgs/desktops/kde-4.7/kdegames.nix index 3378a99d9e7..03ecfbd88b4 100644 --- a/pkgs/desktops/kde-4.7/kdegames.nix +++ b/pkgs/desktops/kde-4.7/kdegames.nix @@ -1,12 +1,14 @@ { kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, pykde4, - openal, libsndfile, qhull }: + openal, libsndfile, qhull, sqlite, pkgconfig }: kde rec { buildInputs = [ kdelibs qca2 pythonPackages.python pythonPackages.wrapPython - openal libsndfile qhull ] ++ pythonPath; + openal libsndfile qhull sqlite ] ++ pythonPath; pythonPath = [ pythonPackages.twisted pykde4 ]; + buildNativeInputs = [ pkgconfig ]; + # TODO: ggz postInstall = "wrapPythonPrograms"; diff --git a/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix index efc2707e7d6..b6b659c3947 100644 --- a/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix +++ b/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix @@ -1,9 +1,12 @@ -{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi }: +{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi +, libjpeg, pkgconfig }: kde { buildInputs = - [ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi ]; + [ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi libjpeg ]; + + buildNativeInputs = [ pkgconfig ]; meta = { description = "Gwenview, the KDE image viewer"; diff --git a/pkgs/desktops/kde-4.7/kdelibs.nix b/pkgs/desktops/kde-4.7/kdelibs.nix index d4383b3e93a..106909ac3db 100644 --- a/pkgs/desktops/kde-4.7/kdelibs.nix +++ b/pkgs/desktops/kde-4.7/kdelibs.nix @@ -11,7 +11,7 @@ kde { [ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2 - shared_desktop_ontologies udev xz libxml2 libjpeg + shared_desktop_ontologies udev xz libxml2 libjpeg kerberos ]; propagatedBuildInputs = [ qt4 soprano strigi phonon ]; diff --git a/pkgs/desktops/kde-4.7/kdemultimedia.nix b/pkgs/desktops/kde-4.7/kdemultimedia.nix index b4ca7a8d2da..4c3182dd9fe 100644 --- a/pkgs/desktops/kde-4.7/kdemultimedia.nix +++ b/pkgs/desktops/kde-4.7/kdemultimedia.nix @@ -1,5 +1,5 @@ { kde, alsaLib, libvorbis, taglib, flac, cdparanoia, lame, kdelibs, ffmpeg, - libmusicbrainz3, libtunepimp }: + libmusicbrainz3, libtunepimp, pulseaudio }: kde { @@ -7,7 +7,8 @@ kde { # Note: kdemultimedia can use xine-lib, but it doesn't seem useful # without the Phonon Xine backend. [ kdelibs cdparanoia taglib libvorbis libmusicbrainz3 libtunepimp ffmpeg - flac lame ]; + flac lame pulseaudio + ]; meta = { description = "KDE multimedia programs such as a movie player and volume utility"; diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kget.nix b/pkgs/desktops/kde-4.7/kdenetwork/kget.nix index 33d9ec1ca01..2381a2459e6 100644 --- a/pkgs/desktops/kde-4.7/kdenetwork/kget.nix +++ b/pkgs/desktops/kde-4.7/kdenetwork/kget.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, - shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }: +{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, sqlite +, shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }: kde { buildInputs = [ kdelibs libktorrent kde_workspace shared_desktop_ontologies kdepimlibs - kde_baseapps gpgme boost libmms qca2 + kde_baseapps gpgme boost libmms qca2 sqlite ]; KDEDIRS = libktorrent; diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix index a4b01c5f9a6..704f6d04dfe 100644 --- a/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix +++ b/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix @@ -1,11 +1,11 @@ { kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent, jasper, libidn, mediastreamer, msilbc, pkgconfig, libxml2, libxslt, giflib, - libgadu, boost, qca2, gpgme }: + libgadu, boost, qca2, gpgme, sqlite }: kde { buildInputs = [ kdelibs speex libmsn libotr kdepimlibs qimageblitz libktorrent jasper libidn mediastreamer msilbc libxml2 libxslt giflib libgadu boost qca2 - gpgme ]; + gpgme sqlite ]; buildNativeInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix index 664b1bc45a7..40ef91d5433 100644 --- a/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix +++ b/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, libvncserver }: +{ kde, kdelibs, libvncserver, libjpeg }: kde { - buildInputs = [ kdelibs libvncserver ]; + buildInputs = [ kdelibs libvncserver libjpeg ]; patches = [ ./kdenetwork.patch ]; } diff --git a/pkgs/desktops/kde-4.7/l10n/default.nix b/pkgs/desktops/kde-4.7/l10n/default.nix index 144968f6672..69cfdcf8ab2 100644 --- a/pkgs/desktops/kde-4.7/l10n/default.nix +++ b/pkgs/desktops/kde-4.7/l10n/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, gettext, release }: +{ stdenv, fetchurl, kdelibs, gettext, release, stable }: let @@ -11,7 +11,7 @@ let name = "kde-l10n-${saneName}-${release}"; src = fetchurl { - url = "mirror://kde/stable/${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; }; From d77cfce6d37eb55789923613df7be87faa9652a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 19 Feb 2012 10:51:04 +0000 Subject: [PATCH 14/15] Adding bullet. Patch by Alexander Foremny. svn path=/nixpkgs/trunk/; revision=32393 --- pkgs/development/libraries/bullet/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/bullet/default.nix diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix new file mode 100644 index 00000000000..b725f6bbf9f --- /dev/null +++ b/pkgs/development/libraries/bullet/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, unzip, cmake}: + +stdenv.mkDerivation { + name = "bullet-2.78"; + src = fetchurl { + url = "http://bullet.googlecode.com/files/bullet-2.78.zip"; + sha256 = "10l2dclvv0di9mi9qp6xfy9vybx182xp2dyygabacrpr3p75s77k"; + }; + buildInputs = [ unzip cmake ]; + configurePhase = '' + cmake -DBUILD_SHARED_LIBS=ON -DBUILD_EXTRAS=OFF -DBUILD_DEMOS=OFF . + ''; + + meta = { + description = "A professional free 3D Game Multiphysics Library"; + longDescription = '' + Bullet 3D Game Multiphysics Library provides state of the art collision + detection, soft body and rigid body dynamics. + ''; + homepage = http://code.google.com/p/bullet/; + license = stdenv.lib.licenses.zlib; + maintainers = [ "Alexander Foremny " ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25bb8c36f80..0830758837f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8785,4 +8785,6 @@ let misc = import ../misc/misc.nix { inherit pkgs stdenv; }; + bullet = callPackage ../development/libraries/bullet {}; + }; in pkgs From 668a5052142eab0b67a54160c9d299db78a2ce5d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 19 Feb 2012 10:59:31 +0000 Subject: [PATCH 15/15] libpng-1.2.47 (see CVE 2011-3026) svn path=/nixpkgs/trunk/; revision=32394 --- pkgs/development/libraries/liblastfm/default.nix | 4 ++-- pkgs/development/libraries/libpng/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 57a325a7234..24b93221d11 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ruby, qt4, pkgconfig, libsamplerate, fftwSinglePrec }: +{ stdenv, fetchurl, ruby, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which }: let version = "0.3.3"; in @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { prefixKey = "--prefix "; propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ]; - buildNativeInputs = [ ruby pkgconfig ]; + buildNativeInputs = [ ruby pkgconfig which ]; configureFlags = "--release"; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 7ba9bfb54b3..04872d3b431 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -4,11 +4,11 @@ assert zlib != null; # If you want to upgrade libpng, look at libpng15 branch stdenv.mkDerivation rec { - name = "libpng-1.2.46"; + name = "libpng-1.2.47"; src = fetchurl { url = "mirror://sourceforge/libpng/${name}.tar.xz"; - sha256 = "0rcx4v4khdkrvz7b02fmx7lab2pk1lal4dhx9widv36b7g2xvwzn"; + sha256 = "1lai3dnzw81y40jr17bdj1qh08hwv9mc1v74yybl7jdx2hiilsvx"; }; propagatedBuildInputs = [ zlib ];