Commit Graph

50073 Commits

Author SHA1 Message Date
Frederik Rietdijk
4df1161ea4
Merge pull request #42367 from Assassinkin/monty
pythonPackages.monty: init at 1.0.2
2018-06-23 18:05:04 +02:00
Frederik Rietdijk
43520486c7
Merge pull request #42345 from Ma27/fix-python-git-annex-adapter
python3Packages.git-annex-adapter: fix build
2018-06-23 18:04:39 +02:00
Averell Dalton
06932b25f3 Revert "python: jupyterlab_launcher: 0.10.5 -> 0.11.0"
This reverts commit a4404adbcb.
2018-06-23 17:52:31 +02:00
Frederik Rietdijk
1106d872ae
Merge pull request #42421 from bandresen/python-periphery
pythonPackages.python-periphery: init at 1.1.1
2018-06-23 13:53:29 +02:00
Benjamin Andresen
1dcee7a162 pythonPackages.python-periphery: init at 1.1.1 2018-06-23 13:18:20 +02:00
Frederik Rietdijk
59daa4fd62 python.pkgs.aiohttp: fix build 2018-06-23 12:02:20 +02:00
Frederik Rietdijk
46b7f6bdfd python.pkgs.pandas: fix build 2018-06-23 11:48:06 +02:00
Frederik Rietdijk
95eb2fa40e Merge staging into master 2018-06-23 08:23:24 +02:00
Matthew Justin Bauer
9c0ebbe7a3
Merge pull request #42405 from worldofpeace/patch-3
libtorrentRasterbar: fix build with boost167
2018-06-22 20:26:42 -04:00
Matthew Justin Bauer
a006243b8d
Merge pull request #41732 from Infinisil/overrideDerivation
some overrideDerivation cleanups
2018-06-22 20:07:48 -04:00
Matthew Bauer
37aab4cbb5 android: more output size reduction
This should bring us finally under the 2G max. llvm directory was
missing from my last commit.
2018-06-22 19:06:11 -04:00
worldofpeace
dfa078951f
libtorrentRasterbar: fix build with boost167 2018-06-22 18:15:20 -04:00
Matthew Bauer
e1e9b197f9 android: fix from last output size reduction
Directories weren’t being removed properly.
2018-06-22 17:49:28 -04:00
John Ericson
bbef861e0f
Merge pull request #42397 from obsidiansystems/more-android-fixes
androidndk: cleanups
2018-06-22 17:17:53 -04:00
Matthew Bauer
7b49d3b335 androidndk: fix eval 2018-06-22 16:51:22 -04:00
Matthew Bauer
054656a2fc androidndk: reduce output sizw
Fixes #41704
2018-06-22 16:48:26 -04:00
Matthew Bauer
a7fc8ad140 androidndk: use unzip
This is a free version and preferred to 7zip.
2018-06-22 16:41:08 -04:00
Matthew Bauer
e5d262e1cc androidndk: fixup 2018-06-22 16:32:05 -04:00
Matthew Justin Bauer
6c17928d52
Merge pull request #42378 from obsidiansystems/fix-android32
androidndk: Fix version selection
2018-06-22 14:50:14 -04:00
Frederik Rietdijk
b7487779e1
Merge pull request #42350 from Ma27/fix-py-thumbor
pythonPackages.thumbor: 6.4.2 -> 6.5.1
2018-06-22 18:12:03 +02:00
Peter Simons
5c80983e75 haskell-generic-builder: bake the package name and version into --docdir
If we use a --docdir that's not specific to the package, then different builds
will install their license files into the same location, which leads to file
collisions if those are ever joined into the same environment.

Fixes https://github.com/NixOS/nixpkgs/issues/35024.
2018-06-22 17:50:11 +02:00
Peter Simons
1486fee1d3 haskell-Cabal: drop obsolete override to fix Setup dependencies
This is now handled by cabal2nix:

 - 7ccbd668d1.
 - https://github.com/NixOS/nixpkgs/pull/41939
