Author: urkud
Date: Tue Oct 4 13:12:45 2011
New Revision: 29627
URL: https://ssl.nixos.org/websvn/nix/?rev=29627&sc=1
Log:
svn merge trunk
Added:
nixpkgs/branches/libpng15/pkgs/applications/editors/kile/2.0.nix
- copied unchanged from r29625,
nixpkgs/trunk/pkgs/applications/editors/kile/2.0.nix
nixpkgs/branches/libpng15/pkgs/applications/editors/kile/2.1.nix
- copied unchanged from r29625,
nixpkgs/trunk/pkgs/applications/editors/kile/2.1.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/hamlet/0.10.2.nix
- copied unchanged from r29625,
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.2.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/liblastfm/ruby-1.9.patch
- copied unchanged from r29625,
nixpkgs/trunk/pkgs/development/libraries/liblastfm/ruby-1.9.patch
nixpkgs/branches/libpng15/pkgs/development/tools/ocaml/camlidl/
- copied from r29625, nixpkgs/trunk/pkgs/development/tools/ocaml/camlidl/
Replaced:
nixpkgs/branches/libpng15/pkgs/development/tools/ocaml/camlidl/default.nix
- copied unchanged from r29625,
nixpkgs/trunk/pkgs/development/tools/ocaml/camlidl/default.nix
Deleted:
nixpkgs/branches/libpng15/pkgs/applications/editors/kile/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/hamlet/0.10.1.nix
nixpkgs/branches/libpng15/pkgs/misc/emulators/wine/src-for-default.nix
nixpkgs/branches/libpng15/pkgs/misc/emulators/wine/src-info-for-default.nix
Modified:
nixpkgs/branches/libpng15/ (props changed)
nixpkgs/branches/libpng15/pkgs/applications/graphics/xscreensaver/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/applications/misc/xneur/0.8.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/applications/networking/browsers/icecat-4/
(props changed)
nixpkgs/branches/libpng15/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
(props changed)
nixpkgs/branches/libpng15/pkgs/build-support/gcc-wrapper/ (props changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/debian-build.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/nix-build.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/rpm-build.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/source-tarball.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/
(props changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.10.1.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.10.2.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.8.2.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.8.3.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/aterm/2.8.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/boolstuff/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/fltk/fltk11.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/glibc-2.9/ (props
changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/goocanvas/ (props
changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/clientsession/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/persistent-template/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/persistent/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/shakespeare-css/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/shakespeare-js/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/shakespeare-text/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/shakespeare/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/wai-app-static/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/wai-extra/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/liblastfm/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/pcre/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/readline/readline6.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/tools/misc/autoconf/2.13.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/tools/misc/gnum4/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/games/liquidwar/src-for-default.nix
nixpkgs/branches/libpng15/pkgs/misc/emulators/wine/default.nix
nixpkgs/branches/libpng15/pkgs/misc/tex/pgf/1.x.nix (props changed)
nixpkgs/branches/libpng15/pkgs/misc/tex/pgf/2.x.nix (props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/atheros/r3867.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/generic.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.25.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.28.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.29.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.33.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/qemu-kvm/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/util-linux-ng/ (props
changed)
nixpkgs/branches/libpng15/pkgs/servers/mail/dovecot/1.1.1.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/shells/bash/4.1.nix (props changed)
nixpkgs/branches/libpng15/pkgs/shells/bash/4.2.nix (props changed)
nixpkgs/branches/libpng15/pkgs/stdenv/generic/setup.sh (props changed)
nixpkgs/branches/libpng15/pkgs/stdenv/linux/make-bootstrap-tools.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/tools/networking/wget/default.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
nixpkgs/branches/libpng15/pkgs/top-level/haskell-packages.nix
Copied: nixpkgs/branches/libpng15/pkgs/applications/editors/kile/2.0.nix (from
r29625, nixpkgs/trunk/pkgs/applications/editors/kile/2.0.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/libpng15/pkgs/applications/editors/kile/2.0.nix Tue Oct
4 13:12:45 2011 (r29627, copy of r29625,
nixpkgs/trunk/pkgs/applications/editors/kile/2.0.nix)
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, perl, arts, qt, kdelibs,
+ libX11, libXt, libXext, libXrender, libXft,
+ zlib, libpng, libjpeg, freetype, expat }:
+
+stdenv.mkDerivation {
+ name = "kile-2.0.3";
+
+ src = fetchurl {
+ url = mirror://sourceforge/kile/kile-2.0.3.tar.bz2;
+ md5 = "f0296547d3e916dd385e0b8913918852";
+ };
+
+ buildInputs = [ perl arts qt kdelibs libX11 libXt libXext libXrender libXft
+ zlib libpng libjpeg freetype expat ];
+
+ meta = {
+ description = "An integrated LaTeX editor for KDE";
+ homepage = http://kile.sourceforge.net;
+ license = "GPLv2";
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
Copied: nixpkgs/branches/libpng15/pkgs/applications/editors/kile/2.1.nix (from
r29625, nixpkgs/trunk/pkgs/applications/editors/kile/2.1.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/libpng15/pkgs/applications/editors/kile/2.1.nix Tue Oct
4 13:12:45 2011 (r29627, copy of r29625,
nixpkgs/trunk/pkgs/applications/editors/kile/2.1.nix)
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, kdelibs, cmake, gettext }:
+
+stdenv.mkDerivation rec {
+ name = "kile-2.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/kile/${name}.tar.bz2";
+ sha256 = "0ag6ya0625w34hpk0bpkjyi0ydw699zbkf86vwc19mh9cb0n0aic";
+ };
+
+ buildNativeInputs = [ cmake gettext ];
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "An integrated LaTeX editor for KDE";
+ homepage = http://kile.sourceforge.net;
+ maintainers = [ stdenv.lib.maintainers.urkud ];
+ license = stdenv.lib.licenses.gpl2Plus;
+ inherit (kdelibs.meta) platforms;
+ };
+}
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/boolstuff/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/libraries/boolstuff/default.nix
Tue Oct 4 12:52:12 2011 (r29626)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/boolstuff/default.nix
Tue Oct 4 13:12:45 2011 (r29627)
@@ -1,18 +1,20 @@
{ stdenv, fetchurl, pkgconfig }:
-stdenv.mkDerivation {
- name = "boolstuff-0.1.12";
+let baseurl = "http://perso.b2b2c.ca/sarrazip/dev";; in
+
+stdenv.mkDerivation rec {
+ name = "boolstuff-0.1.13";
src = fetchurl {
- url = http://perso.b2b2c.ca/sarrazip/dev/boolstuff-0.1.12.tar.gz;
- sha256 = "0h39civar6fjswaf3bn1r2ddj589rya0prd6gzsyv3qzr9srprq9";
+ url = "${baseurl}/${name}.tar.gz";
+ sha256 = "0akwb57lnzq1ak32k6mdxbma2gj0pqhj8y9m6hq79djb9s3mxvmn";
};
- buildInputs = [ pkgconfig ];
+ buildNativeInputs = [ pkgconfig ];
meta = {
description = "Library for operations on boolean expression binary trees";
- homepage = http://perso.b2b2c.ca/sarrazip/dev/boolstuff.html;
+ homepage = "${baseurl}/boolstuff.html";
license = "GPL";
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux;
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/clientsession/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/clientsession/default.nix
Tue Oct 4 12:52:12 2011 (r29626)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/clientsession/default.nix
Tue Oct 4 13:12:45 2011 (r29627)
@@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "clientsession";
- version = "0.7.3";
- sha256 = "1f5ri7h8l3v60bj6ywhn2v3kih5lclk76qx7y6jc7nyf9499aja5";
+ version = "0.7.3.1";
+ sha256 = "0q16brla4m5g7dmgln3awx964ms7pi1s2r21idmc0mk4rnw2rpi7";
buildDepends = [
base64Bytestring cereal cryptoApi cryptocipher skein
];
Copied:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/hamlet/0.10.2.nix
(from r29625,
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.2.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/hamlet/0.10.2.nix
Tue Oct 4 13:12:45 2011 (r29627, copy of r29625,
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.2.nix)
@@ -0,0 +1,22 @@
+{ cabal, blazeBuilder, blazeHtml, failure, parsec, shakespeare
+, text
+}:
+
+cabal.mkDerivation (self: {
+ pname = "hamlet";
+ version = "0.10.2";
+ sha256 = "1p4dz1h640ryhj7prks7qazqyx0l79hi7130ksfchlb5mprz6wq2";
+ buildDepends = [
+ blazeBuilder blazeHtml failure parsec shakespeare text
+ ];
+ meta = {
+ homepage = "http://www.yesodweb.com/book/templates";;
+ description = "Haml-like template files that are compile-time checked";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/persistent-template/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/persistent-template/default.nix
Tue Oct 4 12:52:12 2011 (r29626)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/persistent-template/default.nix
Tue Oct 4 13:12:45 2011 (r29627)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "persistent-template";
- version = "0.6.2";
- sha256 = "1gnqryn701b97fwzjhkk4x4k7p1w5w8cdn5x9hz8sb68vkgrplfx";
+ version = "0.6.3";
+ sha256 = "1vcjvfjxmv9c0wg7pbx0lw73128f5y0r4sfdsyq3jrkkiq1bgsxa";
buildDepends = [ monadControl persistent text ];
meta = {
homepage = "http://www.yesodweb.com/book/persistent";;
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/persistent/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/persistent/default.nix
Tue Oct 4 12:52:12 2011 (r29626)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/persistent/default.nix
Tue Oct 4 13:12:45 2011 (r29627)
@@ -1,14 +1,14 @@
-{ cabal, blazeHtml, enumerator, monadControl, mtl, pathPieces, pool
-, sqlite, text, time, transformers
+{ cabal, blazeHtml, dataObject, enumerator, monadControl, mtl
+, pathPieces, pool, sqlite, text, time, transformers
}:
cabal.mkDerivation (self: {
pname = "persistent";
- version = "0.6.2";
- sha256 = "1bzv3wqqy32z20xbda8kr4m1fybnziv0gp6m8v3w0brrvmns20g2";
+ version = "0.6.3";
+ sha256 = "0m50z9k941bhh05jjz1268sn1bi7w8i6jzccldgnbjjvsw2xaisx";
buildDepends = [
- blazeHtml enumerator monadControl mtl pathPieces pool text time
- transformers
+ blazeHtml dataObject enumerator monadControl mtl pathPieces pool
+ text time transformers
];
extraLibraries = [ sqlite ];
meta = {
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/shakespeare-css/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/shakespeare-css/default.nix
Tue Oct 4 12:52:12 2011 (r29626)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/shakespeare-css/default.nix
Tue Oct 4 13:12:45 2011 (r29627)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-css";
- version = "0.10.1";
- sha256 = "1qdql6qcm7jzb5r1fvrmpyighn1ykrjgs9za1n9m2r47y0n03hsg";
+ version = "0.10.2";
+ sha256 = "181bknfws2s7jygy527w93v07i04xf1pwyfmylva59p0z45adlb4";
buildDepends = [ parsec shakespeare text ];
meta = {
homepage = "http://www.yesodweb.com/book/templates";;
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/shakespeare-js/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/shakespeare-js/default.nix
Tue Oct 4 12:52:12 2011 (r29626)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/shakespeare-js/default.nix
Tue Oct 4 13:12:45 2011 (r29627)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-js";
- version = "0.10.1";
- sha256 = "0j9jzrnvarwkab9zynz8k60ilgj5kyqdm56lricpii27qlkqnmf3";
+ version = "0.10.2";
+ sha256 = "1yyqfp2lj8vq7x2a74wrgm7kx6zp1djp67bls9ip74kxi24dbznv";
buildDepends = [ shakespeare text ];
meta = {
homepage = "http://www.yesodweb.com/book/templates";;
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/shakespeare-text/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/shakespeare-text/default.nix
Tue Oct 4 12:52:12 2011 (r29626)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/shakespeare-text/default.nix
Tue Oct 4 13:12:45 2011 (r29627)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-text";
- version = "0.10.1";
- sha256 = "1p05nsfmlibhpik6dd40m0djk5yckl4i2ylx9lwyi68lx0izbm5j";
+ version = "0.10.2";
+ sha256 = "04n1aflg4b5byfsg494d4dskx25nyy0a654wl4cxz8920sl7qpha";
buildDepends = [ shakespeare text ];
meta = {
homepage = "http://www.yesodweb.com/book/templates";;
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/shakespeare/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/shakespeare/default.nix
Tue Oct 4 12:52:12 2011 (r29626)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/shakespeare/default.nix
Tue Oct 4 13:12:45 2011 (r29627)
@@ -1,10 +1,10 @@
-{ cabal, blazeBuilder, blazeHtml, failure, parsec, text }:
+{ cabal, parsec, text }:
cabal.mkDerivation (self: {
pname = "shakespeare";
- version = "0.10.1";
- sha256 = "1ckzfxrs65n8cx0hm64c3jd4hbw48x1vi0cvnkz39k500jpq874f";
- buildDepends = [ blazeBuilder blazeHtml failure parsec text ];
+ version = "0.10.1.1";
+ sha256 = "1qd5wrcr4ss5zigbb7s6c7y7qbvrnbvgdpwq985yyy71i5hwxv0a";
+ buildDepends = [ parsec text ];
meta = {
homepage = "http://www.yesodweb.com/book/templates";;
description = "A toolkit for making compile-time interpolated templates";
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/wai-app-static/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/wai-app-static/default.nix
Tue Oct 4 12:52:12 2011 (r29626)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/wai-app-static/default.nix
Tue Oct 4 13:12:45 2011 (r29627)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "wai-app-static";
- version = "0.3.3";
- sha256 = "04b4cw93agw136xjh9rssiw96vz3kxji7zh209brwfnwh13bra17";
+ version = "0.3.4";
+ sha256 = "0jxlm0qfv59c3q6ngvr94rzrn01byfn3wak208ws18xhk14cv058";
buildDepends = [
base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed
httpDate httpTypes text time transformers unixCompat wai
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/wai-extra/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/wai-extra/default.nix
Tue Oct 4 12:52:12 2011 (r29626)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/wai-extra/default.nix
Tue Oct 4 13:12:45 2011 (r29627)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "wai-extra";
- version = "0.4.2";
- sha256 = "1k2dsjramy14rfd1j8k7zgirdfl2zybd0z0pxkvxdrgr9s2pk51y";
+ version = "0.4.3";
+ sha256 = "07m86khgfyyadjgq8yp9kj3ljlpkvf209b1cfz2x7n5wdq8k2wm9";
buildDepends = [
blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator
httpTypes network text time transformers wai zlibBindings
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/liblastfm/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/libraries/liblastfm/default.nix
Tue Oct 4 12:52:12 2011 (r29626)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/liblastfm/default.nix
Tue Oct 4 13:12:45 2011 (r29627)
@@ -1,18 +1,25 @@
{ stdenv, fetchurl, ruby, qt4, pkgconfig, libsamplerate, fftwSinglePrec }:
+let version = "0.3.3"; in
+
stdenv.mkDerivation rec {
- name = "liblastfm-0.3.0";
+ name = "liblastfm-${version}";
+ # Upstream does not package git tags as tarballs. Get tarball from github.
src = fetchurl {
- url = "http://cdn.last.fm/src/${name}.tar.bz2";;
- sha256 = "0vgpkbqmynm975nlcw3caxpz30wvvz35c7a9kfr2wjqizvxrfwnx";
+ url = "https://github.com/mxcl/liblastfm/tarball/${version}";;
+ name = "${name}.tar.gz";
+ sha256 = "0v33vzj89mgx2pc5fmiywlz51i553ckydw9xz70fiflm2inbl1r6";
};
prefixKey = "--prefix ";
propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ];
- buildInputs = [ ruby pkgconfig ];
+ buildNativeInputs = [ ruby pkgconfig ];
+
+ configureFlags = "--release";
- patchPhase = "patchShebangs .";
+ patches = [ ./ruby-1.9.patch ];
+ postPatch = "patchShebangs .";
meta = {
homepage = http://github.com/mxcl/liblastfm;
Copied:
nixpkgs/branches/libpng15/pkgs/development/libraries/liblastfm/ruby-1.9.patch
(from r29625, nixpkgs/trunk/pkgs/development/libraries/liblastfm/ruby-1.9.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/liblastfm/ruby-1.9.patch
Tue Oct 4 13:12:45 2011 (r29627, copy of r29625,
nixpkgs/trunk/pkgs/development/libraries/liblastfm/ruby-1.9.patch)
@@ -0,0 +1,45 @@
+From: Yury G. Kudryashov <[email protected]>
+Subject: [PATCH] Fix compilation with ruby-1.9
+
+__FILE__ is a relative path in ruby-1.9
+
+---
+ admin/Makefile.rb | 4 ++--
+ admin/qpp | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/admin/Makefile.rb b/admin/Makefile.rb
+index 592f5a5..33fe688 100755
+--- a/admin/Makefile.rb
++++ b/admin/Makefile.rb
+@@ -6,7 +6,7 @@
+
+ cwd = File.dirname( __FILE__ )
+ require 'find'
+-require "#{cwd}/platform.rb"
++require_relative 'platform'
+
+
+ ######################################################################### defs
+@@ -158,4 +158,4 @@ puts <<-EOS
+ .PHONY: dist
+ dist:
+ git archive --prefix=#{BASENAME}/ HEAD | bzip2 > #{BASENAME}.tar.bz2
+-EOS
+\ No newline at end of file
++EOS
+diff --git a/admin/qpp b/admin/qpp
+index 36b2d05..ee840fd 100755
+--- a/admin/qpp
++++ b/admin/qpp
+@@ -4,7 +4,7 @@
+
+ cwd=File.dirname __FILE__
+ require 'find'
+-require "#{cwd}/findsrc"
++require_relative 'findsrc'
+
+ sources = Array.new
+ headers = Array.new
+--
+tg: (f0b3239..) t/ruby19 (depends on: master)
Copied:
nixpkgs/branches/libpng15/pkgs/development/tools/ocaml/camlidl/default.nix
(from r29625, nixpkgs/trunk/pkgs/development/tools/ocaml/camlidl/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/libpng15/pkgs/development/tools/ocaml/camlidl/default.nix
Tue Oct 4 13:12:45 2011 (r29627, copy of r29625,
nixpkgs/trunk/pkgs/development/tools/ocaml/camlidl/default.nix)
@@ -0,0 +1,32 @@
+{stdenv, fetchurl, makeWrapper, ocaml, ncurses}:
+let
+ ocaml_version = (builtins.parseDrvName ocaml.name).version;
+ pname = "camlidl";
+ version = "1.05";
+ webpage = "http://caml.inria.fr/pub/old_caml_site/camlidl/";;
+in
+stdenv.mkDerivation {
+
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url =
"http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/${pname}-${version}.tar.gz";;
+ sha256 = "0483cs66zsxsavcllpw1qqvyhxb39ddil3h72clcd69g7fyxazl5";
+ };
+
+ buildInputs = [ ocaml ];
+
+ preBuild = ''
+ mv config/Makefile.unix config/Makefile
+ substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin
BINDIR=$out
+ substituteInPlace config/Makefile --replace OCAMLLIB=/usr/local/lib/ocaml
OCAMLLIB=$out/lib/ocaml/${ocaml_version}/site-lib/camlidl
+ ensureDir $out/lib/ocaml/${ocaml_version}/site-lib/camlidl/caml
+ '';
+
+ meta = {
+ description = "CamlIDL is a stub code generator and COM binding for
Objective Caml";
+ homepage = "${webpage}";
+ license = "LGPL";
+ maintainers = [ stdenv.lib.maintainers.roconnor ];
+ };
+}
Modified: nixpkgs/branches/libpng15/pkgs/games/liquidwar/src-for-default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/games/liquidwar/src-for-default.nix Tue Oct
4 12:52:12 2011 (r29626)
+++ nixpkgs/branches/libpng15/pkgs/games/liquidwar/src-for-default.nix Tue Oct
4 13:12:45 2011 (r29627)
@@ -1,9 +1,9 @@
rec {
- version="0.0.10beta";
- name="liquidwar-0.0.10beta";
- hash="1fc1qfl7p3669dj6dy1wxvf85hhwgbazm3rc365ahsikdgz1c5m0";
+ version="0.0.11beta";
+ name="liquidwar-0.0.11beta";
+ hash="1zahxxmnx74xc3d2vk119r25d794vblmz22j1z5ajnnvc42dqc4f";
url="http://download.savannah.gnu.org/releases/liquidwar6/${version}/liquidwar6-${version}.tar.gz";;
-
advertisedUrl="http://download.savannah.gnu.org/releases/liquidwar6/0.0.10beta/liquidwar6-0.0.10beta.tar.gz";;
+
advertisedUrl="http://download.savannah.gnu.org/releases/liquidwar6/0.0.11beta/liquidwar6-0.0.11beta.tar.gz";;
}
Modified: nixpkgs/branches/libpng15/pkgs/misc/emulators/wine/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/misc/emulators/wine/default.nix Tue Oct
4 12:52:12 2011 (r29626)
+++ nixpkgs/branches/libpng15/pkgs/misc/emulators/wine/default.nix Tue Oct
4 13:12:45 2011 (r29627)
@@ -6,21 +6,17 @@
assert stdenv.isLinux;
assert stdenv.gcc.gcc != null;
-let
- s = import ./src-for-default.nix;
-in
-
stdenv.mkDerivation rec {
- name = "wine-${s.version}";
+ name = "wine-1.3.29";
src = fetchurl {
- url = s.url;
- sha256 = s.hash;
+ url = "mirror://sourceforge/wine/${name}.tar.bz2";
+ sha256 = "1mi4xzbpqmian9q5bs6df8b1mfgnnd4mlh0kb2ynbpk7kmx0zyj1";
};
gecko = fetchurl {
- url = "http://downloads.sourceforge.net/wine/wine_gecko-1.1.0-x86.cab";;
- sha256 = "0a8bpqqhx146innrdwhn4c0jqi90mkmp8kw6aqwildm073yy31hp";
+ url = "mirror://sourceforge/wine/wine_gecko-1.3-x86.msi";
+ sha256 = "1bmm826dhq82jzxdld4x9cyg8mgzg8llkki59n9fvxggi7l5jxab";
};
buildInputs = [
@@ -45,7 +41,7 @@
# elements specified above.
dontPatchELF = true;
- postInstall = "install -D ${gecko}
$out/share/wine/gecko/wine_gecko-1.1.0-x86.cab";
+ postInstall = "install -D ${gecko} $out/share/wine/gecko/${gecko.name}";
enableParallelBuilding = true;
Modified: nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Tue Oct 4
12:52:12 2011 (r29626)
+++ nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Tue Oct 4
13:12:45 2011 (r29627)
@@ -2289,6 +2289,8 @@
mkOcamlPackages = ocaml: self: let callPackage = newScope self; in rec {
inherit ocaml;
+ camlidl = callPackage ../development/tools/ocaml/camlidl { };
+
camlp5_strict = callPackage ../development/tools/ocaml/camlp5 { };
camlp5_transitional = callPackage ../development/tools/ocaml/camlp5 {
@@ -7893,7 +7895,7 @@
inherit (kde3) kdelibs;
};
- kile = callPackage ../applications/editors/kile {
+ kile = callPackage ../applications/editors/kile/2.0.nix {
inherit (kde3) arts kdelibs;
qt = qt3;
};
@@ -7960,6 +7962,8 @@
kdiff3 = callPackage ../tools/text/kdiff3 { };
+ kile = callPackage ../applications/editors/kile/2.1.nix { };
+
kmplayer = callPackage ../applications/video/kmplayer {
inherit (pkgs.gtkLibs) pango;
};
Modified: nixpkgs/branches/libpng15/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/top-level/haskell-packages.nix Tue Oct
4 12:52:12 2011 (r29626)
+++ nixpkgs/branches/libpng15/pkgs/top-level/haskell-packages.nix Tue Oct
4 13:12:45 2011 (r29627)
@@ -651,8 +651,8 @@
};
hamlet_0_8_2_1 = callPackage
../development/libraries/haskell/hamlet/0.8.2.1.nix {};
- hamlet_0_10_1 = callPackage
../development/libraries/haskell/hamlet/0.10.1.nix {};
- hamlet = self.hamlet_0_10_1;
+ hamlet_0_10_2 = callPackage
../development/libraries/haskell/hamlet/0.10.2.nix {};
+ hamlet = self.hamlet_0_10_2;
happstackData = callPackage
../development/libraries/haskell/happstack/happstack-data.nix {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
