1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 01:20:40 +00:00
Commit graph

788 commits

Author SHA1 Message Date
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Moritz Ulrich be560b710e anki: update from 2.0.26 to 2.0.28 2014-08-04 15:53:05 +02:00
Michael Raskin 06ee6a2dab Update GNU Chess chess engine 2014-08-03 22:29:41 +04:00
Michael Raskin 77389a5bcb Update LiquidWar6 to 0.4 2014-08-03 15:59:21 +04:00
Vladimír Čunát 6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	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-08-02 05:08:07 +02:00
Sebastian Korten b42aa6830b scummvm: version bump to 1.7 2014-07-30 20:26:29 +02:00
John Wiegley b90e56a53c Merge pull request #3357 from fignuts/df2014
Add dwarf fortress 2014 (unstable) version
2014-07-29 13:20:35 -05:00
John Wiegley 867d3fbf47 Merge pull request #3372 from FlorentBecker/crawl
Add dungeon crawl stone soup 0.14
2014-07-29 13:20:18 -05:00
Peter Simons fc81ff49d2 LambdaHack: disable test suite to fix build
https://github.com/LambdaHack/LambdaHack/issues/57
2014-07-29 18:39:36 +02:00
Peter Simons 5cc55e9523 Partially revert 7a45996 some more.
Removing more references to the non-existent license "stdenv.lib.licenses.perl5".
Thanks to @FlashKorten for catching those.
2014-07-28 20:52:47 +02:00
Peter Simons 02bd934738 haskell-LambdaHack: update to version 0.2.14 2014-07-28 20:32:59 +02:00
Andrew Morsillo 911eb8d934 bump version to 0.40.05 2014-07-28 09:01:45 -04:00
Peter Simons d0ca8c237e Fix broken license references. 2014-07-28 11:43:20 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
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
Florent Becker 826e96af0e Add dungeon crawl stone soup 0.14 2014-07-25 15:00:28 +02:00
Domen Kožar 4024adf232 openra: 20131223 -> 20140608 2014-07-24 17:17:31 +02:00
Andrew Morsillo 7c84e3b785 Add dwarf fortress 2014 (unstable) version 2014-07-23 22:41:30 -04:00
Vladimír Čunát b9045a7d96 Merge branch 'x-updates' into staging
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Eelco Dolstra 9c53065b61 exult: Update to 1.4.9rc1 2014-07-22 15:12:21 +02:00
Vladimír Čunát a1a6414b9b exult: fix build, same as 4b263946d 2014-07-18 11:56:49 +02:00
Vladimír Čunát 16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Sergey Mironov c1fbd9dc67 adom: add famous rogue-like game 2014-07-16 17:51:39 +04:00
Eelco Dolstra ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Peter Simons d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
Vladimír Čunát 4b263946dd qt3, graphicsmagick137, fox, neverball: fix build
Broken after freetype propagating libpng, which hid the older ones.
Reordering is enough to ensure the older libpng gets picked.
2014-07-09 21:52:04 +02:00
Eelco Dolstra 95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Eelco Dolstra f46108aaf0 Remove last reference to stdenvType 2014-07-01 16:22:44 +02:00
Michael Raskin 0957b0a432 Add an auto-update script for atanks 2014-07-01 13:59:02 +04:00
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Michael Raskin 874e4d7d23 Update atanks 2014-07-01 13:07:33 +04:00
Michael Raskin 5ed1adbbd4 Update Blobby Volley 2014-07-01 11:54:09 +04:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Michael Raskin 89a7cc92a2 Merge pull request #3020 from ambrop72/0ad
Add 0 A.D.
2014-06-30 10:30:41 +04:00
Austin Seipp b71d425f78 Merge pull request #3109 from nslqqq/master
OpenSpades: Initial 0.0.12
2014-06-28 20:35:35 -05:00
Benno Fünfstück e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
2014-06-28 21:06:10 +02:00
Nikita Mikhailov fdd649780d openspades: Initial 0.0.12 2014-06-28 02:25:05 +07:00
Bjørn Forsman 97d4dec58c zoom: add meta attributes
And do some coding style / whitespace clean up.
2014-06-23 13:19:24 +02:00
drozv 523cb5cf68 Fix broken checksums and update to version 4.2.018. 2014-06-21 19:30:27 -04:00
third3ye e5bf7af90a The folder $url/steam/archive seems to be empty...
Changed the URLs to the packages over to the steam folder inside <code>pool/steam/s/steam</code>. If the archive folder has been repopulated the next 24hrs ignore this.
2014-06-20 01:54:16 +00:00
ambrop7@gmail.com 7dbcc9a6ee Add 0 A.D. 2014-06-19 18:02:12 +02:00
Carles Pagès 950444bf77 openxcom: update download link 2014-06-19 10:12:40 +02:00
Austin Seipp 3a86ce32e4 Merge pull request #2937 from cpages/oxc
openxcom: add version 1.0.0
2014-06-18 16:16:07 -05:00
ambrop7@gmail.com 576fa310b2 Warzone2100: Update to 3.1.1.
Changed to use openal-soft, which makes sound work,
in combination with https://github.com/NixOS/nixpkgs/pull/2947 .

