nixpkgs/pkgs
Tor Hedin Brønner 4361e50615 Revert "python: pyjwt: fix build"
This reverts commit bcf736b325.

28cdb6e841 fixed the issue with pytest-3.9.0.
2018-12-04 16:43:01 +01:00
..
applications Merge master into staging-next 2018-12-03 12:18:43 +01:00
build-support Merge remote-tracking branch 'upstream/master' into staging 2018-11-30 20:09:45 +01:00
common-updater
data Merge master into staging-next 2018-12-03 12:18:43 +01:00
desktops Merge master into staging-next 2018-12-03 12:18:43 +01:00
development Revert "python: pyjwt: fix build" 2018-12-04 16:43:01 +01:00
games Merge master into staging-next 2018-12-03 12:18:43 +01:00
misc Merge master into staging-next 2018-12-03 12:18:43 +01:00
os-specific Merge master into staging-next 2018-12-03 12:18:43 +01:00
servers Merge master into staging-next 2018-12-03 12:18:43 +01:00
shells Merge pull request #51329 from c0bw3b/cleanup/gnu-https 2018-12-02 16:52:33 +01:00
stdenv Merge remote-tracking branch 'upstream/master' into staging 2018-11-30 20:09:45 +01:00
test Merge pull request #50212 from matthewbauer/host-emulator 2018-11-29 19:34:20 -06:00
tools Merge master into staging-next 2018-12-03 12:18:43 +01:00
top-level Merge master into staging-next 2018-12-03 12:18:43 +01:00