mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 07:31:20 +00:00
Code Issues Wiki Activity
35067 commits 228 branches 124 tags 7.2 GiB
Commit graph

537 commits

Author SHA1 Message Date
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
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
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
Vladimír Čunát 17ae1617dc Merge branch 'master' into x-updates 
Conflicts (systemd version is split on x-updates):
	pkgs/os-specific/linux/systemd/default.nix
 2013-04-13 12:21:31 +02:00
Eelco Dolstra 4adad458e7 Remove the "proprietary" license 
We already had "unfree".
 2013-04-12 14:37:50 +02:00
Vladimír Čunát 8249695b61 Merge branch 'master' into x-updates 
Needed that to fix the tarball.
 2013-04-11 23:31:33 +02:00
Lluís Batlle i Rossell 78827836cc openlierox: fixing and updating. 2013-04-06 12:09:18 +02:00
Lluís Batlle i Rossell 04d41f95d0 Adding d2x-rebirth, source port of the Descent 2 engine 2013-04-05 22:59:20 +02:00
Lluís Batlle i Rossell 65c008f653 Adding d1x-rebirth, Descent 1 source port. 2013-04-05 22:59:20 +02:00
Lluís Batlle i Rossell 3db052eb7a dhewm3: linking with mesa (for non-nvidia cards) 
It was just doing a dlopen(libGL), so mesa wasn't in the rpath.
Now it is.
 2013-04-04 23:07:23 +02:00
Lluís Batlle i Rossell bbbedf56c6 dhewm3: adding enableParallelBuilding 2013-04-04 23:07:23 +02:00
Vladimír Čunát eb2e46aab2 Merge branch 'master' into x-updates 
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
 2013-04-04 21:43:40 +02:00
Carles Pagès 1717b494bf dhewm3: add mesa to build inputs 
I also removed an unused line I left over in previous commits.
 2013-04-02 22:52:50 +02:00
Carles Pagès 8f2662d480 dhewm3: add current master from github 
This is a port of the Doom 3 source code released under GPL. Amongst others,
this makes use of SDL to be multiplatform, and supports amd64.
 2013-04-02 22:28:30 +02:00
Domen Kozar e58521d5dc anki: set platforms 2013-03-31 20:56:18 +02:00
Domen Kozar c72ac21c55 springlobby: bump to 0.169 2013-03-30 20:05:13 +01:00
Domen Kozar 6026c60388 spring: bump and fix build 2013-03-29 16:43:48 +01:00
Peter Simons 6fc2cccfe6 Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix. 2013-03-23 15:58:14 +01:00
Mathijs Kwik ebf71f78ef gtypist: fix patch hash 2013-03-22 00:00:05 +01:00
Michael Raskin a24da89252 Update/fix SGT puzzles 2013-03-21 17:35:18 +04:00
Peter Simons bcfe0ef394 blobby: update to 2.0rc3 (which is called 1.0rc3 on the server for some reason) 2013-03-21 10:28:09 +01:00
Vladimír Čunát 03ba2960a4 vdrift: update and fix 
Tested on two laps :-)
 2013-03-09 14:59:39 +01:00
Александр Цамутали 63256d0834 games/unvanquished: Update to 0.13.1. 2013-03-08 20:58:48 +04:00
Eelco Dolstra 674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Michael Raskin f251f8b91a XBoard: update to version 4.7.0 2013-03-07 10:58:25 +04:00
Sander van der Burg 9455f23d22 eduke32: Bumped to rev 3542 - very important 2013-03-03 19:34:59 +01:00
Vladimír Čunát d505b8c490 freedink: update and fix 2013-02-28 16:34:19 +01:00
Peter Simons 5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Александр Цамутали 7d5056f8a3 games/unvanquished: New nixpkg. 2013-02-24 18:02:53 +04:00
Vladimír Čunát 82a0df8bad flightgear: fix build via update; but no testing, hope it works 2013-02-23 20:32:12 +01:00
Shea Levy c42d77aa35 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-02-17 08:19:40 -05:00
Александр Цамутали 1921086ffa urbanterror: Correction for previous commit. 2013-02-16 21:52:36 +04:00
Александр Цамутали bcc14b65c3 urbanterror: Update to 4.2.009. 2013-02-16 21:43:34 +04:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Александр Цамутали 4cb80bdb1e warsow: Fix for ui module downloaded from server. 2013-02-12 01:02:19 +04:00
Vladimír Čunát 712af3a70f Merge pull request #243 from RSzibele/minetest-0.4.4 
add minetest-0.4.4.
 2013-02-10 03:08:40 -08:00
