3
0
Fork 0
forked from mirrors/nixpkgs

svn merge trunk

svn path=/nixpkgs/branches/libpng15/; revision=29627
This commit is contained in:
Yury G. Kudryashov 2011-10-04 13:12:45 +00:00
commit 85fc2de83e
22 changed files with 162 additions and 70 deletions

View file

@ -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;
};
}

View file

@ -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;

View file

@ -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
];

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hamlet";
version = "0.10.1";
sha256 = "1n68nz2s61j8yfwjpgp9bjl0mc7gcpc5ysmx0vgggqxz2r3gayf6";
version = "0.10.2";
sha256 = "1p4dz1h640ryhj7prks7qazqyx0l79hi7130ksfchlb5mprz6wq2";
buildDepends = [
blazeBuilder blazeHtml failure parsec shakespeare text
];

View file

@ -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";

View file

@ -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 = {

View file

@ -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";

View file

@ -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";

View file

@ -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";

View file

@ -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";

View file

@ -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

View file

@ -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

View file

@ -1,18 +1,25 @@
{ stdenv, fetchurl, ruby, qt4, pkgconfig, libsamplerate, fftwSinglePrec }:
stdenv.mkDerivation rec {
name = "liblastfm-0.3.0";
let version = "0.3.3"; in
stdenv.mkDerivation rec {
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 ];
patchPhase = "patchShebangs .";
configureFlags = "--release";
patches = [ ./ruby-1.9.patch ];
postPatch = "patchShebangs .";
meta = {
homepage = http://github.com/mxcl/liblastfm;

View file

@ -0,0 +1,45 @@
From: Yury G. Kudryashov <urkud.urkud@gmail.com>
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)

View file

@ -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 ];
};
}

View file

@ -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";
}

View file

@ -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 @@ stdenv.mkDerivation rec {
# 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;

View file

@ -1,9 +0,0 @@
rec {
version="1.3.27";
name="wine-1.3.27";
hash="1vdyxlsl2zlhlcl5npq59axlkvjmkp7yz5p9rvwkqia79xrs8qv1";
url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2";
advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.27.tar.bz2";
}

View file

@ -1,6 +0,0 @@
{
downloadPage = "http://www.winehq.org/";
baseName = "wine";
versionExtractorSedScript = ''s/[^-]*-(.+)[.]tar[.].*/\1/'';
versionReferenceCreator = ''$(replaceAllVersionOccurences)'';
}

View file

@ -2289,6 +2289,8 @@ let
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 @@ let
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 @@ let
kdiff3 = callPackage ../tools/text/kdiff3 { };
kile = callPackage ../applications/editors/kile/2.1.nix { };
kmplayer = callPackage ../applications/video/kmplayer {
inherit (pkgs.gtkLibs) pango;
};

View file

@ -651,8 +651,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
};
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 {};