about summary refs log tree commit diff
path: root/pkgs/development/libraries/haskell/hledger-chart/default.nix
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-02-06 23:03:12 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-02-06 23:03:12 +0000
commit215a07c1a9d6d208c1ba0037eccaaba7de9d6b68 (patch)
treef31e835b16c30957eb4ae3710cbfa922e8a64fbd /pkgs/development/libraries/haskell/hledger-chart/default.nix
parentb31c67e24d56c90a6732d3a310ff13684b73e200 (diff)
parent4e3dcd925499547314567107366cae26a99c4ef7 (diff)
downloadnixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar
nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.gz
nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.bz2
nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.lz
nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.xz
nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.zst
nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.zip
svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
Diffstat (limited to 'pkgs/development/libraries/haskell/hledger-chart/default.nix')
-rw-r--r--pkgs/development/libraries/haskell/hledger-chart/default.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/libraries/haskell/hledger-chart/default.nix b/pkgs/development/libraries/haskell/hledger-chart/default.nix
index 84b8c33fc210..020a8dfa2afa 100644
--- a/pkgs/development/libraries/haskell/hledger-chart/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-chart/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
   buildDepends = [
     Chart cmdargs colour hledger hledgerLib HUnit safe time
   ];
+  patchPhase = ''
+    sed -i hledger-chart.cabal -e 's|Chart >= 0.11 && < 0.15|Chart|g'
+  '';
   meta = {
     homepage = "http://hledger.org";
     description = "A pie chart image generator for the hledger accounting tool";