Added optional installation of campaign videos, not enabled by default.
2014-06-15 23:38:01 +02:00
Carles Pagès d9ed7c5a9c openxcom: add version 1.0.0 2014-06-14 11:58:00 +02:00
Michael Raskin 18023bc0e8 Update Sauerbraten to a fresh revision 5000. Apparently fixes the build. Probably fixes #995. 2014-06-14 11:50:08 +04:00
Arvin Moezzi 58cbfedc5d scummvm: upgrade from 1.2.1 to 1.6.0 2014-06-12 09:30:39 +02:00
Michael Raskin 4b68be6d90 Merge pull request #2876 from auntieNeo/typespeed
Add package for Typespeed game
2014-06-09 12:11:23 +04:00
Jonathan Glines 8e2556bd7f Added auntie as a maintainer, and set license properly. 2014-06-08 23:47:59 -06:00
Jonathan Glines b690f36d6f Oops, removed a printf debug line we don't need. 2014-06-08 23:43:28 -06:00
Jonathan Glines 0806afad5a Added metadata for typespeed. 2014-06-08 23:21:11 -06:00
Jonathan Glines 9d04c9021b Oops, forgot to add patch. 2014-06-08 22:46:02 -06:00
Jonathan Glines 54ba3c7ff4 Fixed problem with worddir and ruledir path. 2014-06-08 22:44:06 -06:00
Jonathan Glines 150f6f9ee6 Removed unneeded builder.sh. 2014-06-08 17:40:16 -06:00
Jonathan Glines 8af05e82a0 Merge branch 'master' into nitrogen 2014-06-08 16:59:40 -06:00
Domen Kožar e1a0d45d00 openra: runtime dependency on systemd 2014-06-08 19:55:38 +02:00
Domen Kožar e26b5600e2 springlobby: 0.186 -> 0.195 2014-06-08 19:39:55 +02:00
Domen Kožar 7a88839b90 spring: fix runtime dependency on udev 2014-06-08 19:39:55 +02:00
John Wiegley edd4729838 crafty: specify the support platforms 2014-06-08 04:28:11 -05:00
John Wiegley 10d1fd0457 crafty: simplify expression 2014-06-07 20:17:47 +00:00
Eelco Dolstra 1da6a7d4a9 Remove illegal meta.src attributes 2014-06-05 13:04:18 +02:00
Moritz Ulrich f0fc148e5a openttd: Bump to 1.4.1. 2014-06-04 16:48:40 +02:00
Jonathan Glines bb82a4d171 Added typespeed package. 2014-06-02 20:41:35 -06:00
John Wiegley 1ae4afd728 Merge pull request #2742 from jwiegley/eboard
Add expression to build the eboard chess client
2014-05-30 14:28:55 -05:00
Moritz Ulrich 57e0371f12 flightgear & simgear: Bump to 3.0.0. 2014-05-28 22:36:54 +02:00
Moritz Ulrich c4349c3b17 crrcsim: Update to 0.9.12 & simplify. 2014-05-28 13:04:16 +02:00
Michael Raskin 3cffc08974 Merge pull request #2752 from jwiegley/crafty
Add expression for building crafty and craftyFull
2014-05-27 11:17:48 -07:00
宋文武 ddfd374c40 Merge #2030: add openra game (C&C RTS engine)
Modifications from @vcunat, who tried Dune,
but it typically segfaults in mono after a few minutes
(IMHO unlikely to be a problem with packaging it).
2014-05-27 20:08:50 +02:00
John Wiegley cdadc70e5d Merge pull request #2772 from Fuuzetsu/tibia
tibia: 10.41
2014-05-27 13:05:38 -05:00
John Wiegley 93936fdf8a Add expression for building crafty and craftyFull 2014-05-27 12:57:50 -05:00
Mateusz Kowalczyk d32593a222 tibia: 10.41
Also I'm personally done with this game so I will no longer maintain the
package.
2014-05-27 11:18:02 +02:00
John Wiegley aea8bff895 Add expression for ChessDB 2014-05-26 02:45:59 -05:00
Mateusz Kowalczyk 1815ac2dfc tibia: update 10.39 -> 10.40 2014-05-25 19:33:42 +02:00
John Wiegley cceea413bc Add expression to build the eboard chess client 2014-05-25 03:21:21 -05:00
Vladimír Čunát 8e9ead8656 berlios.de probably shut down, replace it
The shutdown was announced years ago, only now it stopped working.
2014-05-18 13:30:27 +02:00
Peter Simons 5d1b8ea3b5 haskell-MazesOfMonad: remove broken package 2014-05-14 15:02:33 +02:00
Mateusz Kowalczyk 193d73d2d3 tibia: version 10.39 2014-05-02 20:38:42 +02:00
Moritz Ulrich 81a6fcd847 anki: update from 2.0.22 to 2.0.26 2014-04-30 23:52:55 +02:00
Austin Seipp ec13d61cbf minecraft-server: 1.7.5 -> 1.7.9
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-28 17:34:35 -05:00
Mateusz Kowalczyk 9a77b8e64f tibia: version 10.38
Closes #2396
2014-04-26 12:58:25 -05:00
Eelco Dolstra d304b277bd Silence some Hydra evaluation warnings 2014-04-24 15:40:55 +02:00
Sander van der Burg 104c841c85 Move su to the base packages of chrootenv builder 2014-04-18 13:30:24 +02:00
Arseniy Seroka 3b0ed7bb14 fix missing su in chrootenv 2014-04-18 15:03:33 +04:00
Mathijs Kwik 62521d9ec6 openttd: upgrade to 1.4.0 2014-04-11 13:49:19 +02:00
Vladimír Čunát 6445ac90ad Merge master into x-updates 2014-04-01 10:49:31 +02:00
Peter Simons f06bcd84bf Merge pull request #2082 from cpages/update
Updates for maintained packages
2014-03-31 23:13:38 +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
宋文武 5668a70a49 widelands: update to build-18 (close #2062)
@vcunat enabled parallelBuilding.
2014-03-29 18:38:46 +01:00
Austin Seipp d60af7f34d minecraft-server: version 1.7.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-29 05:31:24 -05:00
Shea Levy e0341475dc Merge branch 'master' of git://github.com/fmap/nixpkgs
Add Mnemosyne 2.2.1
2014-03-28 23:09:25 -04:00
Vladimír Čunát 576e9289dd Merge master into x-updates 2014-03-27 21:34:06 +01:00
Evgeny Egorochkin fd827e6437 springLobby: update from 0.182 to 0.186 2014-03-27 03:02:07 +02:00
Evgeny Egorochkin 70a51b75e1 springLobby: update from 0.180 to 0.182, get rid of patch, improve meta 2014-03-26 12:57:10 +02:00
vi b5acc84ff3 Mnemosyne: provide capacity to override dependencies at the fidelity of a Python package. 2014-03-26 00:37:14 +08:00
vi ed63dcb7c7 Have Mnemosyne take pkgs, rather than pythonPackages as argument. 2014-03-26 00:05:34 +08:00
vi 5149f278aa Patch *all* references to sys.exec_prefix. 2014-03-25 03:28:19 +08:00
vi 344279495a Add Mnemosyne 2.2.1.
The Mnemosyne Project has two aspects:

  * It's a free flash-card tool which optimizes your learning process.
  * It's a research project into the nature of long-term memory.

We strive to provide a clear, uncluttered piece of software, easy to use
and to understand for newbies, but still infinitely customisable through
plugins and scripts for power users.

Mnemosyne uses a sophisticated algorithm to schedule the best time for
a card to come up for review. Difficult cards that you tend to forget
quickly will be scheduled more often, while Mnemosyne won't waste your
time on things you remember well.

If you want, anonymous statistics on your learning process can be
uploaded to a central server for analysis. This data will be valuable to
study the behaviour of our memory over a very long time period. The
results will be used to improve the scheduling algorithms behind the
software even further.
2014-03-25 02:55:25 +08:00
Vladimír Čunát 11e8c4ae8c superTuxKart: fix build with newer mesa
The idea is taken from Arch.
2014-03-23 22:26:27 +01:00
Domen Kozar 11874b9e3b add Planetary Annihilation: next-generation RTS that takes the genre to a planetary scale 2014-03-16 23:31:08 +01:00
Michael Raskin 9e801cc94a Update XBoard 2014-03-08 21:13:01 +04:00