summaryrefslogtreecommitdiff
path: root/pkgs/development/python-modules/httpserver
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2017-11-29 11:18:49 +0000
committerOrivej Desh <orivej@gmx.fr>2017-11-29 11:18:49 +0000
commit3cb0103818029b5f05eacb68d1a7a1aaba2cb5dc (patch)
tree36e8584d5ecb3cf5157a274d14148d8ade6bbb13 /pkgs/development/python-modules/httpserver
parent6c6fb4f6ce0cf49dff404c1f610781a6c9a89794 (diff)
parent4cbbecc85dbc5a040f2e4111093d30337718996a (diff)
Merge branch 'master' into staging
* master: libretro.mame: fix parallel building gnome3: add jtojnar as maintainer libskk: fix build gencfsm: fix build wkhtmltopdf: fix build gutenprint: fix build ghc-8.2.2: drop obsolete gold linker patch git-annex: update hash for new version 6.20171124 hackage-packages.nix: automatic Haskell package set update hackage2nix: disable failing builds hackage2nix: keep language-c-0.7.0 around in the package set for c2hs hack brotli: 0.6.0 -> 1.0.1 brotliUnstable: delete libbrotli: delete libbrotli: 1.0 -> 1.0.1.2017-10-30 nginxModules.brotli: 2015-11-18 -> 2016-12-02
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions