JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
66,604 Commits 2 Branches 0 Tags 12 GiB
b867cc62a7
Commit Graph

1034 Commits

Author SHA1 Message Date
Eelco Dolstra
585983bc95 Merge remote-tracking branch 'origin/staging' 
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
 2014-09-08 11:42:09 +02:00
Pascal Wittmann
4537c1ab25 Merge pull request #3935 from MP2E/eternity-engine 
Add eternity and eternityMaster, a Doom port by James Haley
 2014-09-07 15:26:11 +02:00
Cray Elliott
eb7dbf9067 Remove eternityMaster 2014-09-06 16:18:35 -07:00
Vladimír Čunát
06fea81c6e Merge recent master into staging 
Hydra: ?compare=1150594
 2014-09-06 16:52:45 +02:00
Sander van der Burg
23d5fd2e2f Fix steam package 2014-09-06 00:30:10 +02:00
Christoph Hrdinka
3894e68721 steam-chrootenv: fix indentation 2014-09-06 00:27:21 +02:00
Christoph Hrdinka
5a74e1a606 steam-chrootenv: remove fontconfig from installed modules 2014-09-06 00:25:49 +02:00
Christoph Hrdinka
a383e0f1b8 steam: add optional java support 2014-09-06 00:25:49 +02:00
Christoph Hrdinka
c5f51039f4 steam: fix steam on x86_64 2014-09-06 00:25:48 +02:00
Vladimír Čunát
c4a35d8cf9 warzone2100: fix meta 2014-09-04 21:04:11 +02:00
Vladimír Čunát
4a2b6a63b6 spring, warzone2100: work around build problems 
I guess there was a slight API change in the last mesa update.
 2014-09-04 21:02:14 +02:00
Moritz Ulrich
762c03ef64 openttd: update from 1.4.1 to 1.4.2 2014-09-04 16:06:41 +02:00
Pascal Wittmann
e510a27696 bsd-games: fixed path to dictionary 
due to the update of miscfiles, see 4cf191a425
 2014-09-03 23:58:07 +02:00
Michael Raskin
06a2dc3d2d Merge pull request #3703 from fignuts/df_40_09 
Bump version of Dwarf Fortress to 40_09. Build graphics library for dwar...
 2014-09-03 18:51:37 +04:00
Cray Elliott
db64ebe167 Add eternity engine, a Doom port by James Haley 
Eternity Engine is a limit removing port descended from BOOM
 2014-09-02 02:04:37 -07:00
Cray Elliott
f933ccd309 chocolateDoom and chocolateDoomMaster added 
chocolate doom is a port that aims to recreate the experience of Doom in the 1990s
as accurately as possible
 2014-09-02 01:37:34 -07:00
Philip Horger
3da42c811f hawkthorne: Initial commit, license issue still unresolved 2014-08-31 20:08:15 +01:00
Danyil Bohdan
68917916ee tcl2048: wrong sha256sum. 2014-08-31 12:43:36 +03:00
Danyil Bohdan
327cab298e tcl2048: update to 0.2.6 2014-08-31 12:32:29 +03:00
Danyil Bohdan
dba5fed12b add game 'tcl2048' 2014-08-31 12:02:04 +03:00
Mateusz Kowalczyk
e41a169a60 super-tux-kart: update to 0.8.1 2014-08-29 12:18:21 +01:00
Mateusz Kowalczyk
e657385acf extreme-tux-racer: update to 0.6.0 2014-08-29 12:15:46 +01:00
Andrew Morsillo
8dbe652739 Bump DF version to 40_10 2014-08-28 21:12:05 -04:00
Rob Vermaas
6c6dbc41fb openspades: fix build by using fetchurl to download DevPaks27.zip. 2014-08-26 11:48:02 +02:00
Domen Kožar
68c131c2cc quake3demo: mark as broken 2014-08-25 19:00:51 +02:00
Jaka Kranjc
310a5d09a4 gemrb: bumped to 0.8.1 2014-08-25 14:08:13 +02:00
Jaka Kranjc
3f971fe45f gemrb: added more meta tags + general maintenance 2014-08-25 14:08:13 +02:00
Tobias Blaschke
c93e48a2bb xskat: new package 
Play the german card game Skat against the AI or over IRC.
 2014-08-25 10:41:03 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions 
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
 2014-08-24 22:31:37 +02:00
