Commit graph

45369 commits

Author SHA1 Message Date
Dominic Steinitz 46f9e10636 Add name to maintainers' list 2018-03-12 14:58:12 +00:00
Dominic Steinitz 12424157a2 Merge branch 'master' of https://github.com/NixOS/nixpkgs 2018-03-11 08:13:11 +00:00
Frederik Rietdijk da86dadbdd
Merge pull request #36780 from MoritzMaxeiner/master
Remove myself as maintainer
2018-03-11 08:59:43 +01:00
Frederik Rietdijk 12a8276649
Merge pull request #36778 from Ma27/fix-htmltreediff
pythonPackages.htmltreediff: fix build
2018-03-11 08:35:02 +01:00
Joachim Fasting fb8a85f631
ntbtls: 0.1.1 -> 0.1.2 2018-03-11 01:33:57 +01:00
Moritz Maxeiner 12a70fd571 Remove myself as maintainer 2018-03-11 00:46:41 +01:00
Maximilian Bosch 94458721a7
pythonPackages.htmltreediff: fix build
- add `pythonPackages.nose` as `checkInput` to make the tests passing
- extract expression into its own file

See https://hydra.nixos.org/build/70680974/log
See ticket #36453
2018-03-11 00:21:47 +01:00
xeji 884a317828 kore: fix darwin build 2018-03-10 19:36:14 +01:00
Graham Christensen 486c593275
Merge pull request #36763 from xeji/kore
kore: fix build with gcc7
2018-03-10 13:16:25 -05:00
xeji 41cdea68da kore: fix build with gcc7 2018-03-10 18:02:05 +01:00
Jörg Thalheim 80fcfbe4cf
Merge pull request #36748 from etu/python-anyjson-fixes
anyjson: move to own directory
2018-03-10 16:05:30 +00:00
Jörg Thalheim 0d267c6abe
Merge pull request #36746 from etu/python-alot-fixes
alot: move to own module
2018-03-10 16:02:26 +00:00
Ivan Solyankin 34b06b05e3 marisa-python: init at 1.3.40 2018-03-10 17:13:38 +03:00
Lancelot SIX ddddca5c2f pythonPackages.daphne: 2.0.3 -> 2.1.0 2018-03-10 14:55:00 +01:00
Lancelot SIX 38753d52bc pythonPackages.asgiref: 2.1.5 -> 2.2.0 2018-03-10 14:55:00 +01:00
Lancelot SIX dadba1cce3 pythonPackages.asgi_redis: drop
This was part of django-channel-1.x. The current version (2) does not
use it anymore
2018-03-10 14:55:00 +01:00
Lancelot SIX 1347f90953 pythonPackages.asgi_ipc: drop
This wath used for django-channels-1.x. The current version (2) does
not use it anymore
2018-03-10 14:55:00 +01:00
Dominic Steinitz 2c71652550 sundials: init at 3.1.0 2018-03-10 12:48:26 +00:00
xeji b3d2a87b53 gtk-doc: add missing runtime dependency on six 2018-03-10 13:17:39 +01:00
Elis Hirwing 282778ccdd
anyjson: move to own directory 2018-03-10 13:17:00 +01:00
Frederik Rietdijk 865b21548f Revert "Merge pull request #36743 from xeji/gtkdoc"
This reverts commit bb38918fda, reversing
changes made to 83ee88e70f.

This change should go to staging instead.
2018-03-10 13:01:01 +01:00
Frederik Rietdijk bb38918fda
Merge pull request #36743 from xeji/gtkdoc
gtk-doc: add missing runtime dependency on six
2018-03-10 13:00:31 +01:00
Robin Gloster 83ee88e70f
rugged: fix build 2018-03-10 12:59:53 +01:00
Elis Hirwing 43935736f6
alot: move to own module 2018-03-10 12:57:55 +01:00
Robert Schütz 3387115364 pythonPackages.aiohttp: 3.0.1 -> 3.0.5 2018-03-10 12:50:04 +01:00
Frederik Rietdijk 2c406f6329 python.pkgs.odo: disable failing test 2018-03-10 12:36:27 +01:00
Frederik Rietdijk 5c1c6a3071 python.pkgs.datashape: disable several tests 2018-03-10 12:36:27 +01:00
Elis Hirwing b6fc08795e polib: move to own file and fix homepage 2018-03-10 12:13:17 +01:00
Frederik Rietdijk acff736e37
Merge pull request #36735 from etu/python-progressbar-fixes
progressbar: move to own file and fix homepage
2018-03-10 12:11:44 +01:00
Frederik Rietdijk 66949d24e4
Merge pull request #36733 from etu/publicsuffix-fixes
publicsuffix: move to own file and fix homepage
2018-03-10 12:11:05 +01:00
Elis Hirwing 605a373468
publicsuffix: move to own file and fix homepage 2018-03-10 12:07:11 +01:00
Frederik Rietdijk 82f0b244bc
Merge pull request #36731 from etu/pyjade-fixes
pyjade: move to own file and fix homepage
2018-03-10 12:06:11 +01:00
Elis Hirwing 6c55f5479d
progressbar: move to own file and fix homepage 2018-03-10 12:05:33 +01:00
Elis Hirwing 77330e18f4
pyjade: move to own file and fix homepage 2018-03-10 12:03:57 +01:00
Frederik Rietdijk fbea3ddd0c
Merge pull request #36732 from etu/pychart-fixes
pychart: move to own file
2018-03-10 12:02:32 +01:00
Jörg Thalheim 8ffe4912e2
Merge pull request #36736 from etu/python-proboscis-fixes
proboscis: move to own file and fix homepage
2018-03-10 11:00:32 +00:00
Elis Hirwing f1795e3957
pychart: move to own file
Also update website and download of source.
2018-03-10 12:00:12 +01:00
xeji 6fb73cc799 gtk-doc: add missing runtime dependency on six 2018-03-10 11:39:11 +01:00
Jörg Thalheim f8926fbcc9
Merge pull request #36709 from mpickering/patch-2
Add platforms attribute to umockdev
2018-03-10 09:55:34 +00:00
Peter Simons e7df73607e
Merge pull request #36724 from averelld/mongolite-fix
rPackages.mongolite: fix build
2018-03-10 10:08:31 +01:00
Peter Simons 668383c088 haskell-hackage-db: add override to fix build with GHC 8.4.1
Cc: @deepfire
2018-03-10 10:00:17 +01:00
Peter Simons 842a5c40f7 haskell: mark esqueleto and doctemplates as broken
Cc: @deepfire
2018-03-10 10:00:17 +01:00
Peter Simons 7011f3b66d haskell-tree-diff: add override to fix build with GHC 8.4.1
Cc: @deepfire
2018-03-10 10:00:17 +01:00
Peter Simons 7e040c8775 haskell-hslua-module-text: add override to fix build with GHC 8.4.1
Cc: @deepfire
2018-03-10 10:00:16 +01:00
Peter Simons 99fba9e335 haskell-HTTP and haddock-library: add overrides for ghc 8.4.1
Cc: @deepfire
2018-03-10 10:00:16 +01:00
Peter Simons 3724b07e2e haskell-blaze-builder: update overrides for ghc 8.4.1
The pull request we use does not suffice any longer because it does not update
the version constraint on base in the Cabal file.

Cc: @deepfire
2018-03-10 10:00:16 +01:00
Peter Simons b01a5ec506 haskell-regex-tdfa: update overrides for ghc 8.4.1
The pull request we use does not suffice any longer because it does not update
the version constraint on base in the Cabal file.

Generally speaking, it might be a good idea to use
https://github.com/ChrisKuklewicz/regex-tdfa/pull/16 instead of the old one,
because it looks much cleaner. (It might have the same problem w/r to base,
though).

Pinging our resident GHC 8.4.1 guru @deepfire.
2018-03-10 10:00:16 +01:00
Peter Simons ee262b83ef cabal2nix: fix overrides for Cabal 2.2.x 2018-03-10 10:00:16 +01:00
Peter Simons c5cf8dd57a haskell-hackage-db: fix build with GHC 8.2.2 2018-03-10 10:00:16 +01:00
Peter Simons 469a15d386 distribution-nixpkgs: fix build with GHC 8.2.2 2018-03-10 10:00:15 +01:00