Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into staging | Tuomas Tynkkynen | 2018-03-13 |
|\ | | | | | | | | | Conflicts: pkgs/development/tools/build-managers/conan/default.nix | ||
| * | pythonPackages.regex: fix darwin build | Josef Kemetmüller | 2018-03-10 |
| | | | | | | | | The package works fine on darwin. We run some tests to prove this. | ||
* | | python: regex: 2018.02.08 -> 2018.02.21 | Frederik Rietdijk | 2018-02-26 |
|/ | |||
* | treewide: unquote homepage in my packages | Nikolay Amiantov | 2018-02-25 |
| | | | | I don't like this personally but we have #27809 as a precedent. | ||
* | python: regex: 2018.01.10 -> 2018.02.08 | Frederik Rietdijk | 2018-02-18 |
| | |||
* | python: regex: 2017.12.12 -> 2018.01.10 | Frederik Rietdijk | 2018-01-20 |
| | |||
* | python: regex: 2016.11.18 -> 2017.12.12 | Frederik Rietdijk | 2018-01-01 |
| | |||
* | python.pkgs.regex: move expression | Frederik Rietdijk | 2018-01-01 |