Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #16013 from nicknovitski/typespeed-darwin | Tuomas Tynkkynen | 2016-06-09 |
|\ | | | | | typespeed: fix darwin compatibility | ||
| * | typespeed: fix darwin compatibility | Nick Novitski | 2016-06-09 |
| | | |||
* | | Merge pull request #15966 from pshendry/master | Joachim Fasting | 2016-06-06 |
|\ \ | | | | | | | terraria-server: 1.3.0.8 -> 1.3.1.1 | ||
| * | | terraria-server: 1.3.0.8 -> 1.3.1.1 | Paul Hendry | 2016-06-04 |
| |/ | |||
* / | gtypist: darwin compatibility (#15975) | Nick Novitski | 2016-06-04 |
|/ | |||
* | Merge pull request #15943 from sheenobu/bugfix/nethack/fix_xlogfile | Nikolay Amiantov | 2016-06-03 |
|\ | | | | | nethack: include xlogfile as copied file in nethackuserdir | ||
| * | nethack: include xlogfile as copied file in nethackuserdir | Sheena Artrip | 2016-06-03 |
| | | |||
* | | Fix lots of fetchgit hashes (fallout from #15469) | Tuomas Tynkkynen | 2016-06-03 |
|/ | |||
* | dwarf-therapist: remove useless symlink | Nikolay Amiantov | 2016-06-02 |
| | |||
* | Slight improvements to neverball package | Lluís Batlle i Rossell | 2016-05-31 |
| | |||
* | wesnoth-dev: init at 1.13.4 | Nikolay Amiantov | 2016-05-30 |
| | |||
* | wesnoth: 1.12.5 -> 1.12.6 | Nikolay Amiantov | 2016-05-30 |
| | |||
* | crawl: 1.17.1 -> 1.18.0 | Nikolay Amiantov | 2016-05-28 |
| | |||
* | Merge branch 'master' into staging | Vladimír Čunát | 2016-05-26 |
|\ | | | | | | | ... to get the systemd update (rebuilding ~7k jobs). | ||
| * | steam-run: refactor, remove unneeded files and dependencies | Nikolay Amiantov | 2016-05-26 |
| | | |||
| * | scummvm: 1.7.0 -> 1.8.0 | Tobias Geerinckx-Rice | 2016-05-25 |
| | | |||
| * | Merge pull request #15651 from ikervagyok/minecraft | Arseniy Seroka | 2016-05-24 |
| |\ | | | | | | | minecraft-server: 1.9 -> 1.9.4 | ||
| | * | minecraft-server: 1.9 -> 1.9.4 | Lengyel Balázs | 2016-05-23 |
| | | | |||
| * | | space-orbit: port to mkDerivation | Joachim Fasting | 2016-05-24 |
| |/ | | | | | | | | | | | | | | | | | Also - rename to space-orbit - use mirror://debian - add some meta information See also #4210 | ||
* | | Merge branch 'master' into staging | Vladimír Čunát | 2016-05-23 |
|\| | | | | | | | That's to get mesa rebuild from master, as it's nontrivial. | ||
| * | sgtpuzzles: create symlinks with sgt-puzzle- prefix for disambiguation, for ↵ | Michael Raskin | 2016-05-20 |
| | | | | | | | | example with net being provided by Samba | ||
* | | Merge: make dev output references explicit | Vladimír Čunát | 2016-05-22 |
|\ \ | |/ |/| | | | | | This is a rebase of most commits from #14766, resolving conflicts and a few other evaluation problems. | ||
| * | treewide: Make explicit that 'dev' output of libXcursor is used | Tuomas Tynkkynen | 2016-05-19 |
| | | |||
| * | treewide: Make explicit that 'dev' output of libX11 is used | Tuomas Tynkkynen | 2016-05-19 |
| | | |||
| * | treewide: Make explicit that 'dev' output of zlib is used | Tuomas Tynkkynen | 2016-05-19 |
| | | |||
| * | treewide: Make explicit that 'dev' output of sqlite is used | Tuomas Tynkkynen | 2016-05-19 |
| | | |||
| * | treewide: Make explicit that 'dev' output of fftwSinglePrec is used | Tuomas Tynkkynen | 2016-05-19 |
| | | |||
* | | rename iElectric to domenkozar to match GitHub | Domen Kožar | 2016-05-17 |
|/ | |||
* | Bring my stdenv.lib.maintainers user name in line with my github nick. | Peter Simons | 2016-05-16 |
| | |||
* | openra: Fix a typo and the website URL (#15504) | Matthias Mailänder | 2016-05-16 |
| | |||
* | sgtpuzzles: 20160410.9d15092 -> 20160429.b31155b | Michael Raskin | 2016-05-15 |
| | |||
* | xboard: 4.8.0 -> 4.9.0 | Michael Raskin | 2016-05-15 |
| | |||
* | Minetest 0.4.13 -> 0.4.14 (#15481) | rardiol | 2016-05-15 |
| | | | | | | | | * minetest: 0.4.13 -> 0.4.14 * minetest: add ncurses support for server * minetest: add leveldb support | ||
* | steamPackages.steam-runtime-wrapped: fix w. multiple outputs | Nikolay Amiantov | 2016-05-15 |
| | |||
* | Merge branch 'staging' | Vladimír Čunát | 2016-05-13 |
|\ | | | | | | | | | | | 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. | ||
| * | Merge branch 'master' into staging | Vladimír Čunát | 2016-05-12 |
| |\ | |||
| * | | mudlet: mark broken | Thomas Tuegel | 2016-05-09 |
| | | | |||
| * | | chessx: mark broken | Thomas Tuegel | 2016-05-09 |
| | | | |||
| * | | Merge branch 'master' into staging | Vladimír Čunát | 2016-05-08 |
| |\ \ | |||
| * \ \ | Merge #14920: windows improvements, mainly mingw | Vladimír Čunát | 2016-05-05 |
| |\ \ \ | |||
| * \ \ \ | Merge remote-tracking branch 'upstream/master' into staging | Tuomas Tynkkynen | 2016-05-03 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/applications/networking/browsers/vivaldi/default.nix pkgs/misc/emulators/wine/base.nix | ||
| * \ \ \ \ | Merge remote-tracking branch 'upstream/master' into staging | Tuomas Tynkkynen | 2016-04-28 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into ↵ | Nikolay Amiantov | 2016-04-25 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | staging | ||
| | * | | | | | | makeSearchPathOutputs: refactor to makeSearchPathOutput | Nikolay Amiantov | 2016-04-25 |
| | | | | | | | | |||
* | | | | | | | | scorched3d: fix build by adding fftwSinglePrec | Ricardo Ardissone | 2016-05-12 |
| |_|_|_|_|_|/ |/| | | | | | | |||
* | | | | | | | Merge commit 'refs/pull/15308/head' of git://github.com/NixOS/nixpkgs | Nikolay Amiantov | 2016-05-10 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | openra: add tests | Ricardo Ardissone | 2016-05-08 |
| | | | | | | | | |||
| * | | | | | | | openra: add man page | Ricardo Ardissone | 2016-05-08 |
| | | | | | | | | |||
| * | | | | | | | openra: 20151224 -> 20160508 | Ricardo Ardissone | 2016-05-08 |
| | | | | | | | | |||
* | | | | | | | | tome4: 1.3.3 -> 1.4.6 | Tobias Geerinckx-Rice | 2016-05-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just to get it building again after the 1.3.3 sources disappeared, but it seems to run fine. |