Eelco Dolstra
2d6d43c02c Fix tarball build 2014-08-24 18:52:50 +02:00
Michael Raskin
d0aceb402a Update The Buttefly Effect game 2014-08-22 21:34:28 +04:00
Andrew Morsillo
de8a2e1433 Bump version of Dwarf Fortress to 40_09. Build graphics library for dwarf fortress instead of using provided one for more reliability. 2014-08-20 21:50:09 -04:00
Cray Elliott
22eccacb6c update minecraft-server to 1.7.10 2014-08-18 18:51:51 -07:00
Vladimír Čunát
26d68ce798 merge #3301: add Adom game (with fixes) 2014-08-18 16:26:39 +02:00
Vladimír Čunát
edfc77044a adom: various fixes 
- make chrooted download work
- add shebang
- nix style and meta conventions
 2014-08-18 16:24:45 +02:00
Peter Simons
46e5a78b81 haskell-Allure: add version 0.4.99.0 2014-08-12 12:37:44 +02:00
Peter Simons
1703d9f7cc haskell-LambdaHack: update to version 0.4.99.0 2014-08-12 12:37:44 +02:00
Peter Simons
26ec124da8 LambdaHack: mark package as broken 2014-08-11 12:54:50 +02:00
Peter Simons
f1fb0bf27b LambdaHack: disable Hydra builds for this package 2014-08-09 00:39:52 +02:00
Vladimír Čunát
52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Sander van der Burg
c8ea9f749a Merge pull request #3494 from madjar/master 
steam: updated to 1.0.0.48
 2014-08-08 18:00:48 +02:00
Eelco Dolstra
8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Georges Dubus
5df24fadaa steam: updated to 1.0.0.48 2014-08-08 17:28:57 +02:00
Peter Simons
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
System administrator
f3739e2aca added astromenace: Hardcore 3D space shooter 2014-08-07 01:54:41 +02:00
Peter Simons
20059d37f5 LambdaHack: jailbreak to fix build with latest 'gtk' 2014-08-04 16:52:29 +02:00
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
Peter Simons
736bda8a0e haskell-LambdaHack: update to version 0.2.12 2014-03-07 22:54:13 +01:00
Peter Simons
669e3520fd gtypist: update from 2.9.3 to 2.9.4 2014-03-03 11:10:24 +01:00
Domen Kožar
e5017d8239 springlobby: add unitsync patch 2014-02-10 14:21:42 +01:00
Domen Kožar
e5124e7a0e springlobby: specify spring run-time dependency paths 2014-02-10 14:19:57 +01:00
Domen Kožar
8e9f61995e spring: don't pass glibc 2014-02-10 09:41:30 +01:00
Domen Kožar
0f79534aa7 spring: use wrapper to set gcc lib path 2014-02-09 23:53:11 +01:00
Moritz Ulrich
bb66a3ff6c Anki: Update to 2.0.22. 2014-02-08 19:19:50 +01:00
Domen Kožar
4baa1197dd spring: add missing function parameters 2014-02-08 18:16:28 +01:00
Domen Kožar
64a8ae3692 SpringRTS: fix runtime dependencies and maintain 2014-02-08 18:11:59 +01:00
Vladimír Čunát
3967a1c444 spring: disable parallel building, as it breaks on Hydra 
(cherry picked from commit e43018e019)
 2014-02-08 09:15:20 +01:00
Domen Kožar
d1d3e841b6 spring 95.0 -> 96.0 2014-02-05 15:36:24 +01:00
Michael Raskin
e4c64d1e17 Adding missing unistd.h includes 2014-02-02 15:04:05 +04:00
Linquize
f06c3ef47f Fix previous simutrans 112.3 build 
This fixes commit b5d19fad67
 2014-02-01 18:22:47 +01:00
