mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Code Issues Wiki Activity
102854 commits 204 branches 125 tags 10 GiB
Commit graph

1759 commits

Author SHA1 Message Date
Nikolay Amiantov afdce0e3fa the-powder-toy: fix build 2016-08-22 16:55:56 +03:00
Nikolay Amiantov 9db19905be Merge pull request #17909 from womfoo/fix/arx-libertatis-build 
arx-libertatis: fix build
 2016-08-22 16:59:31 +04:00
Kranium Gikos Mendoza 8d8208c771 arx-libertatis: fix build 2016-08-22 16:41:30 +08:00
Nikolay Amiantov b8b668fc03 commandergenius: 194beta -> 1822release 2016-08-22 08:40:01 +03:00
Nikolay Amiantov 4197bfee34 bloodpilot-client: fix build 2016-08-22 07:43:22 +03:00
Nikolay Amiantov 7783862700 dwarf-fortress-packages.dwarf-fortress-unfuck: fix build 2016-08-22 07:43:12 +03:00
Nikolay Amiantov a07a5a1931 armagetronad: fix build 2016-08-22 06:30:01 +03:00
obadz 24a9183f90 Merge branch 'hardened-stdenv' into staging 
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
 2016-08-22 01:19:35 +01:00
Joachim F 4a3d8d2885 Merge pull request #17885 from womfoo/bump/performous-1.1 
performous: 1.0 -> 1.1, fixes build
 2016-08-21 20:52:38 +02:00
Kranium Gikos Mendoza 56ef5aa714 performous: 1.0 -> 1.1 2016-08-21 14:56:11 +08:00
Nikolay Amiantov 392fb9d092 Merge pull request #17855 from womfoo/fix/openttd-music-support 
openttd: music support
 2016-08-20 03:09:46 +04:00
