mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 22:50:49 +00:00
Code Issues Wiki Activity
89230 commits 233 branches 124 tags 7 GiB
Commit graph

16 commits

Author SHA1 Message Date
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
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 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
Robert Helgesson aca3851b88 tbe: r2048 -> 0.9.2.1 
Also replace use of builderDefsPackage (#4210).
 2015-12-29 20:31:01 +01:00
Michael Raskin d0aceb402a Update The Buttefly Effect game 2014-08-22 21:34:28 +04:00
Peter Simons d0ca8c237e Fix broken license references. 2014-07-28 11:43:20 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Michael Raskin 4c5c8ba08e TBE: fix unneeded /bin/sh reference 2012-11-10 15:14:28 +04:00
Yury G. Kudryashov d8454e538c svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32417
 2012-02-20 05:30:06 +00:00
Yury G. Kudryashov 23856c2a40 tbe needs which 
svn path=/nixpkgs/trunk/; revision=32416
 2012-02-20 05:28:06 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00
Michael Raskin 9391f9819c Update tbe - multiple fixes 
svn path=/nixpkgs/trunk/; revision=25782
 2011-02-06 14:13:31 +00:00
Michael Raskin 49f0246f87 Update TBE to SVN revision - some crashes fixed 
svn path=/nixpkgs/trunk/; revision=25774
 2011-02-04 16:38:22 +00:00
Michael Raskin 71822c22de Adding tbe game 
svn path=/nixpkgs/trunk/; revision=25178
 2010-12-17 15:41:30 +00:00