Commit message (Expand) | Author | Age | |
---|---|---|---|
* | automake110x: remove unused package | Robin Gloster | 2016-08-24 |
* | Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixp... | Shea Levy | 2016-08-24 |
* | Merge branch 'master' into staging | obadz | 2016-08-24 |
|\ | |||
| * | Merge pull request #17805 from avnik/update/golang-1.7 | zimbatm | 2016-08-24 |
| |\ | |||
| | * | go: add 1.7 compiler | Alexander V. Nikolaev | 2016-08-21 |
| * | | Merge pull request #17685 from matthewbauer/darwin-misc2 | Daniel Peebles | 2016-08-24 |
| |\ \ | |||
| | * | | smartmontools: fix darwin build | Matthew Bauer | 2016-08-16 |
| | * | | rakudo: fix darwin build | Matthew Bauer | 2016-08-16 |
| | * | | nspr: fix darwin build | Matthew Bauer | 2016-08-16 |
| | * | | pcsclite: fix darwin build | Matthew Bauer | 2016-08-16 |
| | * | | libstatgrab: fix darwin build | Matthew Bauer | 2016-08-16 |
| | * | | libfreefare: fix darwin build | Matthew Bauer | 2016-08-16 |
| | * | | gkrellm: fix darwin build | Matthew Bauer | 2016-08-16 |
| | * | | fontforge-gtk: fix darwin build | Matthew Bauer | 2016-08-16 |
| | * | | glew110: fix darwin build | Matthew Bauer | 2016-08-16 |
| | * | | gegl: fix darwin build | Matthew Bauer | 2016-08-16 |
| | * | | fox: fix darwin build | Matthew Bauer | 2016-08-16 |
| | * | | erlangR16: fix darwin build | Matthew Bauer | 2016-08-16 |
| | * | | cd-discid: fix darwin build | Matthew Bauer | 2016-08-16 |
* | | | | Merge branch 'hardened-stdenv' into staging | obadz | 2016-08-23 |
|\ \ \ \ | |||
| * | | | | Revert "Remove lsh, broken & unmaintained" | Robin Gloster | 2016-08-23 |
| * | | | | Revert "lsh: remove last references" | Robin Gloster | 2016-08-23 |
| * | | | | Merge remote-tracking branch 'origin/master' into hardened-stdenv | Franz Pletz | 2016-08-17 |
| |\ \ \ \ | |||
* | \ \ \ \ | Merge branch 'master' into staging | obadz | 2016-08-23 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Merge pull request #17766 from NeQuissimus/gradle30 | Joachim F | 2016-08-23 |
| |\ \ \ \ \ | |||
| | * | | | | | gradle: 2.14.1 -> 3.0, keep 2.14.1 | Tim Steinbach | 2016-08-16 |
| * | | | | | | Adding vlc plugin for firefox. | Lluís Batlle i Rossell | 2016-08-23 |
| * | | | | | | treewide: Make explicit that 'dev' output of imagemagick is used | Tuomas Tynkkynen | 2016-08-23 |
| * | | | | | | cifs-utils: align attrname with pkgname | Bjørn Forsman | 2016-08-22 |
| * | | | | | | jre: Set valid value for meta.outputsToInstall | Eelco Dolstra | 2016-08-22 |
| * | | | | | | SDL2: cleanup and add patch to discover extensions | Nikolay Amiantov | 2016-08-22 |
| * | | | | | | SDL: cleanup and add patch to discover extensions | Nikolay Amiantov | 2016-08-22 |
| * | | | | | | openal: fix alias | Nikolay Amiantov | 2016-08-22 |
* | | | | | | | Merge branch 'hardened-stdenv' into staging | obadz | 2016-08-22 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | | |||
| * | | | | | calamares/tarball test: fix eval error | obadz | 2016-08-17 |
| * | | | | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-08-16 |
| |\| | | | | |||
| * | | | | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-08-14 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'master' into hardened-stdenv | Franz Pletz | 2016-08-13 |
| |\ \ \ \ \ \ | |||
| * | | | | | | | linuxPackages.psmouse_alps: remove, driver in kernel since 3.9 | Franz Pletz | 2016-08-13 |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-08-12 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-08-03 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-08-02 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-07-31 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-07-25 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-07-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-07-19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-07-15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | fix merge failure (2) | Robin Gloster | 2016-06-13 |
| * | | | | | | | | | | | | | | | fix merge failure | Robin Gloster | 2016-06-11 |
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-06-10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |