summary refs log tree commit diff
path: root/pkgs/top-level
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/staging' into HEADFrederik Rietdijk2018-01-02
|\
| * Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2018-01-01
| |\
| * \ Merge pull request #33280 from NixOS/python-unstableFrederik Rietdijk2018-01-01
| |\ \
| | * | python.pkgs.brotlipy: move expressionFrederik Rietdijk2018-01-01
| | * | python.pkgs.partd: move expressionFrederik Rietdijk2018-01-01
| | * | python.pkgs.networkx: move expressionFrederik Rietdijk2018-01-01
| | * | python.pkgs.jellyfish: move expressionFrederik Rietdijk2018-01-01
| | * | python.pkgs.splinter: init at 0.7.7Frederik Rietdijk2018-01-01
| | * | python.pkgs.plone-testing: init at 5.1.1Frederik Rietdijk2018-01-01
| | * | python.pkgs.regex: move expressionFrederik Rietdijk2018-01-01
| * | | Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2018-01-01
| |\ \ \ | | |/ / | |/| |
| * | | xapian: 1.4.4 -> 1.4.5Frederik Rietdijk2018-01-01
| * | | Merge pull request #31094 from yegortimoshenko/ibus/updateYegor Timoshenko2017-12-31
| |\ \ \
| | * | | ibus: 1.5.16 -> 1.5.17, fix, back to single outputYegor Timoshenko2017-12-30
| * | | | Merge pull request #33204 from NixOS/python-unstableFrederik Rietdijk2017-12-31
| |\ \ \ \
| | * | | | python.pkgs.zope_copy: move exprFrederik Rietdijk2017-12-31
| | * | | | python.pkgs.jdcal: 1.0 -> 1.3Frederik Rietdijk2017-12-31
| | * | | | python.pkgs.decorator: move expressionFrederik Rietdijk2017-12-31
| | * | | | python: cached-property: 1.3.0 -> 1.3.1Frederik Rietdijk2017-12-31
| | * | | | python.pkgs.biopython: move expressionFrederik Rietdijk2017-12-31
| | * | | | python.pkgs.backports_lzma: move expressionFrederik Rietdijk2017-12-31
| | * | | | python.pkgs.backports_abc: move expressionFrederik Rietdijk2017-12-31
| | * | | | python.pkgs.amqp_1: remove exprFrederik Rietdijk2017-12-31
| | * | | | python.pkgs.kombu_3: remove exprFrederik Rietdijk2017-12-31
| | * | | | python.pkgs.html5lib: move expressionFrederik Rietdijk2017-12-31
| | * | | | python.pkgs.iso8601: move expressionFrederik Rietdijk2017-12-31
| | * | | | python.pkgs.Mako: move expressionFrederik Rietdijk2017-12-31
| | * | | | python.pkgs.markdown: 2.6.8 -> 2.6.10Frederik Rietdijk2017-12-31
| | * | | | python.pkgs.pytools: fix expressionFrederik Rietdijk2017-12-31
| | * | | | python.pkgs.idna: move expressionFrederik Rietdijk2017-12-31
| | * | | | python.pkgs.jsonpickle: init at 0.9.5Frederik Rietdijk2017-12-31
| | * | | | python.pkgs.jsondiff: init at 1.1.1Frederik Rietdijk2017-12-31
| | * | | | python.pkgs.boto3: move expressionFrederik Rietdijk2017-12-31
| | * | | | python.pkgs.aws-xray-sdk: init at 0.95Frederik Rietdijk2017-12-31
| | * | | | python.pkgs.pyaml: move expressionFrederik Rietdijk2017-12-31
| | * | | | python.pkgs.lxml: move expressionFrederik Rietdijk2017-12-31
| | * | | | python.pkgs.extras: move expressionFrederik Rietdijk2017-12-31
| | * | | | python.pkgs.backports_functools_lru_cache: move expressionFrederik Rietdijk2017-12-31
| | * | | | python.pkgs.tox: 2.4.1 -> 2.9.1Frederik Rietdijk2017-12-31
| | * | | | python.pkgs.structlog: move expressionFrederik Rietdijk2017-12-31
| | * | | | python.pkgs.texttable: 0.8.4 -> 1.1.1Frederik Rietdijk2017-12-31
| | * | | | python: llvmlite: 0.20.0 -> 0.21.0Frederik Rietdijk2017-12-31
| | * | | | python: pytest: 3.2.5 -> 3.3.1Frederik Rietdijk2017-12-31
| | * | | | python.pkgs.pluggy: 0.3.1 -> 0.6.0Frederik Rietdijk2017-12-31
| * | | | | Merge branch 'master' into stagingVladimír Čunát2017-12-31
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #26805 from obsidiansystems/cross-elegantJohn Ericson2017-12-30
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | top-level: Splice in more package sets for new types of depsJohn Ericson2017-12-30
| * | | | | | Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2017-12-30
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into stagingVladimír Čunát2017-12-29
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into stagingVladimír Čunát2017-12-29
| |\ \ \ \ \ \ \ \