diff options
| author | Mateusz Kowalczyk <mk440@bath.ac.uk> | 2014-09-21 18:17:44 +0100 |
|---|---|---|
| committer | Mateusz Kowalczyk <mk440@bath.ac.uk> | 2014-09-21 18:17:44 +0100 |
| commit | 0872d712a0772d12f8458d436ca2123e98881a87 (patch) | |
| tree | b9f296f4ad8eeb31ced60ad472d183af511234d6 | |
| parent | 175a40133a7c79765b19ab22173dfff126e086b8 (diff) | |
| parent | fb46d6bce9c68a3e942fb8807950336b546e130d (diff) | |
| download | nixpkgs-0872d712a0772d12f8458d436ca2123e98881a87.tar nixpkgs-0872d712a0772d12f8458d436ca2123e98881a87.tar.gz nixpkgs-0872d712a0772d12f8458d436ca2123e98881a87.tar.bz2 nixpkgs-0872d712a0772d12f8458d436ca2123e98881a87.tar.lz nixpkgs-0872d712a0772d12f8458d436ca2123e98881a87.tar.xz nixpkgs-0872d712a0772d12f8458d436ca2123e98881a87.tar.zst nixpkgs-0872d712a0772d12f8458d436ca2123e98881a87.zip | |
Merge pull request #4190 from joachifm/haskell-libmpd_0_9
haskell-libmpd: bump to 0.9.0.1
| -rw-r--r-- | pkgs/development/libraries/haskell/libmpd/0.8.0.5.nix | 25 | ||||
| -rw-r--r-- | pkgs/development/libraries/haskell/libmpd/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 6 |
3 files changed, 38 insertions, 10 deletions
diff --git a/pkgs/development/libraries/haskell/libmpd/0.8.0.5.nix b/pkgs/development/libraries/haskell/libmpd/0.8.0.5.nix new file mode 100644 index 00000000000..b54068d924c --- /dev/null +++ b/pkgs/development/libraries/haskell/libmpd/0.8.0.5.nix @@ -0,0 +1,25 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsec, dataDefault, filepath, hspec, HUnit, mtl +, network, QuickCheck, text, time, utf8String +}: + +cabal.mkDerivation (self: { + pname = "libmpd"; + version = "0.8.0.5"; + sha256 = "0jxd2xl9imfvb3dz7zqwzx392aw2cb2pl3drx5wkygbywbi5ijhh"; + buildDepends = [ + attoparsec dataDefault filepath mtl network text time utf8String + ]; + testDepends = [ + dataDefault hspec HUnit mtl network QuickCheck text time utf8String + ]; + jailbreak = true; + doCheck = false; + meta = { + homepage = "http://github.com/joachifm/libmpd-haskell#readme"; + description = "An MPD client library"; + license = "LGPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index b54068d924c..6dc0aede069 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -1,25 +1,24 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, attoparsec, dataDefault, filepath, hspec, HUnit, mtl -, network, QuickCheck, text, time, utf8String +{ cabal, attoparsec, dataDefault, filepath, hspec, mtl, network +, QuickCheck, text, time, utf8String }: cabal.mkDerivation (self: { pname = "libmpd"; - version = "0.8.0.5"; - sha256 = "0jxd2xl9imfvb3dz7zqwzx392aw2cb2pl3drx5wkygbywbi5ijhh"; + version = "0.9.0.1"; + sha256 = "11smm8ai7053hljlxi5l2fkqxrqr1xrh6sxg2r0dlsvmmln7smrd"; buildDepends = [ attoparsec dataDefault filepath mtl network text time utf8String ]; testDepends = [ - dataDefault hspec HUnit mtl network QuickCheck text time utf8String + attoparsec dataDefault filepath hspec mtl network QuickCheck text + time utf8String ]; - jailbreak = true; - doCheck = false; meta = { - homepage = "http://github.com/joachifm/libmpd-haskell#readme"; + homepage = "http://github.com/vimus/libmpd-haskell#readme"; description = "An MPD client library"; - license = "LGPL"; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; }; }) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1f496677fad..e17ff56fc1c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1490,6 +1490,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in libmpd = callPackage ../development/libraries/haskell/libmpd {}; + libmpd_0_8_0_5 = callPackage ../development/libraries/haskell/libmpd/0.8.0.5.nix {}; + liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; libsystemdJournal = callPackage ../development/libraries/haskell/libsystemd-journal { @@ -3040,7 +3042,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in xlsx = callPackage ../development/libraries/haskell/xlsx {}; - xmobar = callPackage ../applications/misc/xmobar {}; + xmobar = callPackage ../applications/misc/xmobar { + libmpd = self.libmpd_0_8_0_5; + }; xmonad = callPackage ../applications/window-managers/xmonad {}; |