Linquize
b5d19fad67 Update simutrans 112.3 2014-01-31 09:44:05 +01:00
Michael Raskin
de036bc10c Fix Xmoto build (missing include) 2014-01-29 14:42:26 +04:00
Petr Rockai
6f5be260b4 Adopt packages. 2014-01-28 17:31:17 +01: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
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
 2014-01-18 14:46:20 +01:00
Moritz Ulrich
a2b8ede2c7 FlightGear: Update to 2.12.1. 2014-01-15 21:36:34 +01:00
Vladimír Čunát
9443129b08 Merge master into stdenv-updates 
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
 2014-01-04 18:34:53 +01:00
Michael Raskin
fd19376d26 Merge pull request #1441 from rszibele/xonotic 
xonotic: compile the glx version and add a symlink to default to the sdl version.
 2014-01-02 07:50:35 -08:00
rszibele
40f4c5dcad Added Nexuiz-2.5.2. 2014-01-01 17:59:42 +01:00
rszibele
5cc98b77cd xonotic: compile the glx version and add a symlink to default to the sdl 
version.
 2014-01-01 17:47:32 +01:00
Vladimír Čunát
e740b565cf Merge master into stdenv-updates 
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
 2013-12-29 10:01:22 +01:00
Evgeny Egorochkin
ae4ded3a5c warmux: forgot to add the patch 2013-12-21 07:10:59 +02:00
Nixpkgs Monitor
e65ce68bdf klavaro: update from 1.9.5 to 2.00 2013-12-21 02:28:28 +02:00
Evgeny Egorochkin
0ee8be3a19 warmux: fix build 2013-12-21 02:28:24 +02:00
Peter Simons
b40393438e LambdaHack: jailbreak to fix build with recent versions of hashable and pretty-show 2013-12-19 18:17:03 +01:00
Nixpkgs Monitor
46d3388196 gemrb: update from 0.6.1 to 0.8.0.1 2013-12-18 18:18:28 +02:00
Nixpkgs Monitor
113a5782a3 d2x_rebirth: update from 0.57.3 to 0.58.1 2013-12-18 18:18:24 +02:00
Nixpkgs Monitor
362f26dec7 d1x_rebirth: update from 0.57.3 to 0.58.1 2013-12-18 18:18:24 +02:00
Nixpkgs Monitor
c0a0c0b38e atanks: update from 4.7 to 4.9 2013-12-18 18:18:17 +02:00
Peter Simons
45e8de9a7d Merge branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/tools/misc/less/default.nix
 2013-12-16 21:13:24 +01:00
Peter Simons
001776428e haskell-LambdaHack: update to version 0.2.10.6 2013-12-15 22:37:42 +01:00
Nixpkgs Monitor
efb58e101a bzflag: update from 2.0.16 to 2.4.2 2013-12-15 11:25:57 +02:00
Peter Simons
e185d0603a haskell-LambdaHack: update to version 0.2.10.5 2013-12-14 15:19:29 +01:00
Nixpkgs Monitor
1937d84203 anki: update from 2.0.18 to 2.0.20 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-12-13 22:53:35 +01:00
Petr Rockai
c592783741 stepmania: A dance (rhythm) game in the spirit of DDR. 2013-12-13 20:56:36 +02:00
Michael Raskin
9e329b9fd1 Fix a minor bug in fsg 2013-12-11 16:37:08 +04:00
Peter Simons
486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
 2013-12-10 00:25:54 +01:00
Nixpkgs Monitor
a9ce83467e springLobby: update from 0.176 to 0.180 2013-12-09 10:58:16 +02:00
Moritz Ulrich
7bd64d6c1f anki: update from 2.0.12 to 2.0.18 2013-12-09 00:24:10 +00:00
Lluís Batlle i Rossell
e12695ba85 Fixing ultrastardx linking with lua. 
Now it fails to start to me, due to some alsa problems.
 2013-12-07 12:24:34 +01:00
