summary refs log tree commit diff
Commit message (Expand)AuthorAge
* Merge: fixup a bad mergeVladimír Čunát2017-04-14
|\
| * Merge the two "same" mergesVladimír Čunát2017-04-14
| |\
| | * A fixed version of commit eb750f9a7b2Vladimír Čunát2017-04-14
| | |\
* | | \ Merge pull request #24889 from formaltech/halvm-bumpJohn Ericson2017-04-14
|\ \ \ \
| * | | | Add hardening, bump hash to HaLVMDavid Johnson2017-04-14
* | | | | nano: 2.8.0 -> 2.8.1Lancelot SIX2017-04-14
* | | | | icoutils: update to 0.31.3Armijn Hemel2017-04-14
* | | | | ocamlPackages.lwt: 2.6.0 -> 2.7.1Vincent Laporte2017-04-14
* | | | | Merge pull request #24841 from loskutov/bleech-unixFrederik Rietdijk2017-04-14
|\ \ \ \ \
| * | | | | pythonPackages.bleach: remove the 'platforms' attribute; update homepageIgnat Loskutov2017-04-14
* | | | | | tensor: init at (post) 0.3Peter Hoeg2017-04-14
* | | | | | Merge pull request #24813 from benley/nm-openvpnThomas Tuegel2017-04-14
|\ \ \ \ \ \
| * | | | | | nixos: Add nm-openvpn to the networkmanager groupBenjamin Staffin2017-04-10
* | | | | | | openssh_hpn: use new sources and version (7_5_P1)Tristan Helmich2017-04-14
* | | | | | | Merge #24179: openssh: 7.4p1 -> 7.5p1Vladimír Čunát2017-04-14
|\ \ \ \ \ \ \
| * | | | | | | openssh: 7.4p1 -> 7.5p1Aneesh Agrawal2017-04-10
* | | | | | | | Merge pull request #24892 from matthiasbeyer/update-muttEelco Dolstra2017-04-14
|\ \ \ \ \ \ \ \
| * | | | | | | | mutt: 1.8.0 -> 1.8.1Matthias Beyer2017-04-14
* | | | | | | | | flashplayer-standalone: 25.0.0.127 -> 25.0.0.148Eelco Dolstra2017-04-14
* | | | | | | | | flashplayer: 25.0.0.127 -> 25.0.0.148Eelco Dolstra2017-04-14
|/ / / / / / / /
* | | | | | | | usbredir: Use dev outputEelco Dolstra2017-04-14
* | | | | | | | murmur service: fix typos from #24830Vladimír Čunát2017-04-14
* | | | | | | | Merge branch 'staging'Vladimír Čunát2017-04-14
|\ \ \ \ \ \ \ \
| * | | | | | | | all-tarballs: fixup evaluation (and the tarball job)Vladimír Čunát2017-04-14
| * | | | | | | | gnutls: use 3.5.10 on Darwin for nowVladimír Čunát2017-04-13
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'master' into stagingDaiderd Jordan2017-04-12
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| * | | | | | gawk: Disable tests that don't work in sandboxTuomas Tynkkynen2017-04-11
| * | | | | | patchutils: Drop patch applied upstreamTuomas Tynkkynen2017-04-11
| * | | | | | Merge pull request #24825 from dezgeg/pr-stdenv-updatesEelco Dolstra2017-04-11
| |\ \ \ \ \ \
| | * | | | | | libsigsegv: Remove aarch64 patch, enable testsTuomas Tynkkynen2017-04-11
| | * | | | | | procps: 3.3.11 -> 3.3.12Tuomas Tynkkynen2017-04-11
| | * | | | | | patchutils: 0.3.3 -> 0.3.4Tuomas Tynkkynen2017-04-11
| | * | | | | | lzo: 2.09 -> 2.10Tuomas Tynkkynen2017-04-11
| | * | | | | | lzma: 5.2.2 -> 5.2.3Tuomas Tynkkynen2017-04-11
| | * | | | | | libsigsegv: 2.10 -> 2.11Tuomas Tynkkynen2017-04-11
| | * | | | | | gmp: 6.1.1 -> 6.1.2Tuomas Tynkkynen2017-04-11
| | * | | | | | gawk: 4.1.3 -> 4.1.4Tuomas Tynkkynen2017-04-11
| |/ / / / / /
| * | | | | | Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2017-04-11
| |\ \ \ \ \ \
| * | | | | | | bonnie: fix on DarwinDan Peebles2017-04-10
| * | | | | | | gnutls: try to fix build on Darwin, after updateVladimír Čunát2017-04-11
| * | | | | | | gnutls: bugfix 3.5.10 -> 3.5.11Vladimír Čunát2017-04-10
| * | | | | | | libdrm: 2.4.76 -> 2.4.79Vladimír Čunát2017-04-10
| * | | | | | | Merge pull request #22726 from matthewbauer/openblas-closure-sizeFrederik Rietdijk2017-04-10
| |\ \ \ \ \ \ \
| | * | | | | | | openblas: disable static libsMatthew Bauer2017-02-12
| * | | | | | | | glibc: apply the i686 patch only on i686Vladimír Čunát2017-04-10
| * | | | | | | | glibc: fix i686 crashes via an upstream patchVladimír Čunát2017-04-10
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2017-04-10
| |\ \ \ \ \ \ \ \
| * | | | | | | | | cctools-port: 886 -> 895Dan Peebles2017-04-09
| * | | | | | | | | darwin.libSystem: fix intermittent impurity bugDan Peebles2017-04-09
| * | | | | | | | | Merge pull request #24672 from magnetophon/libsndfileAristid Breitkreuz2017-04-08
| |\ \ \ \ \ \ \ \ \