Александр Цамутали 9bd4d4e8a4 warsow: Update to 1.03. 2013-02-07 03:37:50 +04:00
Vladimír Čunát c95cbc12cb wesnoth: fix by updating and using newer boost 2013-02-05 19:40:06 +01:00
Vladimír Čunát ed699d1c17 simutrans: pass meta into the final package so it's built by hydra 2013-02-02 16:44:42 +01:00
Vladimír Čunát 602e6a94ee simutrans: fix, update, split data, make pak128 the default 
Today the monitor resolutions are quite high, so I set pak128 as the default.
It's easy to change.
 2013-02-02 12:38:15 +01:00
Eelco Dolstra 8317cd1f14 kde-3: Remove 
KDE 3 hasn't built in a long time.  Also remove six, the only package
with a dependency on KDE 3.
 2013-01-29 12:43:53 +01:00
Aristid Breitkreuz d596180cf8 use alsa-oss layer for minecraft 2013-01-28 02:58:47 +01:00
viric 0a8f2e084f Merge pull request #260 from jcumming/vessel.121213 
Vessel.121213
 2013-01-27 12:38:08 -08:00
Vladimír Čunát 46dd0485f5 Update ufoai to 2.4, clean dependencies and the expression. 2013-01-26 23:36:42 +01:00
Rickard Nilsson 1886d1db6a Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-01-20 16:53:21 +01:00
Aristid Breitkreuz d674d9cf9b update minecraft recipe 2013-01-18 02:01:08 +01:00
Eelco Dolstra 0db6ea6f76 Remove some oversized packages from the channel 
E.g. urbanterror takes up 2x720 MiB.
 2013-01-17 22:34:08 +01:00
Eelco Dolstra 5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Eelco Dolstra 7fd42a8380 Get rid of the "sf" alias for "sourceforge" 2013-01-14 12:00:32 +01:00
Peter Simons b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Lluís Batlle i Rossell ce705aa998 supertuxkart: updating to 0.8 2013-01-10 20:55:46 +01:00
Lluís Batlle i Rossell 7e1d0c12a3 stuntrally: updating from 1.4 to 1.8 
I updated ogre and mygui, too. Now myguiSvn is older than mygui.
We should check if this commit breaks other games that use ogre (ror?)
 2013-01-10 15:11:12 +01:00
Florian Friesdorf 0d3ad0d786 bsd-games: fix some paths, pager and typo 2013-01-09 06:53:44 +01:00
Peter Simons 9e9cd7b529 Merge branch 'master' into stdenv-updates. 2013-01-04 21:00:53 +01:00
RSzibele 894de031cd Added Minetest-0.4.4. 2013-01-04 11:39:11 +01:00
Jan Malakhovski e00c03101f anki: add version 2.0.3 2013-01-04 03:48:47 +00:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Eelco Dolstra 5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv 
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
 2012-12-28 19:08:19 +01:00
Jack Cummings 69b752de57 patchelf the libraries: they need rpath set for sound to work 2012-12-27 18:42:40 -08:00
Jack Cummings 36e946c34f Need pulseaudio or alsalibs for sound. 2012-12-18 00:07:24 -08:00
Jack Cummings d1254fa27e add Vessel, a fluid physics puzzle game. 2012-12-16 23:24:31 -08:00
aszlig 5054e8ec29
scid: New package, version 4.3. 
Just saw Michael Raskin's GNU Chess and XBoard updates and did a short check if
Scid is already in nixpkgs. It wasn't, so I decided to add it, so thanks to
@7c6f434c :-)