Lluís Batlle i Rossell
a520b9cfa0 Fix the ultrastardx makefile (the hard way). 2013-12-07 00:07:34 +01:00
Moritz Ulrich
fc9772a270 openttd: update from 1.3.2 to 1.3.3 2013-12-05 16:21:28 +00:00
Peter Simons
c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
 2013-12-04 18:33:52 +01:00
Evgeny Egorochkin
7b68782e8f spring: add some of the missing dependencies 2013-12-04 05:24:22 +02:00
Nixpkgs Monitor
ae7be783a2 torcs: update from 1.3.2 to 1.3.5, potentially fixes CVE-2012-1189 2013-12-04 04:49:13 +02:00
Evgeny Egorochkin
42a5c9d637 spring-lobby: add extra dependencies 2013-12-04 04:25:05 +02:00
Nixpkgs Monitor
29c3424c13 springLobby: update from 0.169 to 0.176 2013-12-04 03:57:15 +02:00
Nixpkgs Monitor
d2799c1633 spring: update from 94.1 to 95.0 2013-12-04 03:54:34 +02:00
Peter Simons
8baecad9f9 haskell-LambdaHack: update to version 0.2.10 2013-12-02 16:26:24 +01:00
Jason "Don" O'Conal
d4789829fa tintin: add expression 2013-11-29 08:22:57 +00:00
Michael Raskin
a8048382e5 Update GNU Chess 2013-11-25 10:59:37 +04:00
Michael Raskin
87eac0321e Merge pull request #1236 from lovek323/sdlmame 
sdlmame: update to latest version
 2013-11-22 23:24:35 -08:00
Rommel M. Martinez
794afb0c78 Update xonotic to 0.7. 
Add scheme48 1.9.
 2013-11-21 09:41:01 +01:00
Jason "Don" O'Conal
774a0b4a00 sdlmame: update to latest version 2013-11-11 00:44:11 +00:00
Eelco Dolstra
c88055e1a2 Set meta.hydraPlatforms instead of meta.platforms for some packages 2013-11-05 00:06:10 +01:00
Eelco Dolstra
a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
Mathijs Kwik
609f8dc04b Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/top-level/all-packages.nix
 2013-11-01 08:31:54 +01:00
Michael Raskin
4ae50cbc1d Adding upstream tracker for quantum minigolf 2013-10-29 10:56:54 +04:00
Michael Raskin
3022fff7db Adding Quantum Minigolf game 2013-10-28 00:09:46 +04:00
Peter Simons
3d5edb453f sdlmame: fixed trivial typo 2013-10-27 12:34:30 +01:00
Peter Simons
3618e03be9 dwarf-therapist: disable Hydra builds because of unfree dwarf-fortress dependency 2013-10-27 12:32:42 +01:00
Peter Simons
91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/top-level/all-packages.nix
 2013-10-26 18:28:05 +02:00
Arvin Moezzi
9176ad1808 package residualvm 0.1.1 
ResidualVM is an interpreter for LucasArts' Lua-based 3D adventure
games like Grim Fandango.

From: #1118.
 2013-10-26 12:48:08 +03:00
Evgeny Egorochkin
23d3c30f55 alienarena: update to 7.65, fix build. 
Close #1095.
 2013-10-24 12:10:43 +03:00
Bjørn Forsman
0a4d53cc5e flightgear: add .desktop file 2013-10-21 22:47:18 +02:00
Evgeny Egorochkin
dc70f31484 sauerbraten: SVN repository has moved 2013-10-21 21:30:14 +03:00
Michael Raskin
d79b3e5998 Updating XBoard to 4.7.2 2013-10-20 21:08:25 +04:00
Lluís Batlle i Rossell
8818dbedbf Adding an attribute for the gtk freeciv too. 2013-10-20 18:26:57 +02:00
Lluís Batlle i Rossell
655ba1e418 freeciv: update to 2.4.0 2013-10-20 18:26:57 +02:00
Michael Raskin
eb385aa109 Merge pull request #1050 from bjornfor/flightgear 
flightgear: 2.10.0 -> 2.12.0 (and make it run again)
 2013-10-20 08:50:06 -07:00
Jack Cummings
1dd072f70d i686 support for GSB 2013-10-19 14:45:03 +02:00
Jack Cummings
e6f2ac65e2 Gratuitous Space Battles. Needs libcurl.so.3, so put an old version of that in, too 2013-10-19 14:45:03 +02:00
Peter Simons
6be8ad3392 Merge branch 'origin/master' into stdenv-updates. 
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
 2013-10-18 18:57:24 +02:00
Jason "Don" O'Conal
a3d9f41aad sdlmame: add expression 2013-10-12 00:31:46 +00:00
Moritz Ulrich
282b5ac5f0 dwarf-therapist: New package 
Dwarf Therapist is a tool to manage your Dwarves' work orders and
other management stuff.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-10-10 01:22:23 +02:00
Moritz Ulrich
b98ae36d32 dwarf-fortress: Update to 0.34.11. 
Somehow Dwarf Fortress suddenly started failing to use our libpng (or
zlib). I tried all possible combinations (supplying them via
LD_LIBRARY_PATH in the script) but it just won't work.

This solution was found in the Archlinux bug tracker: It just symlinks
all problematic .png files to their .bmp counterparts. It's ugly and
*sadly* breaks tileset support (unless you convert them to bmp) but I
think it's acceptable, as the whole expression is pretty problematic
in terms of purity.

Let's hope the next release of Dwarf Fortress will be easier to
support.

(fixes #710)
 2013-10-10 01:21:55 +02:00
Eelco Dolstra
21cfef0beb Disable some packages that don't build 2013-10-08 11:12:44 +02:00
Eelco Dolstra
2147a07938 Fix a bunch of Hydra evaluation errors 2013-10-07 17:36:47 +02:00
Bjørn Forsman
1a062d1456 flightgear: 2.10.0 -> 2.12.0 (and make it run again) 
The current FlightGear expression doesn't work:

  bash$ nix-build -A flightgear
  /nix/store/3c47sibzb9h1vhnn0gnh692hkpjc5p5v-flightgear-2.10.0

  bash$ ./result/bin/fgfs
  ERROR: The path '/nix/store/3c47sibzb9h1vhnn0gnh692hkpjc5p5v-flightgear-2.10.0/lib/FlightGear' does not exist in the file system.

  Base package check failed:
    Version [none] found at: /nix/store/3c47sibzb9h1vhnn0gnh692hkpjc5p5v-flightgear-2.10.0/lib/FlightGear
    Version 2.10.0 is required.
  Please upgrade/downgrade base package and set the path to your fgdata
  with --fg-root=path_to_your_fgdata

We could probably make the 2.10.0 version run, but I had already
upgraded it to 2.12.0 before I made it work. It seems only the data dir
configuration was wrong/missing: FG_DATA_DIR="$out/share/FlightGear/".

Simgear must be in version sync with flightgear, hence the upgrade.

Most of the diff is because I rewrote the flightgear expression to what
I think is the "new style". I wanted to add a preConfigure phase but
didn't understand why this expression had custom phases. So I just
rewrote the whole thing to something I consider more readable.
 2013-10-06 22:38:48 +02:00
Bjørn Forsman
083d0890f5 More description fixes 
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
 2013-10-06 12:01:38 +02:00
Bjørn Forsman
28ac782583 Some description fixes 
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
 2013-10-05 19:36:23 +02:00
Peter Simons
ac5d5297dd Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-02 22:44:12 +02:00
Moritz Ulrich
296dbc8279 OpenTTD: 1.3.2 & some coding-style fixes. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-09-29 00:29:26 +02:00
Peter Simons
9407832de4 Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/development/libraries/gettext/default.nix
 2013-09-23 10:59:44 +02:00
Domen Kožar
a774212684 anki: 2.0.3 -> 2.0.12 2013-09-22 19:23:11 +02:00
Peter Simons
ad13652455 haskell-LambdaHack: update to version 0.2.8 2013-09-22 13:25:09 +02:00
Peter Simons
24366adf19 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-14 15:28:40 +02:00
Sander van der Burg
28d8e93871 My attempt to get Steam working in NixOS. It uses a function called buildFHSChrootEnv {} that composed chroot environments. In such a chroot environment, I could run Steam without much problem 2013-09-13 23:58:59 +02:00
Peter Simons
3d2caf1180 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-08 22:54:35 +02:00
Jason \"Don\" O'Conal
834cd6c886 beret: Fix build on darwin (close #923) 2013-09-08 10:32:25 +02:00
Peter Simons
98fcc2f746 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-08-30 10:45:11 +02:00
Eelco Dolstra
6f9c01cfbc vessel: Don't build on Hydra 
http://hydra-test.nixos.org/build/5822528
 2013-08-28 17:38:54 +02:00
Vladimír Čunát
991a617025 wesnoth: fix build, minor update, parallel builds 
Yes, games are the most important things in nixpkgs...
not that I actually plan to play it anytime soon ;-)
 2013-08-27 12:08:35 +02:00
Vladimír Čunát
2fa5f01bb9 wesnoth: fix build, minor update, parallel builds 
Yes, games are the most important things in nixpkgs...
not that I actually plan to play it anytime soon ;-)
 2013-08-27 12:07:21 +02:00
