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/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix
This commit is contained in:
Charles Strahan
2014-12-28 14:29:52 -05:00
parent 4ed847d81d a30869a525
commit 145733c479
3039 changed files with 76778 additions and 42039 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/audio/mpdcron/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
meta = {
description = "A cron like daemon for mpd.";
description = "A cron like daemon for mpd";
homepage = http://alip.github.io/mpdcron/;
license = stdenv.lib.licenses.gpl2;
platforms = with stdenv.lib.platforms; unix;