Kranium Gikos Mendoza 63a2c80bf9 openttd: out of the box midi playback 2016-08-20 06:57:02 +08:00
Kranium Gikos Mendoza d770792197 openttd: correct openmsx dir 2016-08-20 06:21:46 +08:00
Robin Gloster 33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Svein Ove Aas cbe8832cd7 factorio: Fix the fetch script (#17741) 2016-08-14 22:47:00 +00:00
Nikolay Amiantov af376b90e3 wesnoth-dev: 1.13.4 -> 1.13.5 2016-08-14 22:37:10 +03:00
Nikolay Amiantov d7d1efe27f the-powder-toy: 91.3.328 -> 91.5.330 2016-08-14 22:37:09 +03:00
Nikolay Amiantov c3868a1d74 steam-packages.steam-runtime: 2016-03-03 -> 2016-08-13 2016-08-14 22:37:09 +03:00
Nikolay Amiantov f2913e46fd ioquake3: 2016-04-05 -> 2016-08-11 2016-08-14 22:37:09 +03:00
Nikolay Amiantov df063d8b46 dwarf-fortress-packages.phoebus-theme: 42.06a -> 43.03 2016-08-14 22:37:09 +03:00
Nikolay Amiantov b510492d99 dwarf-fortress-packages.cla-theme: 42.06-v22 -> 43.04-v23 2016-08-14 22:37:09 +03:00
Nikolay Amiantov d0bee3aeec dwarf-fortress-packages.dfhack: 0.42.06-r1 -> 0.43.03-r1 2016-08-14 22:37:09 +03:00
Nikolay Amiantov b940a098ec dwarf-fortress-packages.dwarf-fortress-original: 0.42.06 -> 0.43.05 2016-08-14 22:37:08 +03:00
Nikolay Amiantov 0f3da54924 dwarf-fortress-packages.dwarf-fortress-unfuck: 2016-04-22 -> 2016-07-13 2016-08-14 22:37:08 +03:00
Nikolay Amiantov 309de1364a crawl: 0.18.0 -> 0.18.1 2016-08-14 22:37:08 +03:00
Frederik Rietdijk 6842a24b21 Remove top-level pyqt4 
See #11567.
 2016-08-14 12:38:01 +02:00
Franz Pletz bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
obadz f279b253d5 pokerth: init at 1.1.1 2016-08-13 01:40:16 +01:00
Robin Gloster b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Michael Raskin 3260b695af xboard: 4.9.0 -> 4.9.1 2016-08-11 17:57:35 +02:00
Tuomas Tynkkynen ce823a8dbc gambatte: Fix sandbox build 2016-08-11 00:50:16 +03:00
Vladimír Čunát 947abb08ac Merge branch 'staging' 2016-08-10 22:09:38 +02:00
Fabian Schmitthenner b91fc3f8d0 fix typo (#17621) 2016-08-09 21:15:55 +02:00
Vladimír Čunát 950feb70b2 treewide: fixup various mysql ocurrences after re-split 2016-08-07 20:46:37 +02:00
Kranium Gikos Mendoza 6a8673716e openttd: 1.6.0 -> 1.6.1 (#17580) 
also disable builds on darwin
 2016-08-07 19:45:15 +02:00
Rok Garbas a741978f20 Merge pull request #17479 from elitak/factorio 
Factorio: 0.13.8 -> 0.13.13, mod support
 2016-08-07 04:09:52 +02:00
Paul Hendry 486b8e7f5c Add Terraria server service (#16832) 2016-08-07 03:58:38 +02:00
Franz Pletz 72d164c40d hedgewars: fix build 2016-08-06 19:34:18 +02:00
Franz Pletz f993dff52b trackballs: disable format hardening 2016-08-04 11:09:14 +02:00
Eric Litak d76aa6e7e4 factorio: sample mods 2016-08-03 16:47:21 -07:00
Eric Litak d33540734f factorio: rudimentary mod support for factorio's nixos module 2016-08-03 16:44:51 -07:00
Robin Gloster 7ab971a252 scummvm: disable format hardening 2016-08-03 20:32:34 +00:00
Robin Gloster 847f9994e4 gnugo: disable format hardening 2016-08-03 20:04:03 +00:00
Robin Gloster e266c6a2c1 eboard: disable format hardening 2016-08-03 20:03:36 +00:00
Eric Litak 4b96a2d148 factorio: 0.13.8 -> 0.13.13 2016-08-03 06:45:27 -07:00
Robin Gloster 1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms 
Build-tested on x86_64 Linux & Mac.
 2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen e669521834 gambatte: init at 2016-05-03 2016-08-02 21:17:44 +03:00
Robin Gloster 1be4907ca2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-02 13:46:36 +00:00
obadz bafc296e53 holdingnuts: init at 0.0.5 2016-08-01 01:44:32 +01:00
Robert Helgesson 677add2822
construo: 0.2.2 -> 0.2.3 2016-07-31 23:13:39 +02:00
Robert Helgesson 845317e5d6
construo: remove use of builderDefsPackage 2016-07-31 22:54:11 +02:00
Robin Gloster 63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Kranium Gikos Mendoza 7a88636e69 chessx: 1.3.2 -> 1.4.0 (#17270) 2016-07-27 21:02:45 +02:00
rnhmjoj 428c2eff87
arx-libertatis: 2016-02-02 -> 2016-07-27 2016-07-27 04:29:10 +02:00
Robin Gloster f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Nikolay Amiantov 21f2481223 openmw: fix build 2016-07-23 13:05:10 +03:00
Robin Gloster 203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
zimbatm 4cf02e648d Merge pull request #16948 from hce/add-commander-genius 
commandergenius: init at 194beta
 2016-07-18 14:40:13 +01:00
Joachim F 62455c7db1 Merge pull request #16852 from Jookia/RFC_dxx-nonfree 
dxx_rebirth: Mark license as nonfree.
 2016-07-17 04:30:18 +02:00
Jookia a306cbf86f dxx_rebirth: Mark license as nonfree. 
The actual license prohibits commercial use.
 2016-07-17 00:42:40 +10:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Hans-Christian Esperer 88154e2877 commandergenius: init at 194beta 2016-07-15 12:54:52 +02:00
rardiol ce04ed0a95 spring: 101.0 -> 102.0 (#16934) 2016-07-14 09:19:04 +02:00
Eric Litak 2b47d24007 factorio: 0.12.35 -> 0.13.8 2016-07-12 05:03:51 -07:00
Nikolay Amiantov ec73d072ae lgogdownloader: 2.26 -> 2.28 2016-07-12 00:56:10 +03:00
Nikolay Amiantov 6a3e2f89fb steam: fix primus with new libstdc++ and add to steam-run 2016-07-11 18:08:13 +03:00
Nikolay Amiantov 1a802e729d Merge pull request #16853 from Jookia/RFC_zdoom-nonfree 
zdoom: Mark it and its forks as nonfree.
 2016-07-11 14:18:02 +04:00
Jookia e5154f2ab2 zdoom: Mark it and its forks as nonfree. 
See http://zdoom.org/wiki/License and the source code of each package.
 2016-07-11 11:05:34 +10:00
Nikolay Amiantov e50debdee7 arx-libertatis: fix meta.platforms 2016-07-10 15:15:08 +03:00
Nikolay Amiantov 369f255e95 Merge pull request #16739 from vrthra/15994 
zandronum: fix build
 2016-07-07 14:22:52 +04:00
Joachim Fasting 5aa2023d37 Merge pull request #16745 from rardiol/lcs 
liberal-crime-squad: 2016-05-08 -> 2016-07-06
 2016-07-06 13:18:00 +02:00
Ricardo Ardissone d5c8d7112b liberal-crime-squad: 2016-05-08 -> 2016-07-06 2016-07-06 00:45:38 -03:00
Nathan Moore 09f366a360 solarus: init at 1.4.5 2016-07-05 18:33:51 -07:00
Rahul Gopinath 97dd3b3e62 zandronum: fix build 
Fixes #15994
 2016-07-05 15:18:30 -07:00
Rahul Gopinath 01b8db1bc7 ue4: mark as broken 
The source code is no longer available as the repository
https://github.com/EpicGames/UnrealEngine has been deleted.
 2016-07-04 10:44:34 +02:00
Vladimír Čunát 3afa246038 Merge branch 'staging' 
This includes a security update of expat.
 2016-06-29 07:47:04 +02:00
Arseniy Seroka 52a1df089f Merge pull request #16493 from ikervagyok/mineraft1.10 
minecraft-server: 1.9.4 -> 1.10.2
 2016-06-27 16:46:47 +03:00
Lengyel Balázs b054e4a625 minecraft-server: 1.10 -> 1.10.2 2016-06-25 13:32:32 +02:00
Lengyel Balázs d006617dca minecraft-server: 1.9.4 -> 1.10 2016-06-25 12:11:08 +02:00
Vladimír Čunát 6b27ceb006 Merge 'master' into staging and re-revert merge 
... from staging to master, reverted temporarily in aa9a04883e.
 2016-06-23 12:09:03 +02:00
Vladimír Čunát aa9a04883e Revert "Merge branch 'staging'" due to glibc 
The main output started to retain dependency on bootstrap-tools; see
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096

This reverts commit c05d829598, reversing
changes made to f073df60d6.
 2016-06-23 09:25:10 +02:00
Vladimír Čunát c05d829598 Merge branch 'staging' 2016-06-22 10:49:56 +02:00
Vladimír Čunát ebf1cb28a2 openspades, arangodb: more #include error fixups 
... after gcc-5.4.
 2016-06-22 10:45:47 +02:00
Svein Ove Aas 7a37c1b6c3 factorio: Disable automatic updates 2016-06-20 20:21:58 +01:00
Svein Ove Aas 989990b3b7 factorio: Bump to 0.12.35 2016-06-20 20:15:52 +01:00
Bjørn Forsman bd01fad0ed Captialize meta.description of all packages 
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
 2016-06-20 13:55:52 +02:00
Michael Raskin e2fd5aa3ce tbe [the-butterfly-effect]: 0.9.2.1 -> 0.9.3.1 2016-06-19 16:09:09 +02:00
Vladimír Čunát e757404555 Merge branch 'master' into staging 
Hydra nixpkgs: ?compare=1279790
 2016-06-19 12:33:04 +02:00
Vladimír Čunát 97c484a10f treewide: fix #include errors after gcc-5.4 
They were mostly missing <cmath> or <math.h>.
 2016-06-19 10:18:30 +02:00
Louis Taylor 160aeab22d
openrw: init at 2016-06-29 
Closes #15794
 2016-06-16 15:54:22 +02:00
Ambroz Bizjak b422df0e99 crrcsim: 0.9.12 -> 0.9.13 2016-06-14 21:50:53 +02:00
Arseniy Seroka 63dcc818e1 Merge pull request #16091 from ryantm/minecraft 
minecraft: use icon in jar
 2016-06-11 22:35:19 +03:00
Ryan Mulligan 40b661a850 minecraft: use icon in jar 
This removes the dependency on a wiki image download, which seemed bad
when I first introduced it. Unfortunately, they do not provide a 48x48
icon so we are not satisfying the minimal XDG standard.
 2016-06-10 07:16:36 -07:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Joachim Fasting 589082646a Merge pull request #16097 from mimadrid/update/klavaro-3.02 
klavaro: 3.01 -> 3.02
 2016-06-10 00:18:39 +02:00
mimadrid 830c748ea4 Add myself as maintainer 2016-06-09 23:41:17 +02:00
mimadrid f8a0f1ce68 klavaro: 3.01 -> 3.02 2016-06-09 20:49:26 +02:00
Tuomas Tynkkynen a357edc0c6 Merge pull request #16013 from nicknovitski/typespeed-darwin 
typespeed: fix darwin compatibility
 2016-06-09 05:24:57 +03:00
Nick Novitski 487140e8ef typespeed: fix darwin compatibility 2016-06-09 02:07:40 +00:00
Joachim Fasting 628cd6f83a Merge pull request #15966 from pshendry/master 
terraria-server: 1.3.0.8 -> 1.3.1.1
 2016-06-06 16:44:07 +02:00
Paul Hendry 54f636371a terraria-server: 1.3.0.8 -> 1.3.1.1 2016-06-04 14:34:53 -07:00
Nick Novitski 3204c2753d gtypist: darwin compatibility (#15975) 2016-06-04 17:14:47 +02:00
Nikolay Amiantov 5191294e3d Merge pull request #15943 from sheenobu/bugfix/nethack/fix_xlogfile 
nethack: include xlogfile as copied file in nethackuserdir
 2016-06-03 19:39:51 +03:00
Tuomas Tynkkynen bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Sheena Artrip 737e047439
nethack: include xlogfile as copied file in nethackuserdir 2016-06-03 02:46:34 -04:00
Nikolay Amiantov 919db46afd dwarf-therapist: remove useless symlink 2016-06-02 15:30:42 +03:00
Lluís Batlle i Rossell c09bee391a Slight improvements to neverball package 2016-05-31 10:18:12 +03:00
Nikolay Amiantov d16643c2dc wesnoth-dev: init at 1.13.4 2016-05-30 23:33:20 +03:00
Nikolay Amiantov 53dd68651a wesnoth: 1.12.5 -> 1.12.6 2016-05-30 23:33:20 +03:00
Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Nikolay Amiantov 01aa42a4ba crawl: 1.17.1 -> 1.18.0 2016-05-28 14:00:15 +03:00
Vladimír Čunát 81039713fa Merge branch 'master' into staging 
... to get the systemd update (rebuilding ~7k jobs).
 2016-05-26 16:50:22 +02:00
Nikolay Amiantov ff0995707d steam-run: refactor, remove unneeded files and dependencies 2016-05-26 14:40:09 +03:00
Tobias Geerinckx-Rice d37fe91396
scummvm: 1.7.0 -> 1.8.0 2016-05-25 02:06:47 +02:00
Arseniy Seroka 51cbd8b9bd Merge pull request #15651 from ikervagyok/minecraft 
minecraft-server: 1.9 -> 1.9.4
 2016-05-24 22:05:39 +03:00
Joachim Fasting 69b0ba2634
space-orbit: port to mkDerivation 
Also
- rename to space-orbit
- use mirror://debian
- add some meta information

See also #4210
 2016-05-24 14:02:04 +02:00
Lengyel Balázs cf16abe9a9 minecraft-server: 1.9 -> 1.9.4 2016-05-23 22:34:52 +02:00
Vladimír Čunát 0b192a0976 Merge branch 'master' into staging 
That's to get mesa rebuild from master, as it's nontrivial.
 2016-05-23 09:02:10 +02:00
Vladimír Čunát c4661e9643 Merge: make dev output references explicit 
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
 2016-05-22 12:09:23 +02:00
Michael Raskin 9cb61d3ac1 sgtpuzzles: create symlinks with sgt-puzzle- prefix for disambiguation, for example with net being provided by Samba 2016-05-20 11:21:52 +02:00
Tuomas Tynkkynen b0d0752f2a treewide: Make explicit that 'dev' output of libXcursor is used 2016-05-19 10:04:39 +02:00
Tuomas Tynkkynen c857552da8 treewide: Make explicit that 'dev' output of libX11 is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen 7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen e80e4ba2bb treewide: Make explicit that 'dev' output of sqlite is used 2016-05-19 10:04:34 +02:00
Tuomas Tynkkynen b51b458aed treewide: Make explicit that 'dev' output of fftwSinglePrec is used 2016-05-19 10:00:33 +02:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Domen Kožar b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Matthias Mailänder 8b6125333c openra: Fix a typo and the website URL (#15504) 2016-05-16 21:15:29 +02:00
Michael Raskin 3f83632650 sgtpuzzles: 20160410.9d15092 -> 20160429.b31155b 2016-05-15 23:49:44 +02:00
Michael Raskin 6ed76dccb1 xboard: 4.8.0 -> 4.9.0 2016-05-15 23:49:44 +02:00
rardiol 3373ef1349 Minetest 0.4.13 -> 0.4.14 (#15481) 
* minetest: 0.4.13 -> 0.4.14

* minetest: add ncurses support for server

* minetest: add leveldb support
 2016-05-15 22:44:56 +02:00
Nikolay Amiantov 229e544148 steamPackages.steam-runtime-wrapped: fix w. multiple outputs 2016-05-15 02:35:17 +03:00
Vladimír Čunát 3e387c3e00 Merge branch 'staging' 
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
 2016-05-13 10:14:53 +02:00
Ricardo Ardissone 06436894a7 scorched3d: fix build by adding fftwSinglePrec 2016-05-12 18:57:50 -03:00
Vladimír Čunát 6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Nikolay Amiantov 173728069b Merge commit 'refs/pull/15308/head' of git://github.com/NixOS/nixpkgs 2016-05-10 14:36:29 +03:00
Tobias Geerinckx-Rice 1a783468aa
tome4: 1.3.3 -> 1.4.6 
Just to get it building again after the 1.3.3 sources disappeared,
but it seems to run fine.
 2016-05-10 01:51:05 +02:00
Thomas Tuegel 8ffaef8a69 mudlet: mark broken 2016-05-09 10:01:49 -05:00
Thomas Tuegel 19ea08af79 chessx: mark broken 2016-05-09 10:01:49 -05:00
rardiol ff6e194fc7 liberal-crime-squad: 2016-03-03 -> 2016-05-08 (#15309) 2016-05-09 12:28:43 +02:00
Ricardo Ardissone 20a0e782b5 openra: add tests 2016-05-08 18:41:16 -03:00
Ricardo Ardissone fab7a4c21f openra: add man page 2016-05-08 18:41:05 -03:00
Ricardo Ardissone d88ea67fb7 openra: 20151224 -> 20160508 2016-05-08 17:21:55 -03:00
Vladimír Čunát 65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Lluís Batlle i Rossell f0c503593f Fixing stunt-rally 2.6 (adding newer bullet) 2016-05-08 16:22:18 +02:00
Peter Simons 5569824729 stockfish: fix meta.maintainer 2016-05-08 15:21:26 +02:00
Peter Simons d9e51222fe stockfish: fix install target 2016-05-08 15:16:11 +02:00
Peter Simons cca3e9c774 stockfish: update version 6 to 7 2016-05-08 15:10:58 +02:00
Sven Keidel 98bef7e0bd
brogue: init at 1.7.4 
with fixups by joachifm:
- Correct license (AGPL-3)
- Removed redundant build input
- Cleanup description

Closes #15244
 2016-05-07 19:00:30 +02:00
Joachim Fasting 16510869eb Merge pull request #15278 from Baughn/ckan 
ckan: Add curl to runtime libraries
 2016-05-07 16:42:39 +02:00
Nikolay Amiantov 2d57767974 openspades-git: drop yet another hack, fix accidential python merge 2016-05-07 12:03:24 +03:00
Nikolay Amiantov 628c8e8995 openspades-git: init at 2016-04-17 2016-05-07 11:59:53 +03:00
Nikolay Amiantov c7193c1506 openspades: less hacks 2016-05-07 11:59:53 +03:00
Nikolay Amiantov a7fe84e38a openspades: link to openal instead of using LD_LIBRARY_PATH 2016-05-07 11:59:53 +03:00
Svein Ove Aas 3d8f9a6937 ckan: Add curl to runtime libraries 2016-05-06 18:04:01 +01:00
Eric Litak 246d54ab61
factorio: 0.12.29 -> 0.12.33 
Closes #15204
 2016-05-05 20:12:14 +02:00
Eric Litak f6b645206f
factorio: refactor alpha/headless split 2016-05-05 20:11:52 +02:00
Vladimír Čunát 1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
Svein Ove Aas c5451206ab Init CKAN: The Comprehensive Kerbal Archive Network (#15202) 
* ckan: Init at 1.16.1
 2016-05-04 02:12:39 +01:00
Tuomas Tynkkynen aadaa91379 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
 2016-05-03 23:12:48 +03:00
rardiol 0ba62f7150 spring, springlobby update (#15182) 
* alure: init at 1.2

* spring: 96.0 -> 101.0

* springlobby: 0.195 -> 0.247
 2016-05-03 10:19:19 +01:00
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Nikolay Amiantov 7fec04cd7f Merge pull request #15129 from rardiol/openra 
openra: 20141029 -> 20151224
 2016-05-02 16:28:20 +04:00
Nikolay Amiantov 8297d2c60c Merge pull request #15124 from nathan7/master 
minecraft: use makeLibraryPath, so we don't use the dev outputs
 2016-05-02 04:14:27 +04:00
Nathan Zadoks ddb4ea19bc minecraft: use makeLibraryPath, so we don't use the dev outputs 2016-05-01 20:13:20 -04:00
Ricardo Ardissone 42cce6ab11 openra: my maintainership 2016-05-01 19:03:07 -03:00
Ricardo Ardissone d19841c46f openra: 20141029 -> 20151224 2016-05-01 19:03:02 -03:00
Tobias Geerinckx-Rice 950a698488
0ad game & data: 0.0.19 -> 0.0.20 2016-05-01 01:58:28 +02:00
Joachim Fasting fb93bfc0bc
angband: cleanups 2016-05-01 01:22:49 +02:00
Phil Scott 8d5962a690
angband: init at version 4.0.5 2016-05-01 01:22:49 +02:00
Nikolay Amiantov 87ebab128a replace ${stdenv.cc.cc}/lib occurences 2016-05-01 00:13:23 +03:00
Nikolay Amiantov a8aa91dc5c ioquake3: 2016-03-15 -> 2016-04-05 2016-04-30 03:12:33 +03:00
Nikolay Amiantov 52f6c0cfb8 dwarf-fortress-packages.phoebus-theme: 20160128 -> 42.06a 2016-04-30 03:12:33 +03:00
Nikolay Amiantov 91563e23e3 dwarf-fortress-packages.cla-theme: 20160128 -> 42.06-v22 2016-04-30 03:12:33 +03:00
Nikolay Amiantov 3c627be4be dwarf-fortress-packages.dfhack: 2016-03-03 -> 0.42.06-r1 2016-04-30 03:12:33 +03:00
Nikolay Amiantov 938d64f1f3 quote URLs in my packages to ease opening them from urxvt 2016-04-30 03:12:32 +03:00
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
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00: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
joachifm fdf8e2a197 Merge pull request #14126 from mpscholten/factorio 
factorio: 0.12.20 -> 0.12.28
 2016-04-08 02:23:24 +02:00
Nikolay Amiantov c4bbfdb478 steam: add xdg_utils to chrootenv 2016-04-08 03:12:09 +03:00
Robin Gloster 3e68106afd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-07 21:52:26 +00:00
Micxjo Funkcio a811902370
anki: 2.0.33 -> 2.0.35 2016-04-05 19:11:36 -07:00
Robin Gloster bbbaccfa68 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-04 15:24:52 +00:00
Nikolay Amiantov 192e0c7141 steam-run: add derivation 2016-04-03 16:10:14 +03:00
Robin Gloster 696d85a62d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-03 11:01:57 +00:00
Eelco Dolstra 13a1c7b8c1 useOldCXXAbi: Change into a setup hook 
Stdenv adapters considered weird.
 2016-04-01 13:36:59 +02:00
Lluís Batlle i Rossell f07b934c8a Updating trigger-rally to 0.6.3 2016-04-01 11:16:02 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
Nikolay Amiantov 0276a8b2d2 steam: use old C++ ABI for primus 2016-03-31 19:52:33 +03:00
Robin Gloster a4e65c3639 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-30 09:01:20 +00:00
Brian McKenna d47e2fde69 steam: enable hardware decoding (for In-Home Streaming) 
Previous to this patch I was getting software decoding when I used In-Home
Streaming. I had a look around and according to:

https://bbs.archlinux.org/viewtopic.php?id=187922

> It seems that the libva version Steam comes with, is not compatible anymore to
> the newer libva 1.4.0.

Substituting in our version of libva gives me hardware decoding!
 2016-03-29 09:17:15 +11:00
Robin Gloster f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Domen Kožar b07e7bfc7b Merge remote-tracking branch 'origin/staging' 2016-03-27 13:19:04 +01:00
Joachim Fasting a4ed052407 zoom: fix gcc5 build 
https://hydra.nixos.org/build/33122239/nixlog/1/raw
 2016-03-26 16:54:59 +01:00
Joachim Fasting 1379baca94 gsb: mark as broken 
No active maintenance for several years; dependencies cannot be met.
 2016-03-26 13:20:37 +01:00
Luis Pedro Coelho 6607345d10 chessx: install chessx.desktop file 2016-03-23 20:30:24 +01:00
Marc Scholten 4b3b703d5b factorio: 0.12.20 -> 0.12.28 2016-03-23 12:27:14 +01:00
Joachim Fasting 18b35bd741 cataclysm-dda: build recipe enhancements & gcc5 support 
- Remove redundant platform check; meta.platforms is sufficient
- Use postPatch rather than override patchPhase entirely
- Strip -Werror
- Move build-time only dependencies to nativeBuildInputs

This also fixes gcc5 build, which fails due to a deprecated-declarations
warning (see https://hydra.nixos.org/build/33117020/nixlog/2/raw).
 2016-03-23 01:44:02 +01:00
Nikolay Amiantov 7185aefbbe ioquake3: 2016-02-18 -> 2016-03-15 2016-03-20 17:07:31 +03:00