Peter Simons
9ac8ea937c Merge branch 'origin/master' into stdenv-updates. 2013-08-26 12:21:23 +02:00
Sergey Mironov
d5ddce7f76 instead: version 1.9.1, icon, .desktop, few more games 
Instead is a textquest game engine. Games are located at

http://instead-games.sourceforge.net/
http://instead-games.ru/
 2013-08-18 19:34:23 +02:00
Peter Simons
0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons
76244ac2e2 Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
 2013-08-16 22:51:13 +02:00
aszlig
e76a755517
uqm: Add myself to the maintainers list. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-15 10:43:39 +02:00
aszlig
3fbd3a025d
uqm: Symlink addons and packages. 
Copying these over to the output path of the main derivation will just
unnecessarily blow up the size of it with files we already have in the
store anyway.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-15 10:43:39 +02:00
aszlig
80673a70e7
uqm: Add an option to use the remix packs. 
The remix packs are a collection of newly remixed versions of the
old music from the PC/3DO versions. By using useRemixPacks these are
fetched as well and added to the game.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-15 10:43:39 +02:00
aszlig
5b421a86f6
uqm: Convert base16 SHA256 hashes to base32. 
We want to have shorter SHAs, don't we? :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-15 10:43:39 +02:00
aszlig
7e2587561d
uqm: Switch to using fetchurl for uqm3donix. 
As we now have a tagged first release, it really doesn't make sense to
introduce additional dependencies by using fetchgit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-15 10:43:38 +02:00
aszlig
4f62f1603a
uqm: Update video extractor to latest Git version. 
This updates the 3DO video extractor to the latest Git version, which
should fix a too restrictive dependency on base which leads to it not
compiling with current nixpkgs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-14 20:50:58 +02:00
Evgeny Egorochkin
37996253e6 Steam: fix and update to 1.0.0.39 2013-08-10 06:08:19 +03:00
Carles Pagès
5885cf1286 steam: add flashplayer plugin support. 
The videos work, but there is a problem with sound:
ALSA lib dlmisc.c:236:(snd1_dlobj_cache_get) Cannot open shared library
/nix/store/9z51hr9l19vdhgmqd60jwwrg6ny5md2d-alsa-plugins-1.0.26/lib/alsa-lib/libasound_module_pcm_pulse.so

It tries to open a 64bit plugin, which obviously fails. I think this depends on
/etc/asound.conf, but I'm not sure how to fix it.

Regardless of the problem, in one computer I tried the sound works but other
apps cannot output sound. In another, the sound doesn't work and other apps
continue working as normal.
 2013-08-10 06:08:18 +03:00
