Commit Graph

8 Commits

Author SHA1 Message Date
Tuomas Tynkkynen
2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix
2018-03-13 23:04:18 +02:00
Josef Kemetmüller
d289736def pythonPackages.regex: fix darwin build
The package works fine on darwin. We run some tests to prove this.
2018-03-10 20:19:42 +01:00
Frederik Rietdijk
fd35c5c8fd python: regex: 2018.02.08 -> 2018.02.21 2018-02-26 18:42:48 +01:00
Nikolay Amiantov
08f8ad26b3 treewide: unquote homepage in my packages
I don't like this personally but we have #27809 as a precedent.
2018-02-25 22:24:08 +03:00
Frederik Rietdijk
268230db74 python: regex: 2018.01.10 -> 2018.02.08 2018-02-18 20:07:43 +01:00
Frederik Rietdijk
bea86ca20c python: regex: 2017.12.12 -> 2018.01.10 2018-01-20 12:05:28 +01:00
Frederik Rietdijk
f15e854904 python: regex: 2016.11.18 -> 2017.12.12 2018-01-01 11:50:37 +01:00
Frederik Rietdijk
e0caf82ccf python.pkgs.regex: move expression 2018-01-01 11:46:35 +01:00