summary refs log tree commit diff
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-04-07
|\
| * Merge pull request #14506 from makefu/taskserver-pkijoachifm2016-04-07
| |\
| | * taskserver: integrate pki scriptsmakefu2016-04-06
| * | Merge pull request #14507 from taku0/thunderbird-bin-38.7.2joachifm2016-04-07
| |\ \
| | * | thunderbird-bin: 38.7.1 -> 38.7.2taku02016-04-06
| * | | Merge pull request #14520 from jb55/bump/wkhtmltopdfWout Mertens2016-04-07
| |\ \ \
| | * | | wkhtmltopdf: 0.12.2.4 -> 0.12.3.2William Casarin2016-04-07
| * | | | Merge pull request #14519 from aespinosa/disable-acng-on-osxArseniy Seroka2016-04-07
| |\ \ \ \
| | * | | | apt-cacher-ng: disable on OSXAllan Espinosa2016-04-07
| |/ / / /
| * | | | pythonPackages.click: 6.4 -> 6.6Tobias Geerinckx-Rice2016-04-07
| * | | | httpd.service: Support reloadEelco Dolstra2016-04-07
| * | | | Merge pull request #14513 from georgewhewell/putty-0.67joachifm2016-04-07
| |\ \ \ \
| | * | | | putty: 0.66 -> 0.67georgewhewell2016-04-07
| * | | | | wego: init at 81d72ffobadz2016-04-07
| * | | | | Merge pull request #14515 from NeQuissimus/ohmyzsh20160406joachifm2016-04-07
| |\ \ \ \ \
| | * | | | | oh-my-zsh: 2016-03-31 -> 2016-04-06Tim Steinbach2016-04-07
| * | | | | | kde5: enable libmtp udev rulesThomas Tuegel2016-04-07
| |/ / / / /
| * / / / / snabbswitch: 2015.12 -> 2016.04, rename to snabbDomen Kožar2016-04-07
| |/ / / /
| * | | | Merge pull request #14511 from 4z3/bump-eximArseniy Seroka2016-04-07
| |\ \ \ \
| | * | | | exim: 4.86.2 -> 4.87tv2016-04-07
| * | | | | Revert "kernelHeaders: fix build with libmpc"Domen Kožar2016-04-07
| * | | | | rethinkdb: 2.2.4 -> 2.3.0Louis Taylor2016-04-07
| * | | | | Making trac/ldap handle httpd 2.4.Lluís Batlle i Rossell2016-04-07
| |/ / / /
| * | | | Merge pull request #14509 from ragnard/bpf-tracing-kernel-configEelco Dolstra2016-04-07
| |\ \ \ \
| | * | | | linux: kernel config for extended BPF supportRagnar Dahlén2016-04-07
| * | | | | mendeley: 1.16 -> 1.16.1Frederik Rietdijk2016-04-07
| * | | | | configuration-common.nix: fix syntax error (and cosmetic)Peter Simons2016-04-07
| * | | | | configuration-ghc-8.0.x.nix: clean up overridesPeter Simons2016-04-07
| * | | | | haskell-comonad: fix build with ghc-8.0.xPeter Simons2016-04-07
| * | | | | haskell-fail: fix build with ghc-8.0.xPeter Simons2016-04-07
| * | | | | cabal2nix: update to version 20160406Peter Simons2016-04-07
| * | | | | haskell-present: remove obsolete patchMichael Alan Dorman2016-04-07
| * | | | | haskell-pipes-transduce: fix buildMichael Alan Dorman2016-04-07
| * | | | | configuration-hackage2nix.yaml: update list of broken packagesPeter Simons2016-04-07
| * | | | | hackage-packages.nix: update Haskell package setPeter Simons2016-04-07
| * | | | | Merge commit 'refs/pull/14421/head' of git://github.com/NixOS/nixpkgsNikolay Amiantov2016-04-07
| |\ \ \ \ \
| | * | | | | networkmanager: 1.0.6 -> 1.0.12Peter Hoeg2016-04-03
| | |/ / / /
| * | | | | Merge commit 'refs/pull/14242/head' of git://github.com/NixOS/nixpkgsNikolay Amiantov2016-04-07
| |\ \ \ \ \
| | * | | | | network-manager: use ping/ping6 from the nix storePeter Hoeg2016-03-27
| * | | | | | Merge pull request #14503 from obadz/haskell-dnssdPeter Simons2016-04-07
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | haskellPackages.dnssd: override the dns_sd dependency to point to avahi built...obadz2016-04-06
| * | | | | | gforth: fix build on darwinHenry Till2016-04-06
| * | | | | | neovim: Fix build by via order of `buildInputs`Moritz Ulrich2016-04-06
| * | | | | | libpsl: list 2016-03-30 -> 2016-04-05Tobias Geerinckx-Rice2016-04-06
| * | | | | | tldr: 1.1.0 -> 1.2.0Tobias Geerinckx-Rice2016-04-06
| * | | | | | sane-backends-git -> 2016-04-06Tobias Geerinckx-Rice2016-04-06
| * | | | | | Merge pull request #14499 from rnhmjoj/uncertaintiesFrederik Rietdijk2016-04-06
| |\ \ \ \ \ \
| | * | | | | | uncertainties: 2.4.6.1 -> 2.4.8.1rnhmjoj2016-04-06
| * | | | | | | wcslib: 5.14 -> 5.15Tobias Geerinckx-Rice2016-04-06
| * | | | | | | kernel: Don't patchELF manuallyTuomas Tynkkynen2016-04-06