Carles Pagès
4d853ae94f steam: revert adding amd64 version. 
It turns out that the .deb only contains the changelog and some other docs.
Revert back to using the i686 version, but keep the double url for the future.
 2013-08-10 06:08:18 +03:00
Carles Pagès
97ea8d61e6 steam: add amd64 version and point url to fix version (as suggested by aristid). 
Valve has a repository with fixed version packages, so use that instead of the
steam.deb I was using. They also have amd64 packages there.
 2013-08-10 06:08:18 +03:00
Carles Pagès
3f4557b0eb steam: update to 1.0.0.28 2013-08-10 06:08:18 +03:00
Carles Pagès
bd44348baf steam: create some missing symlinks in the script. 
In the original script it says they are temporary, but without those simlinks
Osmos and others fail to start with SteamAPI_Init() failed.
 2013-08-10 06:08:18 +03:00
Carles Pagès
87c5a418ec steam: create proper symlinks in $HOME/.steam 2013-08-10 06:08:17 +03:00
Carles Pagès
a249fa67d9 steam: add libXdmcp to dependencies. 
I must have been blind. libXdmcp is in nixpkgs, contrary to what I said.
 2013-08-10 06:08:17 +03:00
Carles Pagès
dc10fabb2f steam: update to 1.0.0.27 
It needed some more sed'ing and more deps. It's still not working as I seem to
need libXdmcp which is not in nixpkgs.
 2013-08-10 06:08:17 +03:00
Carles Pagès
f42cece8f5 steam: update to 1.0.0.21. 
I also updated the patches for the bootsrapper script and fixed a typo, but
didn't test anything.
 2013-08-10 06:08:17 +03:00
Carles Pagès
094c0662e8 steam: add mesa to library path. 
Mesa is needed for Superbrothers: S&S EP, which links to libGLU.
 2013-08-10 06:08:17 +03:00
Carles Pagès
10f722dc04 steam: workaround segfault at startup. 
I don't know why, if I call ld-linux.so.2 to launch the game, it segfaults, so
I renamed it to ld.so.
 2013-08-10 06:08:16 +03:00
Carles Pagès
c75cccc469 steam: update to 1.0.0.18. 
I forgot in the previous commit to update the version as I had changed the
tarball hash.

I also modified a bit the launcher script, since xz should only be needed by
the installer.
 2013-08-10 06:08:16 +03:00
Carles Pagès
b07300f2ef steam: bypass valve's bootstrapper. 
Since there is no way to modify either steam.sh or the steam binary as they are
hash checked, I took the approach of bypassing steam.sh and create a script
that does its job.

For now it segfaults, but when I try to run under strace, it works perfectly.
Need to check this.
 2013-08-10 06:08:16 +03:00
Carles Pagès
dad0ed4eaa steam: add all the missing dependancies. 
Calling their steam script still segfaults, but I managed to run it from the
shell with all these deps in the lib path.
 2013-08-10 06:08:16 +03:00
Carles Pagès
ee6129350e steam: add glibc215 to the wrapper. 2013-08-10 06:08:16 +03:00
Carles Pagès
12a0d83855 Steam: add patch for user stuff and lib paths to wrapProgram. 
The binaries that get copied to $HOME need patchelf to run, and after that I
need all the runtime libs in the library path. Still not working as I need
glibc2.15.
 2013-08-10 06:08:15 +03:00
Carles Pagès
3cd37b550b Steam: first attempt at adding the beta client. 
The script installed with this expression only copies a boostrapper and another
script to the user's home folder. Those also need to be patched to get on with
the installation.
 2013-08-10 06:08:15 +03:00
Peter Simons
522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates. 
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
 2013-07-30 11:29:30 +02:00
