summary refs log tree commit diff
path: root/pkgs/top-level
Commit message (Expand)AuthorAge
* automake110x: remove unused packageRobin Gloster2016-08-24
* Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixp...Shea Levy2016-08-24
* Merge branch 'master' into stagingobadz2016-08-24
|\
| * Merge pull request #17805 from avnik/update/golang-1.7zimbatm2016-08-24
| |\
| | * go: add 1.7 compilerAlexander V. Nikolaev2016-08-21
| * | Merge pull request #17685 from matthewbauer/darwin-misc2Daniel Peebles2016-08-24
| |\ \
| | * | smartmontools: fix darwin buildMatthew Bauer2016-08-16
| | * | rakudo: fix darwin buildMatthew Bauer2016-08-16
| | * | nspr: fix darwin buildMatthew Bauer2016-08-16
| | * | pcsclite: fix darwin buildMatthew Bauer2016-08-16
| | * | libstatgrab: fix darwin buildMatthew Bauer2016-08-16
| | * | libfreefare: fix darwin buildMatthew Bauer2016-08-16
| | * | gkrellm: fix darwin buildMatthew Bauer2016-08-16
| | * | fontforge-gtk: fix darwin buildMatthew Bauer2016-08-16
| | * | glew110: fix darwin buildMatthew Bauer2016-08-16
| | * | gegl: fix darwin buildMatthew Bauer2016-08-16
| | * | fox: fix darwin buildMatthew Bauer2016-08-16
| | * | erlangR16: fix darwin buildMatthew Bauer2016-08-16
| | * | cd-discid: fix darwin buildMatthew Bauer2016-08-16
* | | | Merge branch 'hardened-stdenv' into stagingobadz2016-08-23
|\ \ \ \
| * | | | Revert "Remove lsh, broken & unmaintained"Robin Gloster2016-08-23
| * | | | Revert "lsh: remove last references"Robin Gloster2016-08-23
| * | | | Merge remote-tracking branch 'origin/master' into hardened-stdenvFranz Pletz2016-08-17
| |\ \ \ \
* | \ \ \ \ Merge branch 'master' into stagingobadz2016-08-23
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #17766 from NeQuissimus/gradle30Joachim F2016-08-23
| |\ \ \ \ \
| | * | | | | gradle: 2.14.1 -> 3.0, keep 2.14.1Tim Steinbach2016-08-16
| * | | | | | Adding vlc plugin for firefox.Lluís Batlle i Rossell2016-08-23
| * | | | | | treewide: Make explicit that 'dev' output of imagemagick is usedTuomas Tynkkynen2016-08-23
| * | | | | | cifs-utils: align attrname with pkgnameBjørn Forsman2016-08-22
| * | | | | | jre: Set valid value for meta.outputsToInstallEelco Dolstra2016-08-22
| * | | | | | SDL2: cleanup and add patch to discover extensionsNikolay Amiantov2016-08-22
| * | | | | | SDL: cleanup and add patch to discover extensionsNikolay Amiantov2016-08-22
| * | | | | | openal: fix aliasNikolay Amiantov2016-08-22
* | | | | | | Merge branch 'hardened-stdenv' into stagingobadz2016-08-22
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | calamares/tarball test: fix eval errorobadz2016-08-17
| * | | | | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-08-16
| |\| | | |
| * | | | | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-08-14
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into hardened-stdenvFranz Pletz2016-08-13
| |\ \ \ \ \ \
| * | | | | | | linuxPackages.psmouse_alps: remove, driver in kernel since 3.9Franz Pletz2016-08-13
| * | | | | | | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-08-12
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-08-03
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-08-02
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-31
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-25
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-21
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-19
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | fix merge failure (2)Robin Gloster2016-06-13
| * | | | | | | | | | | | | | | fix merge failureRobin Gloster2016-06-11
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-06-10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \