Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into staging | obadz | 2016-08-24 |
|\ | |||
| * | cccc: fix darwin build | Matthew Bauer | 2016-08-16 |
| | | |||
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-08-12 |
|\| | |||
| * | flow: 0.28.0 -> 0.30.0 | Danny Arnold | 2016-08-09 |
| | | |||
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-08-03 |
|\| | |||
| * | treewide: Add lots of meta.platforms | Tuomas Tynkkynen | 2016-08-02 |
| | | | | | | | | Build-tested on x86_64 Linux & Mac. | ||
| * | kcov: Fix indentation | Tuomas Tynkkynen | 2016-08-02 |
| | | |||
* | | tracefilesim: disable fortify hardening | Franz Pletz | 2016-08-02 |
| | | |||
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-07-25 |
|\| | |||
| * | rr: 4.2.0 -> 4.3.0 | Ivan Sorokin | 2016-07-23 |
| | | |||
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-07-19 |
|\| | |||
| * | cppcheck: 1.73 -> 1.74 | Joachim Fasting | 2016-07-17 |
| | | |||
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-07-15 |
|\| | |||
| * | flow: 0.22.1 -> 0.28.0 (#16827) | Danny Arnold | 2016-07-10 |
| | | |||
| * | lcov: 1.10 -> 1.12; maintain | Tuomas Tynkkynen | 2016-07-08 |
| | | |||
| * | Merge 'master' into staging and re-revert merge | Vladimír Čunát | 2016-06-23 |
| |\ | | | | | | | | | | ... from staging to master, reverted temporarily in aa9a04883e34. | ||
| | * | 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 |
| | |\ | | |/ | |/| | |||
| | * | 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) | ||
| * | | rr: improve the parent commit | Vladimír Čunát | 2016-06-13 |
| | | | |||
| * | | rr: fix build after gcc-5.4 bump | Vladimír Čunát | 2016-06-13 |
| |/ | | | | | | | Discussion: https://github.com/NixOS/nixpkgs/commit/772c92ba5c60a | ||
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-06-10 |
|\| | |||
| * | fix 'licenses' -> 'license' in several places | Nikolay Amiantov | 2016-06-07 |
| | | |||
| * | Fix lots of fetchgit hashes (fallout from #15469) | Tuomas Tynkkynen | 2016-06-03 |
| | | |||
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-05-30 |
|\| | |||
| * | Merge #15354: add tracefilegen and tracefilesim | Vladimír Čunát | 2016-05-19 |
| |\ | |||
| | * | tracefilegen, tracefilesim: fixup source hashes | Vladimír Čunát | 2016-05-19 |
| | | | | | | | | | | | | and also whitespace. This is probably due to #15469. | ||
| | * | garcosim: Added tracefilegen and tracefilesim | Roger Qiu | 2016-05-19 |
| | | | |||
* | | | Merge remote-tracking branch 'origin/master' into hardened-stdenv | Franz Pletz | 2016-05-18 |
|\| | | |||
| * | | rr: Only build native architecture. | Moritz Ulrich | 2016-05-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | rr wants to build itself with 32+64bit support on 64bit systems, but this fails in recent NixOS versions as it can't find libstdc++.so.6 at runtime. This patch disables 32bit builds on 64bit. To debug 32bit binaries, pkgsi686Linux.rr can be used. | ||
| * | | Bring my stdenv.lib.maintainers user name in line with my github nick. | Peter Simons | 2016-05-16 |
| | | | |||
| * | | include-what-you-use: 0.5 -> 0.6 | Tobias Geerinckx-Rice | 2016-05-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Added mappings for Qt 5.4. * Added better analysis of uses in macros. * Added --no_comments switch to suppress why-comments. * Fixed bug with global namespace qualifier on friend declarations. * Fixed bug in fix_includes.py generating invalid diff output. | ||
| * | | 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-08 |
| | |\| | |||
| | * | | use dontBuild instead of hacks | Robin Gloster | 2016-05-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | changes: * buildPhase = "true" * buildPhase = ":" | ||
| * | | | checkstyle: 6.17 -> 6.18 | Pascal Wittmann | 2016-05-12 |
| | |/ | |/| | |||
| * | | kcov: meta.{homePage -> homepage} | Tobias Geerinckx-Rice | 2016-05-08 |
| |/ | |||
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-05-02 |
|\| | |||
| * | foswiki, egypt, wml: fix build | Vladimír Čunát | 2016-04-25 |
| | | |||
| * | valkyrie: move to qmake4Hook | Nikolay Amiantov | 2016-04-20 |
| | | |||
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-04-18 |
|\| | |||
| * | cppcheck: 1.72 -> 1.73 | Joachim Fasting | 2016-04-15 |
| | | | | | | | | ChangeLog at https://sourceforge.net/p/cppcheck/news/2016/04/cppcheck-173/ | ||
| * | cppcheck: split man output | Joachim Fasting | 2016-04-15 |
| | | |||
* | | rr: set Wno-error and turn off fortify hardening | Robin Gloster | 2016-04-03 |
| | | |||
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-03-28 |
|\| | |||
| * | spin: add ispin with tools | Nikolay Amiantov | 2016-03-26 |
| | | |||
| * | swarm: init at 3.1 | Nikolay Amiantov | 2016-03-26 |
| | | |||
| * | checkstyle: 6.16.1 -> 6.17 | Pascal Wittmann | 2016-03-25 |
| | | |||
| * | flow: 0.18.1 -> 0.22.1 | Domen Kožar | 2016-03-22 |
| | | | | | | | | | | (cherry picked from commit 15761b0520383a816d250b4301982e9d088be14b) Signed-off-by: Domen Kožar <domen@dev.si> | ||
| * | rr: 4.0.3 -> 4.2.0 | Nicolas B. Pierron | 2016-03-18 |
| | |