summary refs log tree commit diff
Commit message (Expand)AuthorAge
* Merge branch 'master' into stagingVladimír Čunát2018-06-30
|\
| * Merge older staging with added firefox-related updatesVladimír Čunát2018-06-29
| |\
| | * Merge #42729: firefox-61 and related updates (security)Vladimír Čunát2018-06-29
| * | python.pkgs.pytest-mock: 1.8.0 -> 1.10.0Robert Schütz2018-06-29
| * | networkmanager: Expand dns description, integrate with other services (#41898)Benjamin Staffin2018-06-29
| * | elish: add shellPath attributeMatthew Bauer2018-06-29
| * | python.pkgs.flask-common: use flask-cachingRobert Schütz2018-06-29
| * | python.pkgs.flask-caching: init at 1.4.0Robert Schütz2018-06-29
| * | gspell: 1.8.0 → 1.8.1Jan Tojnar2018-06-29
| * | osmo: switch to gspellJan Tojnar2018-06-29
| * | gspell: move to top-levelJan Tojnar2018-06-29
| * | eclipse-plugin-jdt: 4.7.3a -> 4.8Robert Helgesson2018-06-29
| * | eclipse-sdk: 4.7.3a -> 4.8Robert Helgesson2018-06-29
| * | eclipse-platform: 4.7.3a -> 4.8Robert Helgesson2018-06-29
| * | Merge pull request #42765 from jfrankenau/fix-puddletagPeter Hoeg2018-06-29
| |\ \
| | * | puddletag: install desktop entry and man pageJohannes Frankenau2018-06-29
| * | | linux-hardened: Adjust for Linux 4.17Tim Steinbach2018-06-29
| * | | grafana: 5.2.0 -> 5.2.1WilliButz2018-06-29
| * | | androidStudioPackages.{dev,canary}: 3.2.0.18 -> 3.3.0.0Michael Weiss2018-06-29
| * | | androidStudioPackages.beta: 3.2.0.18 -> 3.2.0.19Michael Weiss2018-06-29
| * | | pythonPackages.salmon-mail: fix tests (#42753)Jaakko Luttinen2018-06-29
| * | | pythonPackages.txtorcon: 0.20.0 -> 18.0.0 (#42754)Jaakko Luttinen2018-06-29
| * | | abcm2ps: 8.13.22 -> 8.13.23Robert Schütz2018-06-29
| * | | sshfs: 3.3.2 -> 3.4.0Michael Weiss2018-06-29
| * | | haskellPackages.llvm-hs_6_3_0: fix buildJan Tojnar2018-06-29
| * | | Merge pull request #41954 from jraygauthier/jrg/hplip_fixes_rebasedFrederik Rietdijk2018-06-29
| |\ \ \
| | * | | hplip: 3.18.3 -> 3.18.5Raymond Gauthier2018-06-13
| * | | | Merge pull request #42372 from Assassinkin/sklearn-deapFrederik Rietdijk2018-06-29
| |\ \ \ \
| | * | | | pythonPackages.sklearn-deap: dropping a commentAssassinkin2018-06-25
| | * | | | pythonPackages.sklearn-deap: init at 0.2.2Assassinkin2018-06-22
| * | | | | Merge pull request #42703 from r-ryantm/auto-update/i2pdFrederik Rietdijk2018-06-29
| |\ \ \ \ \
| | * | | | | i2pd: 2.18.0 -> 2.19.0R. RyanTM2018-06-27
| * | | | | | Merge pull request #42690 from r-ryantm/auto-update/marpFrederik Rietdijk2018-06-29
| |\ \ \ \ \ \
| | * | | | | | marp: 0.0.12 -> 0.0.13R. RyanTM2018-06-27
| | |/ / / / /
| * | | | | | Merge pull request #42710 from r-ryantm/auto-update/cpp-hoconFrederik Rietdijk2018-06-29
| |\ \ \ \ \ \
| | * | | | | | cpp-hocon: 0.1.6 -> 0.1.7R. RyanTM2018-06-27
| | |/ / / / /
| * | | | | | Merge pull request #42717 from r-ryantm/auto-update/arangodbFrederik Rietdijk2018-06-29
| |\ \ \ \ \ \
| | * | | | | | arangodb: 3.3.10 -> 3.3.11R. RyanTM2018-06-28
| | |/ / / / /
| * | | | | | Merge pull request #42716 from xvapx/PR/fix-pythonPackages.cherootFrederik Rietdijk2018-06-29
| |\ \ \ \ \ \
| | * | | | | | pythonPackages.cherrypy: fixed testsMarti Serra2018-06-28
| | * | | | | | pythonPackages.cheroot: fixed testsMarti Serra2018-06-28
| * | | | | | | Merge pull request #42718 from r-ryantm/auto-update/calamaresFrederik Rietdijk2018-06-29
| |\ \ \ \ \ \ \
| | * | | | | | | calamares: 3.2.0 -> 3.2.1R. RyanTM2018-06-28
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #42744 from Mic92/nix-reviewFrederik Rietdijk2018-06-29
| |\ \ \ \ \ \ \
| | * | | | | | | nix-review: 0.2.0 -> 0.3.0Jörg Thalheim2018-06-28
| * | | | | | | | Merge pull request #42752 from dirn/python36-typoFrederik Rietdijk2018-06-29
| |\ \ \ \ \ \ \ \
| | * | | | | | | | python36: fix version in identifierAndy Dirnberger2018-06-28
| |/ / / / / / / /
| * | | | | | | | Merge pull request #42122 from AndersonTorres/upload/skribiloMatthew Bauer2018-06-28
| |\ \ \ \ \ \ \ \
| | * | | | | | | | skribilo: init at 0.9.4AndersonTorres2018-06-27
| | * | | | | | | | guile-reader: init at 0.6.2AndersonTorres2018-06-27