JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,745 Commits 2 Branches 0 Tags 12 GiB
aabfda6d5d
Commit Graph

45579 Commits

Author SHA1 Message Date
Shea Levy
aabfda6d5d
Merge branch 'merge/master-to-staging-20180310' of git://github.com/oxij/nixpkgs into staging 2018-03-11 17:28:07 -04:00
Ryan Mulligan
55ff6caf5e p11-kit: 0.23.9 -> 0.23.10 
Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.23.10 with grep in /nix/store/ghdcsrmkzpszvhi5dvfcwmm8ysjhsmrq-p11-kit-0.23.10
- found 0.23.10 in filename of file in /nix/store/ghdcsrmkzpszvhi5dvfcwmm8ysjhsmrq-p11-kit-0.23.10
 2018-03-11 22:24:41 +01:00
Jan Malakhovski
7079e744d4 Merge branch 'master' into staging 
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
 2018-03-10 20:38:13 +00: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
xeji
b3d2a87b53 gtk-doc: add missing runtime dependency on six 2018-03-10 13:17:39 +01:00
xeji
4eec6bc9c9 gtk-doc: add missing runtime dependency on six 2018-03-10 13:02:10 +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
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
Peter Simons
deab46fdba Cabal-2.2.0.0: fix build with GHC 8.2.2 2018-03-10 10:00:15 +01:00
Peter Simons
8aa0e7b950 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.9-3-gae0d2f7 from Hackage revision
42026bde62.
 2018-03-10 10:00:06 +01:00
Peter Simons
3134f6bf97 hackage2nix: disable failing Hydra builds 2018-03-10 10:00:02 +01:00
Peter Simons
52383dbb6b hackage2nix: always use latest version of jailbreak-cabal 2018-03-10 10:00:02 +01:00
Elis Hirwing
b29348257a
proboscis: move to own file and fix homepage 2018-03-10 09:12:12 +01:00
Kosyrev Serge
a4fedaa481
ghc841 | turtle: GHC 8.4 needs a fresh Turtle 2018-03-10 06:51:58 +03:00
Kosyrev Serge
1aada58c2b
ghc841 | either: pin to v5 2018-03-10 06:37:35 +03:00
Averell Dalton
028e67abce rPackages.mongolite: fix build 2018-03-10 04:01:49 +01:00
Ryan Mulligan
3a40b899cf qpdf: 7.1.1 -> 8.0.0 
Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/788zbmljyhaj8y93k7q5lqpah0c9pcz0-qpdf-8.0.0/bin/fix-qdf --version` and found version 8.0.0
- ran `/nix/store/788zbmljyhaj8y93k7q5lqpah0c9pcz0-qpdf-8.0.0/bin/qpdf --help` got 0 exit code
- ran `/nix/store/788zbmljyhaj8y93k7q5lqpah0c9pcz0-qpdf-8.0.0/bin/qpdf --version` and found version 8.0.0
- found 8.0.0 with grep in /nix/store/788zbmljyhaj8y93k7q5lqpah0c9pcz0-qpdf-8.0.0
- found 8.0.0 in filename of file in /nix/store/788zbmljyhaj8y93k7q5lqpah0c9pcz0-qpdf-8.0.0
 2018-03-10 04:58:03 +03:00
Matthew Pickering
514accad2e
Add platforms attribute to umockdev 
See #36707 to observe that the build fails. It depends on linux specific packages such as systemd.
 2018-03-09 23:48:33 +00:00
Graham Christensen
21d85a5d0f
Merge pull request #36525 from ryantm/auto-update/gdcm 
gdcm: 2.6.4 -> 2.8.4
 2018-03-09 17:28:18 -05:00
Graham Christensen
9f2fd27748
Merge pull request #36549 from ryantm/auto-update/glpk 
glpk: 4.64 -> 4.65
 2018-03-09 17:26:06 -05:00