diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 11:30:31 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 11:30:49 +0200 |
| commit | f64d84698eb3f4d833e846336ff99a73331c31f7 (patch) | |
| tree | 1120886b680851bc8b8f8d337af3503ecd4a3d71 /pkgs/development/libraries/haskell/generic-aeson/default.nix | |
| parent | 3e4a382d6753a057256c7ef1e9f52ae9e07bd677 (diff) | |
| parent | 30431e71608576baf880567b2894ad2a542f8d5e (diff) | |
| download | nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.gz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.bz2 nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.lz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.xz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.zst nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/applications/audio/espeak/edit.nix pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix
Diffstat (limited to 'pkgs/development/libraries/haskell/generic-aeson/default.nix')
| -rw-r--r-- | pkgs/development/libraries/haskell/generic-aeson/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/libraries/haskell/generic-aeson/default.nix b/pkgs/development/libraries/haskell/generic-aeson/default.nix index 209cbb7a52e3..9c18b511efc0 100644 --- a/pkgs/development/libraries/haskell/generic-aeson/default.nix +++ b/pkgs/development/libraries/haskell/generic-aeson/default.nix @@ -1,17 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, genericDeriving, HUnit, mtl, tagged -, text, vector +{ cabal, aeson, attoparsec, genericDeriving, mtl, tagged, text +, vector }: cabal.mkDerivation (self: { pname = "generic-aeson"; - version = "0.1.0.3"; - sha256 = "1svbjgd8g1ljximqb4pph9lvsswgvkj46jkqq8lzmh9ql385g2vp"; + version = "0.1.1.1"; + sha256 = "14jpma2p4dxmzpwd557igbg7xhgdzp9w9fm6dxa06sgfqxvb7ln1"; buildDepends = [ aeson attoparsec genericDeriving mtl tagged text vector ]; - testDepends = [ aeson attoparsec HUnit ]; meta = { description = "Derivation of Aeson instances using GHC generics"; license = self.stdenv.lib.licenses.bsd3; |