Commit Graph

7 Commits

Author SHA1 Message Date
Eelco Dolstra
f64d84698e 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
2014-07-28 11:30:49 +02:00
Carles Pagès
048a7e9d9c minecraft: update to latest launcher
I changed the versioning scheme to the latest launcher date, which is
independent of minecraft version and is actually what the expression gets.
2014-03-30 19:34:33 +02:00
Shea Levy
ca116f76f9 Unmaintain a bunch of packages
Trying to take maintainership more seriously...

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-21 22:34:41 -05:00
Aristid Breitkreuz
d596180cf8 use alsa-oss layer for minecraft 2013-01-28 02:58:47 +01:00
Aristid Breitkreuz
d674d9cf9b update minecraft recipe 2013-01-18 02:01:08 +01:00
Carles Pagès
389a76c085 minecraft: update to 1.3.1 2012-08-09 23:39:57 +02:00
Shea Levy
23506543a4 Add minecraft
Patch by Carles Pagès, minor modification (adding in version number, updating
sha256) by me

svn path=/nixpkgs/trunk/; revision=33944
2012-04-29 14:09:58 +00:00