public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby

Browse Source 
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
This commit is contained in:
Charles Strahan
2015-01-20 20:21:03 -05:00
parent bd53746646 c55b5eb245
commit dfc225d143
823 changed files with 154029 additions and 7470 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/audio/mpdcron/default.nix
+1 -1
View File
@@ -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";