3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1348 commits

Author SHA1 Message Date
Tuomas Tynkkynen 4ff8f377af Merge remote-tracking branch 'upstream/master' into staging 2016-04-28 00:13:53 +03:00
Tuomas Tynkkynen 6e24c9974f typespeed: Add platforms 2016-04-27 05:06:35 +03:00
Nikolay Amiantov aa1a40b63d dwarf-therapist: add version to derivation, use symlinkJoin 2016-04-26 15:37:43 +03:00
Nikolay Amiantov 5f19542581 Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into staging 2016-04-25 18:02:23 +03:00
Nikolay Amiantov 559a563208 Merge pull request #14971 from rardiol/the-powder-toy
the-powder-toy: 90.2.322 -> 91.3.328
2016-04-25 18:43:48 +04:00
Ricardo Ardissone a51da70189 the-powder-toy: 90.2.322 -> 91.3.328 2016-04-25 10:15:44 -03:00
Nikolay Amiantov ab0a0c004e makeSearchPathOutputs: refactor to makeSearchPathOutput 2016-04-25 13:24:39 +03:00
Nikolay Amiantov 953c51f65e dwarf-fortress-unfuck: use mesa_noglu instead of mesa 2016-04-24 16:33:11 +03:00
Nikolay Amiantov 19500bc23b Merge pull request #14941 from rardiol/opendungeons
opendungeons: init at 0.6.0
2016-04-24 17:19:34 +04:00
Ricardo Ardissone 71b935c339 opendungeons: init at 0.6.0 2016-04-23 17:31:42 -03:00
Nikolay Amiantov 7f32a05baa dwarf-therapist: fix build 2016-04-23 22:25:34 +03:00
Nikolay Amiantov 6d432531c6 Merge pull request #14906 from rardiol/dwarf-fortress-unfuck
dwarf-fortress-unfuck: 2016-02-11 -> 2016-04-22 and zlib dependency
2016-04-23 02:42:15 +04:00
Ricardo Ardissone bdf714c303 dwarf-fortress-unfuck: 2016-02-11 -> 2016-04-22 and zlib dependency 2016-04-22 19:34:11 -03:00
Pascal Wittmann fe6899e330 instead: 2.4.0 -> 2.4.1 2016-04-22 21:05:38 +02:00
Vladimír Čunát e9379f7416 Merge branch 'staging'
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00
Michael Raskin 38aa457f9a sgtpuzzles: add a .upstream file for autoupdating 2016-04-22 00:57:43 +02:00
Joachim Fasting 79de9293c2 Merge pull request #14869 from rardiol/factorio
factorio: add explict dependency on cacert for chroot build
2016-04-21 16:21:14 +02:00
Ricardo Ardissone f2cee89b22 factorio: add explict dependency on cacert for chroot build 2016-04-21 11:09:53 -03:00
Nikolay Amiantov 02014ea0aa mudlet: move to qmakeHook 2016-04-20 18:55:54 +03:00
Nikolay Amiantov f8d96d1983 chessx: move to qmakeHook 2016-04-20 18:55:54 +03:00
Michael Raskin fb60199d42 sgtpuzzles: update, switch to git-snapshot tarballs 2016-04-20 11:33:45 +02:00
Micxjo Funkcio 5f3d24bc92
freeciv: 2.5.0 -> 2.5.3 2016-04-19 21:59:41 -07:00
Linus Arver 5ce564563d sdlmame: fix broken URLs (close #14814) 2016-04-19 11:40:49 +02:00
Nikolay Amiantov 05e713e7a5 Merge pull request #14775 from rardiol/freeorion
freeorion: init at 0.4.5
2016-04-19 03:09:46 +04:00
Nikolay Amiantov d8eec18ce2 freeorion: fix paths in configuration file before start 2016-04-18 16:20:46 -03:00
Nikolay Amiantov 756a83191c freeorion: enable parallel building 2016-04-18 16:20:45 -03:00
Nikolay Amiantov 454a64caff Merge commit 'refs/pull/14779/head' of git://github.com/NixOS/nixpkgs 2016-04-18 14:02:35 +03:00
Ricardo Ardissone 5f832739ce warzone2100: 3.1.1 -> 3.1.5 2016-04-18 07:37:18 -03:00
Lluís Batlle i Rossell 2d3245042e Removing content-pack download from rigsofrods.
The content packs from 0.37 don't seem to work. We should get one from 0.4, but
there are license problems, I think.
2016-04-18 12:30:47 +02:00
Lluís Batlle i Rossell e741a302d4 Make rigsofrods build the latest code.
I add angelscript 2.22 too, as it makes RoR happy.
2016-04-18 12:30:47 +02:00
Lluís Batlle i Rossell 93bd5556be Revert "rigsofrods: remove dead package"
This reverts commit 69e7948ffe.
2016-04-18 12:04:38 +02:00
Ricardo Ardissone 3ce9294eeb freeorion: init at 0.4.5 2016-04-18 04:45:21 -03:00
Nikolay Amiantov a832a71c2c vdrift: 2012-07-22 -> 2014-10-20 2016-04-17 05:24:40 +03:00
Nikolay Amiantov bd5cd56a49 openmw: 0.38.0 -> 0.39.0 2016-04-17 05:24:40 +03:00
Vladimír Čunát 95d4dda578 factorio: fix evaluation of meta 2016-04-16 23:17:09 +02:00
Eric Litak 7ce216139c factorio: bump to 0.12.29 and headless version 2016-04-14 23:03:05 -07:00
Eric Litak c6750d2f46 factorio: refactor in preparation for headless version 2016-04-14 23:03:04 -07:00
Alexander V. Nikolaev 32724102ed minetest: Fix finding gettext by CMake 2016-04-14 19:36:37 +03:00
Nikolay Amiantov 37d641ff3d dfhack: use protobuf compiled with old ABI 2016-04-14 17:30:40 +03:00
Nikolay Amiantov 0ffd6d16b6 dwarf-therapist: fix build (see #14670) 2016-04-14 04:17:56 +03:00
Nikolay Amiantov 755e4633c7 mass-replace glib and gtk lib/*/include paths 2016-04-14 04:13:54 +03:00
Nikolay Amiantov 8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Vladimír Čunát 39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Nikolay Amiantov 0c978d7d4f openmw: build with its own openscenegraph fork
This gives speed improvement and fixes potential bugs.
For example: https://bugs.openmw.org/issues/3351
Updating our openscenegraph package would fix this too, but
it breaks some packages (i.e. simgear, bumping the version does
not help). Besides, fork has patches for better performance.
2016-04-13 04:35:42 +03:00
Franz Pletz f1de534188 openttd: 1.5.3 -> 1.6.0 2016-04-12 15:49:54 +02:00
Nikolay Amiantov d2dba02a87 openmw: add meta.platforms 2016-04-12 03:57:42 +03:00
Ricardo Ardissone c6cb8ebe01 openmw: 0.36.1 -> 0.38.0 2016-04-11 21:47:57 -03:00
Nikolay Amiantov 1365492424 stuntrally: 2.5 -> 2.6, mark as broken 2016-04-12 03:09:44 +03:00
Ricardo Ardissone 4e39ce7b79 liberal-crime-squad: init at 2016-03-03 2016-04-10 20:24:45 -03:00
Vladimír Čunát 30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00