summary refs log tree commit diff
Commit message (Expand)AuthorAge
* darwin: bump apple_sdks to 10.12Matthew Bauer2018-12-29
* darwin.hfs: put headers in hfs/ directoryMatthew Bauer2018-12-27
* Merge staging into staging-nextFrederik Rietdijk2018-12-27
|\
| * Merge staging-next into stagingFrederik Rietdijk2018-12-27
| |\ | |/ |/|
* | Merge master into staging-nextFrederik Rietdijk2018-12-27
|\ \
| * | insync: 1.4.5.37069 -> 1.5.5.37367Aristid Breitkreuz2018-12-27
| * | Merge pull request #51945 from senden9/patch-1Silvan Mosberger2018-12-27
| |\ \
| | * | Update oh-my-zsh.xmlStefano Probst2018-12-13
| * | | python.pkgs.pytest_xdist: pytest-forked is needed during runtime, fixes #45060Frederik Rietdijk2018-12-27
| * | | bacula: 9.2.2 -> 9.4.1 (#52924)R. RyanTM2018-12-27
| * | | dmrconfig: 1.0 -> 1.1 (#52961)Elis Hirwing2018-12-27
| * | | Merge pull request #51294 from eadwu/nvidia_x11/legacy_390Dmitry Kalinkin2018-12-27
| |\ \ \
| | * | | nvidia: expose nvidia_x11_legacy390Edmund Wu2018-11-30
| * | | | nixos/security/misc: expose SMT control optionJoachim Fasting2018-12-27
| * | | | nixos/security/misc: expose l1tf mitigation optionJoachim Fasting2018-12-27
| * | | | nixos/security/misc: factor out protectKernelImageJoachim Fasting2018-12-27
| * | | | nixos/security/misc: use mkMerge for easier extensionJoachim Fasting2018-12-27
| * | | | pandoc: fix build, unbreaks `metrics` jobFrederik Rietdijk2018-12-27
| * | | | Merge pull request #52847 from r-ryantm/auto-update/lmdbmarkuskowa2018-12-27
| |\ \ \ \
| | * | | | lmdb: 0.9.22 -> 0.9.23R. RyanTM2018-12-25
| * | | | | Merge pull request #52597 from lopsided98/lvm2-no-parallelmarkuskowa2018-12-27
| |\ \ \ \ \
| | * | | | | lvm2: disable parallel buildingBen Wolsieffer2018-12-24
| * | | | | | pythonPackages.sip: enable parallel buildingOrivej Desh2018-12-27
| * | | | | | Merge pull request #52950 from agracie/fix-mklmarkuskowa2018-12-27
| |\ \ \ \ \ \
| | * | | | | | mkl: fix hash on Darwinagracie2018-12-26
| * | | | | | | Merge pull request #52956 from orivej/sip-moduleOrivej Desh (NixOS)2018-12-27
| |\ \ \ \ \ \ \
| | * | | | | | | pythonPackages.pyqt5: import sip as PyQt5.sipOrivej Desh2018-12-27
| | * | | | | | | pythonPackages.sip: make sip-module name overridableOrivej Desh2018-12-27
| * | | | | | | | opentx: fix build, support building testsOrivej Desh2018-12-27
| |/ / / / / / /
| * | | | | | | Merge pull request #52955 from Gerschtli/update/cargo-releaseVladyslav M2018-12-27
| |\ \ \ \ \ \ \
| | * | | | | | | cargo-release: fix darwin buildVladyslav Mykhailichenko2018-12-27
| | * | | | | | | cargo-release: 0.10.0 -> 0.10.5Tobias Happ2018-12-27
| * | | | | | | | Merge pull request #52109 from djahandarie/masterlewo2018-12-27
| |\ \ \ \ \ \ \ \
| | * | | | | | | | dockerTools.buildImage: fix two bugs introduced in c88337c9aca9d91804da7d1d05...Darius Jahandarie2018-12-14
| * | | | | | | | | python37: fix darwin buildMario Rodas2018-12-27
| * | | | | | | | | python36: fix darwin buildMario Rodas2018-12-27
| * | | | | | | | | Merge pull request #52820 from r-ryantm/auto-update/pdfpcPascal Wittmann2018-12-27
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | pdfpc: 4.2.1 -> 4.3.0R. RyanTM2018-12-25
| * | | | | | | | | | Merge pull request #52877 from r-ryantm/auto-update/globalPascal Wittmann2018-12-27
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | global: 6.6.2 -> 6.6.3R. RyanTM2018-12-25
| | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #52954 from worldofpeace/granite/5.2.2worldofpeace2018-12-27
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | granite: various cleanupsworldofpeace2018-12-27
| | * | | | | | | | | | granite: 5.2.1 -> 5.2.2worldofpeace2018-12-26
| * | | | | | | | | | | Merge pull request #52786 from romildo/upd.matchaworldofpeace2018-12-26
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | matcha: move to pkgs/data/themesJosé Romildo Malaquias2018-12-24
| | * | | | | | | | | | | matcha: 2018-11-12 -> 2018-12-24José Romildo Malaquias2018-12-24
| * | | | | | | | | | | | Merge pull request #52872 from r-ryantm/auto-update/kid3worldofpeace2018-12-26
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | kid3: 3.6.2 -> 3.7.0R. RyanTM2018-12-25
| | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #52895 from ivan/qbittorrent-4.1.5worldofpeace2018-12-26
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | qbittorrent: 4.1.4 -> 4.1.5Ivan Kozik2018-12-26