The package involves a lot of patching, as usual with Tcl/Tk on NixOS. In this
case the program is written in C++ and embeds the Tcl/Wish interpreter.

Unfortunately this doesn't make it easier to inject TCLLIBPATH, as there doesn't
seem to be a direct library call (well in theory you could `lappend TCLLIBPATH`,
but that won't help with TK_LIBRARY).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-12-12 12:36:20 +01:00
Peter Simons de81ec924b haskell-LambdaHack: update to version 0.2.6.5 2012-12-12 11:54:27 +01:00
Michael Raskin 498f2e7c20 GNU Chess: update to 6.0.2 2012-12-12 09:36:14 +04:00
Michael Raskin 232fedb1c7 XBoard: update to 4.6.2 2012-12-12 09:29:49 +04:00
Michael Raskin d3e5b8feee Fix dummy pseudo-updates being found for some packages 2012-12-08 13:05:43 +04:00
Michael Raskin 138e9e0212 Oops. Fix LincityNG source search 2012-12-04 17:09:31 +04:00
Michael Raskin 680ca19789 Xmoto: remove obsolete patch 2012-12-04 14:50:50 +04:00
Michael Raskin 8976915c6d Update xmoto 2012-12-04 10:09:18 +04:00
Michael Raskin 0918928cdb Currently advertised Lincity-NG download URL 2012-12-04 09:59:09 +04:00
Michael Raskin e9c35e9381 Add Pingus 2012-12-02 00:23:28 +04:00
Alexander Tsamutali bfa2cbe55e games/warsow: Updated to 1.02. 2012-12-01 02:27:47 +03:00
Michael Raskin 702590f6c6 Add Lincity-NG fork 2012-11-30 22:59:26 +04:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files 
Plus a small number of obsolete packages (like old versions of qemu).
 2012-11-29 13:43:37 +01:00
Jack Cummings 6540190179 World of Goo 1.41. 2012-11-28 14:38:46 -08:00
Peter Simons 2a7cda22f8 haskell-LambdaHack: update to version 0.2.6 2012-11-26 15:32:19 +01:00
Florian Friesdorf d66fa56de2 xsokoban: fix for colliding getline in score.c 2012-11-26 15:24:33 +01:00
Florian Friesdorf 7ac03301a7 xsokoban scorefile in current directory 2012-11-26 15:24:33 +01:00
Florian Friesdorf 39cb204797 zoom-1.1.5 - also adjust name 2012-11-26 14:43:28 +01:00
Florian Friesdorf ed45707278 zoom-1.1.5 2012-11-26 14:32:03 +01:00
Florian Friesdorf 7d717444e5 zdoom 2.6.1 (instead of svn) 2012-11-26 14:32:03 +01:00
Michael Raskin 4c5c8ba08e TBE: fix unneeded /bin/sh reference 2012-11-10 15:14:28 +04:00
Michael Raskin 66164a941b FSG: Fix unneeded /bin/sh reference 2012-11-10 15:09:42 +04:00
Joachim Schiele 49f2fef481 updated spring from 88 to 91 and downgraded the boost library which spring uses from default to 1.49 as the 
more recent boost version results in a build issue at about 30%
 2012-10-28 13:43:15 +00:00
Michael Raskin 3d2e43df37 Update sgt-puzzles 2012-10-18 00:21:42 +04:00
Jack Cummings 66e43a5297 - Make rili work with new autoconf versions 2012-10-05 13:56:51 -07:00
Jack Cummings 18d4a832b0 - clean up openttd, rili, uqm, and widelands descriptions 2012-10-05 09:36:36 -07:00
Jack Cummings 27ec277359 - add myself as a maintainer for the packages I've added 2012-10-04 23:39:00 -07:00
Jack Cummings 22ece175a0 - openttd 1.2.2, rili 2.0.1, widelands-build17, uqm-0.7.0 2012-10-04 23:32:34 -07:00
Александр Цамутали 400db72f1d games/warsow: Updated to 1.0. 2012-09-24 02:27:34 +04:00