summary refs log tree commit diff
Commit message (Expand)AuthorAge
* treewide: Use `targetPrefix` instead of `prefix` for platform name prefixesJohn Ericson2017-11-27
*---. Restore more accurate history of the master branchOrivej Desh2017-11-25
|\ \ \
| | | * Merge pull request #32022 from bachp/gitlab-runner-10.2.0Jörg Thalheim2017-11-25
| | | |\
| | | | * gitlab-runner: 10.1.0 -> 10.2.0Pascal Bach2017-11-25
| | | * | Restore first-parent history of the master branchOrivej Desh2017-11-25
| | | |\ \
| | | | * \ Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2017-11-25
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #31781 from robertodr/hdf5-fortran-2003Frederik Rietdijk2017-11-25
|\ \ \ \ \ \
| * | | | | | hdf5: 1.8.18 -> 1.10.1Roberto Di Remigio2017-11-21
| * | | | | | hdf5_1_8: add fortran2003 optionRoberto Di Remigio2017-11-21
| * | | | | | hdf5_1_8: 1.8.18 -> 1.8.19Roberto Di Remigio2017-11-21
| * | | | | | hdf5_1_8: init at 1.8.18Roberto Di Remigio2017-11-21
* | | | | | | Merge pull request #31995 from jtojnar/xserver-libinputOrivej Desh2017-11-25
|\ \ \ \ \ \ \
| * | | | | | | nixos/xserver: let X choose the xkb rulesJan Tojnar2017-11-25
| * | | | | | | nixos/libinput: load configuration fileJan Tojnar2017-11-24
* | | | | | | | nixos/munin: fix broken plugin wrappersKjetil Orbekk2017-11-25
* | | | | | | | munin-node: patch to configure plugin-conf.dKjetil Orbekk2017-11-25
* | | | | | | | munin-node: add patch to preserve environment variablesKjetil Orbekk2017-11-25
* | | | | | | | munin: 2.0.33 -> 2.0.34Kjetil Orbekk2017-11-25
* | | | | | | | Merge pull request #32010 from pcarrier/pcarrier/minijailJörg Thalheim2017-11-25
|\ \ \ \ \ \ \ \
| * | | | | | | | minijail: init at android-8.0.0_r34Pierre Carrier2017-11-25
* | | | | | | | | Merge pull request #32021 from bachp/riot-web-0.13.1Jörg Thalheim2017-11-25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | riot-web: 0.12.6 -> 0.13.1Pascal Bach2017-11-25
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #32012 from chpatrick/cnijfilter_4_00Jörg Thalheim2017-11-25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cnijfilter: add 4.00Patrick Chilton2017-11-24
* | | | | | | | | | Merge pull request #32018 from adisbladis/traefik-1_4_4Jörg Thalheim2017-11-25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | traefik: 1.3.8 -> 1.4.4adisbladis2017-11-25
* | | | | | | | | | | luaPackages.vicious: 2.2.0 -> 2.3.0Joerg Thalheim2017-11-25
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | PySolFC: init at 2.0Kier Davis2017-11-25
* | | | | | | | | | octaveFull: always use openblasCompat on darwinFrederik Rietdijk2017-11-25
| |_|_|_|_|_|_|/ / |/| | | | | | | |
| | | | | | | | * Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2017-11-25
| | | | | | | |/| | |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | go-sct: disable on DarwinOrivej Desh2017-11-25
* | | | | | | | coyim: disable on DarwinOrivej Desh2017-11-25
* | | | | | | | nixos/fwupd: disable by defaultOrivej Desh2017-11-25
* | | | | | | | nixos.tests.installer.swraid: increase drive sizeVladimír Čunát2017-11-25
* | | | | | | | Merge #32017: thunderbird*: security 52.4.0 -> 52.5.0Vladimír Čunát2017-11-25
|\ \ \ \ \ \ \ \
| * | | | | | | | thunderbird: 52.4.0 -> 52.5.0taku02017-11-24
| * | | | | | | | thunderbird-bin: 52.4.0 -> 52.5.0taku02017-11-24
* | | | | | | | | nixpkgs.metrics: --show-trace into the logVladimír Čunát2017-11-25
* | | | | | | | | Merge pull request #32008 from mbode/terraform-0_11adisbladis2017-11-25
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | terraform: upgrade providersMaximilian Bode2017-11-22
| * | | | | | | | terraform: add 0.11Maximilian Bode2017-11-22
| * | | | | | | | terraform: 0.10.7 -> 0.10.8Maximilian Bode2017-11-22
* | | | | | | | | influxdb: make it know what version it isPeter Hoeg2017-11-25
* | | | | | | | | linuxPackages: Revert accidental bump to 4.14aszlig2017-11-24
* | | | | | | | | virtualbox: 5.2.0 -> 5.2.2aszlig2017-11-24
* | | | | | | | | Merge pull request #31988 from Baughn/povrayJörg Thalheim2017-11-24
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | povray: Add X11/SDL preview supportSvein Ove Aas2017-11-23
* | | | | | | | | Merge pull request #31981 from pbogdan/update-wordpressGraham Christensen2017-11-24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | wordpress: 4.8.3 -> 4.9Piotr Bogdan2017-11-23
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'staging' (older one)Vladimír Čunát2017-11-24
|\ \ \ \ \ \ \ \ \