summary refs log tree commit diff
Commit message (Expand)AuthorAge
* Merge branch 'master' into stagingRobert Schütz2018-04-10
|\
| * Merge pull request #38672 from Mic92/zfs-enospc-fixJörg Thalheim2018-04-10
| |\
| | * linuxPackages.{zfs,spl}{Stable,Unstable}: 0.7.7 -> 0.7.8; 2018-04-04 -> 2018-...Jörg Thalheim2018-04-10
| * | Merge pull request #38577 from etu/openzwaveRobert Schütz2018-04-10
| |\ \ | | |/ | |/|
| | * home-assistant: treat extraComponents with multiple requirements correctlyRobert Schütz2018-04-09
| | * home-assistant: treat "-" and "_" equally in parse-requirements.pyRobert Schütz2018-04-09
| | * python36Packages.python_openzwave: init at 0.4.4Elis Hirwing2018-04-09
| | * openzwave: Init at 2018-04-04Elis Hirwing2018-04-09
| * | Merge pull request #25148 from obsidiansystems/docker-dirlinksRyan Trinkle2018-04-09
| |\ \
| | * \ Merge branch 'master' into docker-dirlinksRyan Trinkle2017-11-03
| | |\ \
| | * | | dockerTools: optionally preserve directory symlinksRyan Trinkle2017-04-23
| * | | | nixos/make-ext4-fs: Use closureInfoTuomas Tynkkynen2018-04-10
| * | | | sbt: 1.1.3 -> 1.1.4Tim Steinbach2018-04-09
| * | | | androidStudioPackages.{dev,canary}: 3.2.0.8 -> 3.2.0.9Michael Weiss2018-04-09
| * | | | Merge pull request #32605 from xrvdg/hl1110Matthew Justin Bauer2018-04-09
| |\ \ \ \
| | * | | | hl1110 : init at 3.0.1-1Xander Remon van der Goot2018-01-13
| * | | | | Merge pull request #33794 from yrashk/onlykeyMatthew Justin Bauer2018-04-09
| |\ \ \ \ \
| | * | | | | config.hardware.onlykey configuration optionYurii Rashkovskii2018-03-18
| * | | | | | Merge pull request #33919 from samueldr/feature/hll2390dw-cupsMatthew Justin Bauer2018-04-09
| |\ \ \ \ \ \
| | * | | | | | hll2390dw-cups: init at 4.0.0-1Samuel Dionne-Riel2018-01-16
| * | | | | | | Merge pull request #34318 from cumber/fix/mono-use-configure-flagsMatthew Justin Bauer2018-04-09
| |\ \ \ \ \ \ \
| | * | | | | | | mono{48,50,54}: make sure configureFlags are used in configurePhaseBenjamin Mellor2018-01-27
| * | | | | | | | Merge pull request #34864 from ciderale/py3k-graph-tool-updateMatthew Justin Bauer2018-04-09
| |\ \ \ \ \ \ \ \
| | * | | | | | | | graph-tool: use buildPythonPackage with format = "other";Alain Lehmann2018-02-12
| | * | | | | | | | graph-tool: 2.16 -> 2.26Alain Lehmann2018-02-11
| * | | | | | | | | Merge pull request #35545 from MtP76/photoflowJan Tojnar2018-04-09
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | photoflow: init at unstable-2018-03-06Marko Poikonen2018-03-09
| * | | | | | | | | | Merge pull request #35121 from xeji/firehol-35114Matthew Justin Bauer2018-04-09
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | firehol: build firehol command by defaultxeji2018-03-07
| | * | | | | | | | | | firehol: 3.1.5: fix uname command path quoting bugxeji2018-02-18
| | * | | | | | | | | | firehol: 3.1.5: search for config files in /etc/fireholxeji2018-02-18
| * | | | | | | | | | | Merge pull request #35475 from ljli/kodi-iptv-simpleMatthew Justin Bauer2018-04-09
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | kodi: add IPTV Simple addonLeon Isenberg2018-02-24
| * | | | | | | | | | | | rustc: Disable failing test on aarch64Tuomas Tynkkynen2018-04-09
| * | | | | | | | | | | | Merge pull request #36363 from Synthetica9/i3-wk-switchMatthew Justin Bauer2018-04-09
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/NixOS/nixpkgs into i3-wk-switchPatrick Hilhorst2018-03-06
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Following @teto's suggestion with regards to pnamePatrick Hilhorst2018-03-06
| | * | | | | | | | | | | | | fix licensePatrick Hilhorst2018-03-06
| | * | | | | | | | | | | | | i3-wk-switch: init at 2017-08-21Patrick Hilhorst2018-03-06
| * | | | | | | | | | | | | | Merge pull request #36444 from rittelle/masterMatthew Justin Bauer2018-04-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | kdebugsettings: initrittelle2018-03-07
| * | | | | | | | | | | | | | | Merge pull request #36448 from ThomasMader/dlang-updateMatthew Justin Bauer2018-04-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | ldc: 1.7.0 -> 1.8.0Thomas Mader2018-03-07
| * | | | | | | | | | | | | | | | Merge pull request #36488 from mogorman/libetpanMatthew Justin Bauer2018-04-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | mailcore2: 0.5.1 -> 0.6.2Matthew O'Gorman2018-03-08
| | * | | | | | | | | | | | | | | | libetpan: 1.6 -> 1.8Matthew O'Gorman2018-03-07
| * | | | | | | | | | | | | | | | | Merge pull request #36821 from jfrankenau/update-f3Matthew Justin Bauer2018-04-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | f3: 6.0-2016.11.16-unstable -> 7.0Johannes Frankenau2018-03-12
| * | | | | | | | | | | | | | | | | | Merge pull request #36852 from rprospero/sasview-for-prMatthew Justin Bauer2018-04-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Remove lint from Sasview packageAdam Washington2018-03-22
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-31 18:03:29 +0000