Cillian de Róiste
d7283abbbb gtypist: update to 2.9.3 and fix the patch 2013-07-19 01:22:29 +02:00
Evgeny Egorochkin
da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin
d0b4c8bfaa gktspell: version bump to 2.0.16 because the old one has disappeared 2013-07-14 03:09:34 +03:00
Evgeny Egorochkin
297a561491 eduke32: fix version to match tarball 2013-07-14 02:08:54 +03:00
Evgeny Egorochkin
6c1fc08df7 blobby-volley: fix version to match tarball 2013-07-14 02:08:48 +03:00
Evgeny Egorochkin
3af273f3c3 3dpong: fix version to match tarball 2013-07-14 02:08:48 +03:00
Vladimír Čunát
8ba92b8895 Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix
 2013-07-08 10:48:05 +02:00
Mathijs Kwik
0b17251c06 libpng: keep versioning in all-packages.nix, not in individual expressions 2013-06-27 21:35:21 +02:00
Mathijs Kwik
7f413e4d5c whitespace cleaning 2013-06-27 21:35:21 +02:00
Eelco Dolstra
acba9240cd nixos.org/tarballs -> tarballs.nixos.org 
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
 2013-06-25 14:12:16 +02:00
Vladimír Čunát
842420c3e1 Merge branch 'master' into stdenv-updates 
Conflicts (relatively simple):
	pkgs/development/interpreters/python/2.7/default.nix
	pkgs/development/libraries/dbus/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/common.nix
 2013-06-20 19:21:25 +02:00
Eelco Dolstra
efde9567d1 flightgear: Remove from channel 
It's 264 MiB compressed...
 2013-06-17 22:51:37 +02:00
Vladimír Čunát
b770365574 ReRevert Merge x-updates into master 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
 2013-05-29 23:25:02 +02:00
Peter Simons
728e305205 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-05-22 12:30:02 +02:00
aszlig
1aa68dd29f
uqm: Include optional support for 3DO videos. 
This is optional because you have to have an image of a Star Control II 3DO CD
image. I decided to hack together a small OperaFS (that's the proprietary
filesystem used with 3DO CD-ROMs) file extractor, which should possibly make
it as painless as possible to include those videos.

It may be a good idea to split off the haskell package into another attribute
set (possibly haskellPackages?), but I really don't think there is a need for
that, because it's really just UQM and 3DO specific.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-05-16 21:03:07 +02:00
Peter Simons
3b2254a3af Remove myself from the meta.maintainer field of most Haskell packages. 
There is no point in receiving hundreds of e-mails; I cannot read them anyway.
 2013-05-11 00:36:59 +02:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Vladimír Čunát
1278859d31 Merge branch 'master' into x-updates 
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
 2013-05-08 13:46:46 +02:00
Michael Raskin
0c020c98f9 Updates: Wine, SBCL, XBoard 2013-05-08 10:52:47 +04:00
Shea Levy
fde3526e7d Merge branch 'master' into stdenv-updates 
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.

Signed-off-by: Shea Levy <shea@shealevy.com>

Conflicts:
	pkgs/development/libraries/kerberos/krb5.nix
 2013-05-04 18:28:48 -04:00
Eelco Dolstra
14169da6f5 vdrift: Remove from the channel 
It's 564 MiB compressed.
 2013-05-02 13:26:15 +02:00
Eelco Dolstra
7846ad9a90 alienarena: Remove from the channel 
387 MiB compressed, 898 uncompressed.
 2013-05-02 13:26:01 +02:00
Eelco Dolstra
40cd4a8a9d xonotic: Remove from the channel 
It's 878 MiB compressed.
 2013-05-02 13:25:57 +02:00
Eelco Dolstra
a1bc05bb55 ufoai: Remove from the channel 
It's 898 MiB compressed.
 2013-05-02 13:25:52 +02:00
Eelco Dolstra
35e8764a2e speed-dreams: Remove from the channel 
At 758 MiB compressed it's really too big for the channel.
 2013-05-02 13:25:44 +02:00
Vladimír Čunát
bde20f3e88 Merge branch 'master' into x-updates 
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
 2013-04-24 06:29:09 +00:00
Michael Raskin
b98ece6bc2 Auto-update some packages; no early build failures (SBCL and Wine not yet fully built) 2013-04-23 09:15:48 +04:00