From d5d53b4710fb7a09ec777430c63238c65586eba0 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 3 Oct 2011 16:55:33 +0000 Subject: boolstuff-0.1.13 svn path=/nixpkgs/trunk/; revision=29602 --- pkgs/development/libraries/boolstuff/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index 419215a45a5b..c05fddc18cf0 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -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; -- cgit 1.4.1 From 492c7016d09afd0000060a176870177d82bafac0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Oct 2011 20:20:58 +0000 Subject: haskell-hamlet: updated to version 0.10.2 svn path=/nixpkgs/trunk/; revision=29607 --- .../libraries/haskell/hamlet/0.10.1.nix | 22 ---------------------- .../libraries/haskell/hamlet/0.10.2.nix | 22 ++++++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++-- 3 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/hamlet/0.10.1.nix create mode 100644 pkgs/development/libraries/haskell/hamlet/0.10.2.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/hamlet/0.10.1.nix b/pkgs/development/libraries/haskell/hamlet/0.10.1.nix deleted file mode 100644 index e3b80dd1edc9..000000000000 --- a/pkgs/development/libraries/haskell/hamlet/0.10.1.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ cabal, blazeBuilder, blazeHtml, failure, parsec, shakespeare -, text -}: - -cabal.mkDerivation (self: { - pname = "hamlet"; - version = "0.10.1"; - sha256 = "1n68nz2s61j8yfwjpgp9bjl0mc7gcpc5ysmx0vgggqxz2r3gayf6"; - 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 - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/hamlet/0.10.2.nix b/pkgs/development/libraries/haskell/hamlet/0.10.2.nix new file mode 100644 index 000000000000..1992be553b23 --- /dev/null +++ b/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 + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 907a6dac9114..a2c2e88830a2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -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 {}; -- cgit 1.4.1 From 160b7547f3bc952f99e518537dbb015ccf555799 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Oct 2011 20:21:03 +0000 Subject: haskell-clientsession: updated to version 0.7.3.1 svn path=/nixpkgs/trunk/; revision=29608 --- pkgs/development/libraries/haskell/clientsession/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 2c577fbc2ef5..c5096ae9a771 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -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 ]; -- cgit 1.4.1 From 3f7a541c5104d688587ba69e390ae31789451ffa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Oct 2011 20:21:07 +0000 Subject: haskell-persistent-template: updated to version 0.6.3 svn path=/nixpkgs/trunk/; revision=29609 --- pkgs/development/libraries/haskell/persistent-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index af69ad9d2671..67d8e10a3ef9 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -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"; -- cgit 1.4.1 From e12400f5f147252cdd782349261cf08ad9a6c701 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Oct 2011 20:21:11 +0000 Subject: haskell-persistent: updated to version 0.6.3 svn path=/nixpkgs/trunk/; revision=29610 --- pkgs/development/libraries/haskell/persistent/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 9329faad3481..879edcbcb7b0 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -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 = { -- cgit 1.4.1 From de15159ea04af35e0280dc995aa649e10562b5ed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Oct 2011 20:21:15 +0000 Subject: haskell-shakespeare-css: updated to version 0.10.2 svn path=/nixpkgs/trunk/; revision=29611 --- pkgs/development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 0bc2f187fb2c..65f2debed9cf 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -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"; -- cgit 1.4.1 From d4abe9ac3ffc7a9343b975b4df4b59ce2c7683b9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Oct 2011 20:21:19 +0000 Subject: haskell-shakespeare-js: updated to version 0.10.2 svn path=/nixpkgs/trunk/; revision=29612 --- pkgs/development/libraries/haskell/shakespeare-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index 064e1828f9df..5a402840d715 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -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"; -- cgit 1.4.1 From 96ca3cf9df130fc3ce8aef0d1d3b5b365b989886 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Oct 2011 20:21:23 +0000 Subject: haskell-shakespeare-text: updated to version 0.10.2 svn path=/nixpkgs/trunk/; revision=29613 --- pkgs/development/libraries/haskell/shakespeare-text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index 7c8cfceef17d..58ffa1404fc5 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -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"; -- cgit 1.4.1 From 8855e4e69bb8fda84e4ce11bba85566c0945a90a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Oct 2011 20:21:27 +0000 Subject: haskell-shakespeare: updated to version 0.10.1.1 svn path=/nixpkgs/trunk/; revision=29614 --- pkgs/development/libraries/haskell/shakespeare/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 409b9b838a47..1c57e45713ca 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -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"; -- cgit 1.4.1 From 717d0a154df9c6ae4a260937341e78e770be8416 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Oct 2011 20:21:31 +0000 Subject: haskell-wai-app-static: updated to version 0.3.4 svn path=/nixpkgs/trunk/; revision=29615 --- pkgs/development/libraries/haskell/wai-app-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 3fa0595bc13c..2ef32922346d 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -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 -- cgit 1.4.1 From 6b4095a1a082e35ff1ba5eae11db70fd0cdf07ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Oct 2011 20:21:35 +0000 Subject: haskell-wai-extra: updated to version 0.4.3 svn path=/nixpkgs/trunk/; revision=29616 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 9fce21f06db3..7a06bfb1958d 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -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 -- cgit 1.4.1 From 4bd5a070d4489a3f5d58b035717e12001c962742 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 4 Oct 2011 11:12:17 +0000 Subject: liblastfm: fix compilation with ruby-1.9.x svn path=/nixpkgs/trunk/; revision=29623 --- pkgs/development/libraries/liblastfm/default.nix | 17 +++++--- .../development/libraries/liblastfm/ruby-1.9.patch | 45 ++++++++++++++++++++++ 2 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/liblastfm/ruby-1.9.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index acc5af0ca9e0..57a325a72349 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -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; diff --git a/pkgs/development/libraries/liblastfm/ruby-1.9.patch b/pkgs/development/libraries/liblastfm/ruby-1.9.patch new file mode 100644 index 000000000000..ac6d175e73a4 --- /dev/null +++ b/pkgs/development/libraries/liblastfm/ruby-1.9.patch @@ -0,0 +1,45 @@ +From: Yury G. Kudryashov +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) -- cgit 1.4.1