1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 14:41:17 +00:00
Commit graph

1587 commits

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