1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00
Commit graph

599 commits

Author SHA1 Message Date
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