summary refs log tree commit diff
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2017-05-22
|\
| * Merge pull request #25981 from rimmington/cython-arm-prFrederik Rietdijk2017-05-22
| |\
| | * cython: build on 32-bit ARMRhys2017-05-22
| * | Merge pull request #25835 from therealpxc/fishJörg Thalheim2017-05-22
| |\ \
| | * | fish: (NixOS only) source configuration sections anew in all child shellsPatrick Callahan2017-05-19
| | * | fish: source NixOS environment on non-login shells, when it hasn't beenPatrick Callahan2017-05-19
| * | | hss: init at 1.0.1 (#25936)Andrew Miller2017-05-22
| * | | coq: nix-buffer: Inherit variables to PG shellShea Levy2017-05-22
| | |/ | |/|
| * | kbfs service: init (#25610)Calum MacRae2017-05-22
| * | Merge pull request #25975 from georgewhewell/update-fwupJoachim F2017-05-21
| |\ \
| | * | fwup: 0.14.2 -> 0.14.3georgewhewell2017-05-21
| * | | Merge pull request #25905 from Ptival/proofgeneral-headJoachim F2017-05-21
| |\ \ \
| | * | | proofgeneral_HEAD: fix for files removed upstreamValentin Robert2017-05-18
| * | | | Merge pull request #25872 from mimadrid/update/sudo-1.8.20Joachim F2017-05-21
| |\ \ \ \
| | * | | | sudo: 1.8.19p2 -> 1.8.20mimadrid2017-05-18
| * | | | | pythonPackages.libsoundtouch: 0.3.0 -> 0.4.0obadz2017-05-21
| * | | | | aria2: 1.31.0 -> 1.32.0Robin Gloster2017-05-21
| * | | | | banner: 1.3.3 -> 1.3.4Robin Gloster2017-05-21
| * | | | | basex: 8.3.1 -> 8.6.4Robin Gloster2017-05-21
| * | | | | bibtool: 2.57 -> 2.67Robin Gloster2017-05-21
| * | | | | marionette-harness: init at 4.4.0Michael Raskin2017-05-21
| * | | | | Merge pull request #25458 from seppeljordan/csound-enable-oscJoachim F2017-05-21
| |\ \ \ \ \
| | * | | | | csound: add liblo to buildinputs to enable osc capabilitiesSebastian Jordan2017-05-02
| * | | | | | Merge pull request #25673 from drdaeman/pycharm-2017.1.2-masterJoachim F2017-05-21
| |\ \ \ \ \ \
| | * | | | | | pycharm-professional: 2017.1 -> 2017.1.2Aleksey Zhukov2017-05-10
| | * | | | | | pycharm-community: 2017.1 -> 2017.1.2Aleksey Zhukov2017-05-10
| * | | | | | | Merge pull request #25700 from michalpalka/xen-bridge-stop-fixJoachim F2017-05-21
| |\ \ \ \ \ \ \
| | * | | | | | | xen service: Fix removing netfilter rules while stopping xen-bridgeMichał Pałka2017-05-11
| * | | | | | | | dnscrypt-proxy: 1.9.4 -> 1.9.5Joachim Fasting2017-05-21
| * | | | | | | | nano: use https for meta.homepageJoachim Fasting2017-05-21
| * | | | | | | | linuxPackages.phc-intel: remove use of features.grsecurityJoachim Fasting2017-05-21
| * | | | | | | | Merge pull request #25667 from DmitryTsygankov/DmitryTsygankov/bitcoin-classicJoachim F2017-05-21
| |\ \ \ \ \ \ \ \
| | * | | | | | | | bitcoin-classic: 1.2.3 -> 1.2.5Dmitry Tsygankov2017-05-09
| * | | | | | | | | Merge pull request #25528 from Mic92/node-packagesJörg Thalheim2017-05-21
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | nodePackages: split into v4/v6 package setJörg Thalheim2017-05-05
| * | | | | | | | | | Merge pull request #25969 from romildo/upd.tint2Jörg Thalheim2017-05-21
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | tint2: 0.14.4 -> 0.14.5romildo2017-05-21
| * | | | | | | | | | | android-studio: 2.3.1.0 -> 2.3.2.0Michael Weiss2017-05-21
| * | | | | | | | | | | Merge pull request #25952 from matthewbauer/emacs-with-packages-darwinThomas Tuegel2017-05-21
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | emacsWithPackages: wrap MacOS appMatthew Bauer2017-05-20
| * | | | | | | | | | | | Merge pull request #25896 from joachifm/ovmfJoachim F2017-05-21
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | OVMF: separate output for ovmf binariesJoachim Fasting2017-05-20
| * | | | | | | | | | | | | Merge pull request #25889 from unaizalakain/init-subliminalJörg Thalheim2017-05-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | subliminal: init at 2.0.5Unai Zalakain2017-05-21
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #25883 from unaizalakain/init-enzymeJörg Thalheim2017-05-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | enzyme: use fetchPypiJörg Thalheim2017-05-21
| | * | | | | | | | | | | | | enzyme: init at 0.4.1Unai Zalakain2017-05-21
| * | | | | | | | | | | | | | Merge pull request #25966 from NeQuissimus/ammonite_0_9_0Tim Steinbach2017-05-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | ammonite: 0.8.5 -> 0.9.0Tim Steinbach2017-05-21
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge pull request #25964 from nh2/nixos-manual-module-addCheck-orderJörg Thalheim2017-05-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \