diff options
| author | Charles Strahan <charles.c.strahan@gmail.com> | 2015-01-20 20:21:03 -0500 |
|---|---|---|
| committer | Charles Strahan <charles.c.strahan@gmail.com> | 2015-01-20 20:21:03 -0500 |
| commit | dfc225d143142764daf2c1e933e7303a82f7b0cd (patch) | |
| tree | 351925e835e82d7f7d20a7eb8567b5a2aaa658c7 /pkgs/tools/audio/mpdcron | |
| parent | bd5374664663bbf1c2675c100eee8cfe14c6d148 (diff) | |
| parent | c55b5eb245198cf3fa58e477a301c90f754f6682 (diff) | |
| download | nixpkgs-dfc225d143142764daf2c1e933e7303a82f7b0cd.tar nixpkgs-dfc225d143142764daf2c1e933e7303a82f7b0cd.tar.gz nixpkgs-dfc225d143142764daf2c1e933e7303a82f7b0cd.tar.bz2 nixpkgs-dfc225d143142764daf2c1e933e7303a82f7b0cd.tar.lz nixpkgs-dfc225d143142764daf2c1e933e7303a82f7b0cd.tar.xz nixpkgs-dfc225d143142764daf2c1e933e7303a82f7b0cd.tar.zst nixpkgs-dfc225d143142764daf2c1e933e7303a82f7b0cd.zip | |
Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts: pkgs/applications/version-management/git-and-tools/default.nix pkgs/applications/version-management/git-and-tools/hub/default.nix pkgs/tools/audio/mpdcron/default.nix
Diffstat (limited to 'pkgs/tools/audio/mpdcron')
| -rw-r--r-- | pkgs/tools/audio/mpdcron/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix index a6fe1151b77..535ac5378fc 100644 --- a/pkgs/tools/audio/mpdcron/default.nix +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, glib, libdaemon, buildRubyGem -, mpd_clientlib, curl, sqlite, ruby, rubyPackages, libnotify, haskellPackages }: +, mpd_clientlib, curl, sqlite, ruby, rubyPackages, libnotify, pandoc }: stdenv.mkDerivation rec { version = "20130809"; |