JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,070 Commits 2 Branches 0 Tags 13 GiB
316f5e8608
Commit Graph

53 Commits

Author SHA1 Message Date
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
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
Tuomas Tynkkynen
b4749ed96d treewide: Use more makeLibraryPath 2016-08-23 02:56:12 +03:00
rardiol
ce04ed0a95 spring: 101.0 -> 102.0 (#16934) 2016-07-14 09:19:04 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01: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
Nikolay Amiantov
87ebab128a replace ${stdenv.cc.cc}/lib occurences 2016-05-01 00:13:23 +03:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg 
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
 2015-09-15 12:54:34 +02:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc 
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
 2014-12-26 11:06:21 -06:00
Vladimír Čunát
52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
 2014-11-05 15:00:44 +01:00
William A. Kennington III
aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
Eelco Dolstra
811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv 
Conflicts:
	pkgs/tools/security/gnupg/default.nix
 2014-10-09 10:57:57 +02:00
Eelco Dolstra
6843fc41c9 Fix evaluation 2014-09-30 00:51:00 +02:00
William A. Kennington III
31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07:00
Vladimír Čunát
4a2b6a63b6 spring, warzone2100: work around build problems 
I guess there was a slight API change in the last mesa update.
 2014-09-04 21:02:14 +02:00
Domen Kožar
e26b5600e2 springlobby: 0.186 -> 0.195 2014-06-08 19:39:55 +02:00
Domen Kožar
7a88839b90 spring: fix runtime dependency on udev 2014-06-08 19:39:55 +02:00
Evgeny Egorochkin
fd827e6437 springLobby: update from 0.182 to 0.186 2014-03-27 03:02:07 +02:00
Evgeny Egorochkin
70a51b75e1 springLobby: update from 0.180 to 0.182, get rid of patch, improve meta 2014-03-26 12:57:10 +02:00
Domen Kožar
e5017d8239 springlobby: add unitsync patch 2014-02-10 14:21:42 +01:00
Domen Kožar
e5124e7a0e springlobby: specify spring run-time dependency paths 2014-02-10 14:19:57 +01:00
Domen Kožar
8e9f61995e spring: don't pass glibc 2014-02-10 09:41:30 +01:00
Domen Kožar
0f79534aa7 spring: use wrapper to set gcc lib path 2014-02-09 23:53:11 +01:00
Domen Kožar
4baa1197dd spring: add missing function parameters 2014-02-08 18:16:28 +01:00
Domen Kožar
64a8ae3692 SpringRTS: fix runtime dependencies and maintain 2014-02-08 18:11:59 +01:00
Vladimír Čunát
3967a1c444 spring: disable parallel building, as it breaks on Hydra 
(cherry picked from commit e43018e019)
 2014-02-08 09:15:20 +01:00
Domen Kožar
d1d3e841b6 spring 95.0 -> 96.0 2014-02-05 15:36:24 +01:00
Nixpkgs Monitor
a9ce83467e springLobby: update from 0.176 to 0.180 2013-12-09 10:58:16 +02:00
Evgeny Egorochkin
7b68782e8f spring: add some of the missing dependencies 2013-12-04 05:24:22 +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
Eelco Dolstra
2147a07938 Fix a bunch of Hydra evaluation errors 2013-10-07 17:36:47 +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
Domen Kozar
c72ac21c55 springlobby: bump to 0.169 2013-03-30 20:05:13 +01:00
Domen Kozar
6026c60388 spring: bump and fix build 2013-03-29 16:43:48 +01:00
Joachim Schiele
49f2fef481 updated spring from 88 to 91 and downgraded the boost library which spring uses from default to 1.49 as the 
more recent boost version results in a build issue at about 30%
 2012-10-28 13:43:15 +00:00
Joachim Schiele
424c24d4fc updated to a new version 
svn path=/nixpkgs/trunk/; revision=33964
 2012-05-01 12:40:57 +00:00
Joachim Schiele
194c822cce version 88.0 of spring has arrived 
svn path=/nixpkgs/trunk/; revision=33438
 2012-03-27 11:07:53 +00:00
Joachim Schiele
bdcce09b46 seems i forgot to change some things... 
svn path=/nixpkgs/trunk/; revision=33025
 2012-03-12 21:28:51 +00:00
Joachim Schiele
5b6856ff52 new version of spring is there 
svn path=/nixpkgs/trunk/; revision=33019
 2012-03-12 15:11:37 +00:00
Joachim Schiele
ac9f3a50a2 package won't build on the current nixos/nixpkgs (but it did with older checkouts on my other computer). so here is a fix which makes springlobby compile and install at least 
svn path=/nixpkgs/trunk/; revision=32937
 2012-03-09 00:59:13 +00:00
Joachim Schiele
dfbde3db02 updated springlobby to 141 and changed the name of the package 
svn path=/nixpkgs/trunk/; revision=32896
 2012-03-08 15:32:20 +00:00
Joachim Schiele
0d6be026c3 changing the name from spring-lobby to springlobby 
svn path=/nixpkgs/trunk/; revision=32895
 2012-03-08 15:30:08 +00:00
Joachim Schiele
3fc8538884 soon to come version of spring (not live yet but at least it builds compared to the former version in nixos) 
svn path=/nixpkgs/trunk/; revision=32733
 2012-03-01 23:14:14 +00:00
Evgeny Egorochkin
287f1f0f65 spring-lobby: bump version to 0.139 
svn path=/nixpkgs/trunk/; revision=32697
 2012-02-29 14:29:49 +00:00