Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #16739 from vrthra/15994 | Nikolay Amiantov | 2016-07-07 |
|\ | | | | | zandronum: fix build | ||
| * | zandronum: fix build | Rahul Gopinath | 2016-07-05 |
| | | | | | | | | Fixes #15994 | ||
* | | Merge pull request #16745 from rardiol/lcs | Joachim Fasting | 2016-07-06 |
|\ \ | | | | | | | liberal-crime-squad: 2016-05-08 -> 2016-07-06 | ||
| * | | liberal-crime-squad: 2016-05-08 -> 2016-07-06 | Ricardo Ardissone | 2016-07-06 |
| | | | |||
* | | | solarus: init at 1.4.5 | Nathan Moore | 2016-07-05 |
| |/ |/| | |||
* | | ue4: mark as broken | Rahul Gopinath | 2016-07-04 |
| | | | | | | | | | | The source code is no longer available as the repository https://github.com/EpicGames/UnrealEngine has been deleted. | ||
* | | Merge branch 'staging' | Vladimír Čunát | 2016-06-29 |
|\ \ | | | | | | | | | | This includes a security update of expat. | ||
| * \ | Merge 'master' into staging and re-revert merge | Vladimír Čunát | 2016-06-23 |
| |\ \ | | | | | | | | | | | | | ... from staging to master, reverted temporarily in aa9a04883e34. | ||
* | \ \ | Merge pull request #16493 from ikervagyok/mineraft1.10 | Arseniy Seroka | 2016-06-27 |
|\ \ \ \ | |_|/ / |/| | | | minecraft-server: 1.9.4 -> 1.10.2 | ||
| * | | | minecraft-server: 1.10 -> 1.10.2 | Lengyel Balázs | 2016-06-25 |
| | | | | |||
| * | | | minecraft-server: 1.9.4 -> 1.10 | Lengyel Balázs | 2016-06-25 |
| | | | | |||
* | | | | Revert "Merge branch 'staging'" due to glibc | Vladimír Čunát | 2016-06-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main output started to retain dependency on bootstrap-tools; see https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096 This reverts commit c05d8295988697adbb920a7b4a999ae3670c5504, reversing changes made to f073df60d60444c30c49cb26d6b187a4100b41fe. | ||
* | | | | Merge branch 'staging' | Vladimír Čunát | 2016-06-22 |
|\ \ \ \ | |||
| * | | | | openspades, arangodb: more #include error fixups | Vladimír Čunát | 2016-06-22 |
| | |/ / | |/| | | | | | | | | | | ... after gcc-5.4. | ||
| * | | | Merge branch 'master' into staging | Vladimír Čunát | 2016-06-19 |
| |\ \ \ | | | |/ | | |/| | | | | | Hydra nixpkgs: ?compare=1279790 | ||
| * | | | treewide: fix #include errors after gcc-5.4 | Vladimír Čunát | 2016-06-19 |
| | | | | | | | | | | | | | | | | They were mostly missing <cmath> or <math.h>. | ||
* | | | | factorio: Disable automatic updates | Svein Ove Aas | 2016-06-20 |
| | | | | |||
* | | | | factorio: Bump to 0.12.35 | Svein Ove Aas | 2016-06-20 |
| | | | | |||
* | | | | Captialize meta.description of all packages | Bjørn Forsman | 2016-06-20 |
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In line with the Nixpkgs manual. A mechanical change, done with this command: find pkgs -name "*.nix" | \ while read f; do \ sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \ done I manually skipped some: * Descriptions starting with an abbreviation, a user name or package name * Frequently generated expressions (haskell-packages.nix) | ||
* | | | tbe [the-butterfly-effect]: 0.9.2.1 -> 0.9.3.1 | Michael Raskin | 2016-06-19 |
| |/ |/| | |||
* | | openrw: init at 2016-06-29 | Louis Taylor | 2016-06-16 |
| | | | | | | | | Closes #15794 | ||
* | | crrcsim: 0.9.12 -> 0.9.13 | Ambroz Bizjak | 2016-06-14 |
| | | |||
* | | Merge pull request #16091 from ryantm/minecraft | Arseniy Seroka | 2016-06-11 |
|\ \ | | | | | | | minecraft: use icon in jar | ||
| * | | minecraft: use icon in jar | Ryan Mulligan | 2016-06-10 |
| |/ | | | | | | | | | | | This removes the dependency on a wiki image download, which seemed bad when I first introduced it. Unfortunately, they do not provide a 48x48 icon so we are not satisfying the minimal XDG standard. | ||
* | | Merge pull request #16097 from mimadrid/update/klavaro-3.02 | Joachim Fasting | 2016-06-10 |
|\ \ | |/ |/| | klavaro: 3.01 -> 3.02 | ||
| * | Add myself as maintainer | mimadrid | 2016-06-09 |
| | | |||
| * | klavaro: 3.01 -> 3.02 | mimadrid | 2016-06-09 |
| | | |||
* | | 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 |
| | |