2018-06-22 17:50:11 +02:00
Peter Simons
e0d34cfeca haskell-streaming-commons: disable randomly failing test suite 2018-06-22 17:50:11 +02:00
Peter Simons
d94d27c2dd hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-23-g7ccbd66 from Hackage revision
c9934e673b.
2018-06-22 17:50:11 +02:00
Peter Simons
503e5c3f27 hackage2nix: boolector has an unfree license 2018-06-22 17:50:10 +02:00
Peter Simons
2bd8148b95 LTS Haskell 11.14 2018-06-22 17:50:10 +02:00
Matthew Bauer
c8fd285c8d android: add ndkVer to resolve ndk ambiguity
It wasn’t exactly clear which NDK you were using previously. This adds
an attribute to system that handles what version of the NDK we should
use when building things.

/cc @Ericson2314
2018-06-22 11:06:17 -04:00
Assassinkin
e84a8bf83d pythonPackages.monty: Add a short description 2018-06-22 14:46:51 +01:00
Matthew Bauer
cf09ffe9aa android: Use NDK 17 for aarch32 2018-06-22 09:33:25 -04:00
Peter Simons
f13f2434d0
Revert "Fix null deps in ghcWithHoogle" 2018-06-22 14:21:44 +02:00
Assassinkin
0fe77afcaf pythonPackages.monty: init at 1.0.2 2018-06-22 12:54:26 +01:00
Frederik Rietdijk
48110c1295 Merge staging into master 2018-06-22 13:20:37 +02:00
Frederik Rietdijk
d12fc7abcb python.pkgs.portend: fix build 2018-06-22 13:09:51 +02:00
Frederik Rietdijk
e00ddc62b2 python.pkgs.rlp: mark as broken 2018-06-22 13:09:51 +02:00
Frederik Rietdijk
9e10e51161 conan: fix build 2018-06-22 13:09:51 +02:00
Frederik Rietdijk
6816117ace python.pkgs.beancount: fix build 2018-06-22 13:09:50 +02:00
Frederik Rietdijk
fbd30cb768 aws-sam-cli: fix build 2018-06-22 13:09:50 +02:00
Frederik Rietdijk
617806e913 python.pkgs.notebook: fix build 2018-06-22 13:09:50 +02:00
Frederik Rietdijk
07753e8875 python.pkgs.sqlalchemy: fix build 2018-06-22 13:09:50 +02:00
Frederik Rietdijk
cb5bf262cd python.pkgs.netcdf4: fix build 2018-06-22 13:09:50 +02:00
Frederik Rietdijk
25e5b37c23 python.pkgs.cftime: init at 1.0.0 2018-06-22 13:09:50 +02:00
Frederik Rietdijk
5b49e13f02 python.pkgs.pip-tools: fix build 2018-06-22 13:09:49 +02:00
Frederik Rietdijk
303787e6f8 python.pkgs.gunicorn: fix build 2018-06-22 13:09:49 +02:00
Frederik Rietdijk
363910dc7f python.pkgs.pyowm: fix build 2018-06-22 13:09:49 +02:00
Frederik Rietdijk
751c9328e6 python.pkgs.py4j: 0.10.6 -> 0.10.7 2018-06-22 13:09:49 +02:00
Robert Schütz
8216e6fa0d python.pkgs.dateutil_1_5: remove 2018-06-22 13:09:49 +02:00
Robert Schütz
49cb112d99 python.pkgs.django-haystack: 2.4.1 -> 2.8.1 2018-06-22 13:09:48 +02:00
Robert Schütz
61a051cbaa python.pkgs.pysolr: 3.3.3 -> 3.7.0 2018-06-22 13:09:48 +02:00
Robert Schütz
6896911117 python.pkgs.pysolr: move expression 2018-06-22 13:09:48 +02:00
Robert Schütz
95ce1c4e12 python.pkgs.django-haystack: move expression 2018-06-22 13:09:48 +02:00