3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1638 commits

Author SHA1 Message Date
Robin Gloster 69b71d3eac liquidwar5: disable format hardening 2016-08-28 14:06:55 +00:00
obadz 57ddc155fc Merge branch 'master' into staging
Conflicts:
	pkgs/games/scummvm/default.nix
2016-08-28 12:20:59 +01:00
Kranium Gikos Mendoza 33638ca99e scummvm: fix build (#18051) 2016-08-28 07:54:22 +00:00
Kranium Gikos Mendoza 388bc33f74 cuyo: fix build (#18049) 2016-08-28 07:54:03 +00:00
Carles Pagès c227f665d4 Merge pull request #18050 from womfoo/fix/kobodeluxe-build
kobodeluxe: fix build
2016-08-28 09:34:34 +02:00
Kranium Gikos Mendoza ddcf259c2d kobodeluxe: fix build 2016-08-28 11:26:12 +08:00
obadz 3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Robin Gloster 132571454c
springlobby: remove obsolete substituteInPlaces 2016-08-27 22:08:20 +00:00
Nikolay Amiantov 21c8422f7e pokerth: fix build 2016-08-28 01:04:18 +03:00
Robin Gloster 6f9d474db1
njam: disable format hardening 2016-08-27 21:56:33 +00:00
Robin Gloster c30d4c732e
liquidwar: fix build after glibc upgrade 2016-08-27 21:55:58 +00:00
Michael Raskin 6b527ec517 liquidwar5: init at 5.6.4 2016-08-26 13:40:55 +02:00
Michael Raskin 61d8e875c0 liquidwar: allow deprecated readdir_r for now 2016-08-26 13:40:55 +02:00
Domen Kožar 6a4e95b918 Merge pull request #17979 from rardiol/springrts2
Springrts and springlobby update
2016-08-26 12:04:50 +02:00
Ricardo Ardissone 3b7304ebc3 springLobby: 0.247 -> 0.255 2016-08-24 22:20:32 -03:00
Ricardo Ardissone 95bc33c1ab spring: 102.0 -> 103.0 2016-08-24 21:21:23 -03:00
Robin Gloster cc69ea38a5 Revert "crawl: fix build with multiple outputs"
This reverts commit 5d51614620.

Fixed on master already
2016-08-24 20:18:52 +00:00
Robin Gloster 5d51614620 crawl: fix build with multiple outputs 2016-08-24 19:06:00 +00:00
Nikolay Amiantov 58f532216f crawl: fix build 2016-08-24 17:09:54 +03:00
obadz 0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Kranium Gikos Mendoza 5a4b3e3ece xpilot-ng: fix build 2016-08-23 12:37:01 +03:00
Tuomas Tynkkynen f6640842fe treewide: Make explicit that 'dev' output of sqlite is used 2016-08-23 03:52:07 +03:00
Tuomas Tynkkynen cc7c9f5676 treewide: Make explicit that 'dev' output of SDL is used 2016-08-23 03:26:46 +03:00
Joachim F addc008fd4 Merge pull request #17920 from womfoo/fix/supertuxkart-build
supertuxkart: fix build
2016-08-23 01:57:46 +02:00
Tuomas Tynkkynen b4749ed96d treewide: Use more makeLibraryPath 2016-08-23 02:56:12 +03:00
Tuomas Tynkkynen f064bfe803 treewide: Use more makeLibraryPath 2016-08-23 02:56:12 +03:00
Tuomas Tynkkynen 51ad423716 treewide: Use makeLibraryPath in 'patchelf --set-rpath' calls 2016-08-23 00:04:39 +03:00
Kranium Gikos Mendoza 236703fb1e supertuxkart: fix build 2016-08-23 01:55:04 +08:00
Nikolay Amiantov 21b69058b0 openmw: fix build 2016-08-22 17:18:02 +03:00
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