Will Dietz 28cdb6e841 pyjwt: fix tests to work with pytest >= 3.9.0

2018-11-24 10:41:36 +01:00

..

applications

Merge staging-next into staging

2018-11-22 10:10:40 +01:00

build-support

Merge staging-next into staging

2018-11-22 10:10:40 +01:00

common-updater

common-updater, firefox: fix updater for firefox

2018-11-16 23:04:54 +09:00

data

all-cabal-hashes: update to Hackage at 2018-11-19T08:07:53Z

2018-11-21 16:06:22 +01:00

desktops

Merge pull request #50527 from matthewbauer/ninja-check-phase

2018-11-20 16:55:12 -06:00

development

pyjwt: fix tests to work with pytest >= 3.9.0

2018-11-24 10:41:36 +01:00

games

openarena: add missing dependency - openal (#50903)

2018-11-22 02:43:56 -05:00

misc

Merge master into staging-next

2018-11-21 12:39:20 +01:00

os-specific

Merge staging-next into staging

2018-11-22 10:10:40 +01:00

servers

Merge staging-next into staging

2018-11-22 10:10:40 +01:00

shells

pythonPackages.prompt_toolkit: 1.0.15 -> 2.0.7

2018-11-21 12:38:54 +01:00

stdenv

Merge master into staging-next

2018-11-22 09:57:08 +01:00

test

pkgs/test/nixos-functions: use dummy versioning

2018-11-19 19:26:52 +00:00

tools

curl: cherry-pick upstream patch for ipv6 url parsing

2018-11-22 09:58:34 +01:00

top-level

Merge master into staging-next

2018-11-22 09:57:08 +01:00