summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* Merge branch 'master' into stagingDaiderd Jordan2018-06-18
|\
| * Merge pull request #42164 from Ma27/bump-osqueryadisbladis2018-06-18
| |\ | | | | | | osquery: 3.2.2 -> 3.2.8
| | * osquery: 3.2.2 -> 3.2.8Maximilian Bosch2018-06-18
| | | | | | | | | | | | | | | | | | | | | The 3.2.2 build fails ATM on Hydra: https://hydra.nixos.org/build/75998362 Bumping to 3.2.8 and rebasing `osquery/CMakeLists.txt` with `misc.patch` fixes the issue. Additionally the NixOS test remains functional.
| * | Merge pull request #42156 from jokogr/u/libreoffice-fresh-6.0.4.2Michael Raskin2018-06-18
| |\ \ | | | | | | | | libreoffice-fresh: 6.0.3.2 -> 6.0.4.2 and don't use system xmlsec
| | * | libreoffice: disable system xmlsecIoannis Koutras2018-06-18
| | | |
| | * | libreoffice-fresh: 6.0.3.2 -> 6.0.4.2Ioannis Koutras2018-06-18
| | | |
| * | | nixos/networkmanager: add extraConfigYegor Timoshenko2018-06-18
| | | |
| * | | Merge pull request #38382 from NixOS/yegortimoshenko-patch-1xeji2018-06-18
| |\ \ \ | | | | | | | | | | cryptsetup: 1.7.5 -> 2.0.2
| | * | | cryptsetup: apply Matías Lang's patchYegor Timoshenko2018-06-15
| | | | |
| | * | | cryptsetup: 1.7.5 -> 2.0.2Yegor Timoshenko2018-04-03
| | | | |
| * | | | pythonPackages.xml2rfc: init at 2.9.8Vladimír Čunát2018-06-18
| | |_|/ | |/| | | | | | | | | | | | | | It seems to work fine, in python2Packages and python3Packages. If you find a problem, let me know and I'll try to fix it.
| * | | nixos/tor: grammer fix, advise -> adviceJoachim Fasting2018-06-18
| | | | | | | | | | | | | | | | Seems to me that the noun form is more appropriate here.
| * | | Merge pull request #42143 from Ma27/bump-nifskopeJörg Thalheim2018-06-18
| |\ \ \ | | | | | | | | | | nifskope: 1.1.3 -> 2.0.dev7
| | * | | nifskope: 1.1.3 -> 2.0.dev7Maximilian Bosch2018-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `nifskope` v2 contains a lot of new features and a new, QT5-based UI (see https://github.com/niftools/nifskope/releases). Additionally the 2.0 sourcetree exists for quite a while and after some short user tests it seems fairly stable. The following aspects have been changed: * Use QT 5.9 rather than QT4 (see #33248). * GCC7 support from upstream (gcc6 patch not needed anymore, build on GCC7 works fine), disabled `-Werror=format-security` can be used again as compiler flag. * Patched broken paths in `NifSkope_targets.pri` to point to the proper dependencies (otherwise `<gli.hpp>` and `qhull` couldn't be found). * Patched paths in `NifSkope.pro` to `lupdate` and `lrelease` (default `QT_*` paths point to `libsForQt5x.qtbase` which doesn't contain the needed binaries, instead they need to point to `libsForQt5x.qttools`). * Added myself as maintainer.
| * | | | Merge pull request #42157 from puffnfresh/pkg/brightnessctlJörg Thalheim2018-06-18
| |\ \ \ \ | | | | | | | | | | | | brightnessctl: fix permissions
| | * | | | brightnessctl: fix permissionsBrian McKenna2018-06-18
| | | | | |
| * | | | | Merge pull request #42137 from LnL7/vim-plugin-updatesJörg Thalheim2018-06-18
| |\ \ \ \ \ | | |/ / / / | |/| | | | vim-plugins: updates
| | * | | | vim-plugins: updatesDaiderd Jordan2018-06-17
| | | | | |
| * | | | | Merge pull request #42089 from marsam/feature/update-nodejsadisbladis2018-06-18
| |\ \ \ \ \ | | | | | | | | | | | | | | nodejs: 6.14.2 -> 6.14.3, 8.11.2 -> 8.11.3, 9.11.1 -> 9.11.2
| | * | | | | nodejs: 9.11.1 -> 9.11.2Mario Rodas2018-06-15
| | | | | | |
| | * | | | | nodejs: 8.11.2 -> 8.11.3Mario Rodas2018-06-15
| | | | | | |
| | * | | | | nodejs: 6.14.2 -> 6.14.3Mario Rodas2018-06-15
| | | | | | |
| * | | | | | Merge pull request #41901 from ariutta/sqlintJörg Thalheim2018-06-18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | sqlint: init at 0.1.7
| | * | | | | | sqlint: init at 0.1.7. ht @ryantm.Anders Riutta2018-06-17
| | | | | | | |
| * | | | | | | Merge pull request #42154 from jokogr/f/jetbrains-channelJörg Thalheim2018-06-18
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | jetbrains.editors: Fix update script and update versions
| | * | | | | | | jetbrains.clion: 2018.1.3 -> 2018.1.5Ioannis Koutras2018-06-18
| | | | | | | | |
| | * | | | | | | jetbrains.rider: 2018.1 -> 2018.1.2Ioannis Koutras2018-06-18
| | | | | | | | |
| | * | | | | | | jetbrains.phpstorm: 2018.1.4 -> 2018.1.6Ioannis Koutras2018-06-18
| | | | | | | | |
| | * | | | | | | jetbrains.idea-ultimate: 2018.1.4 -> 2018.1.5Ioannis Koutras2018-06-18
| | | | | | | | |
| | * | | | | | | jetbrains.idea-community: 2018.1.4 -> 2018.1.5Ioannis Koutras2018-06-18
| | | | | | | | |
| | * | | | | | | jetbrains.webstorm: 2018.1.3 -> 2018.1.5Ioannis Koutras2018-06-18
| | | | | | | | |
| | * | | | | | | jetbrains.pycharm-professional: 2018.1.3 -> 2018.1.4Ioannis Koutras2018-06-18
| | | | | | | | |
| | * | | | | | | jetbrains.pycharm-community: 2018.1.3 -> 2018.1.4Ioannis Koutras2018-06-18
| | | | | | | | |
| | * | | | | | | jetbrains.goland: 2018.1.3 -> 2018.1.4Ioannis Koutras2018-06-18
| | | | | | | | |
| | * | | | | | | jetbrains.datagrip: 2018.1.3 -> 2018.1.4Ioannis Koutras2018-06-18
| | | | | | | | |
| | * | | | | | | jetbrains: update.pl use channel nameIoannis Koutras2018-06-18
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | hugo: remove $bin/bin/generateJörg Thalheim2018-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is used internally for the build process is not meant to be used.
| * | | | | | | Merge pull request #41834 from manveru/crystal-2.25.0Jörg Thalheim2018-06-18
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Crystal: 0.24.2 -> 0.25.0
| | * | | | | | | Shards: 0.7.2 -> 0.8.0Michael Fellinger2018-06-17
| | | | | | | | |
| | * | | | | | | Mint: 0.0.3 -> 0.0.4Michael Fellinger2018-06-17
| | | | | | | | |
| | * | | | | | | Crystal: 0.24.2 -> 0.25.0Michael Fellinger2018-06-17
| | | | | | | | |
| * | | | | | | | Merge pull request #42141 from swflint/ical2orgadisbladis2018-06-18
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | ical2org: init at v.1.1.5
| | * | | | | | | | ical2org: fix missing semicolonSamuel W. Flint2018-06-17
| | | | | | | | | |
| | * | | | | | | | ical2org: init at v.1.1.5Samuel W. Flint2018-06-17
| | | | | | | | | |
| * | | | | | | | | Merge pull request #42144 from samueldr/auto/dbeaver/nixpkgs-unstable/5.1.1adisbladis2018-06-18
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | dbeaver: 5.1.0 -> 5.1.1
| | * | | | | | | | | dbeaver: 5.1.0 -> 5.1.1Samuel Dionne-Riel2018-06-17
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #42153 from Ekleog/opensmtpd-changeable-packageadisbladis2018-06-18
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | opensmtpd module: allow changing the package
| | * | | | | | | | | opensmtpd module: allow changing the packageLéo Gaspard2018-06-18
| | | | | | | | | | |
| * | | | | | | | | | libvirt: make xen support optionalRobin Gloster2018-06-18
| | | | | | | | | | |
| * | | | | | | | | | mozjpeg: 3.2 -> 3.3.1Gabriel Ebner2018-06-18
| | | | | | | | | | |