Commit Graph

49728 Commits

Author SHA1 Message Date
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
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
Peter Simons
7489a760d2
Merge pull request #42349 from ElvishJerricco/fix-hoogle-null-deps
Fix null deps in ghcWithHoogle
2018-06-22 12:21:01 +02:00
Peter Simons
5cb4cdfd39
Merge pull request #42268 from philandstuff/fix-dhall-json-1.2.0-deps
dhall-json_1_2_0: fix dependencies
2018-06-22 12:20:05 +02:00
John Ericson
e050011aa3
Merge pull request #42311 from obsidiansystems/haskell-enable-shared-defaults
haskell: make generic builder follow compiler’s shared config
2018-06-21 18:07:11 -04:00
Maximilian Bosch
4239726e0d
pythonPackages.thumbor: 6.4.2 -> 6.5.1
The current `thumbor` build on master: https://hydra.nixos.org/build/76000076

This is mainly caused by several dependency bumps (e.g.
`pythonPackages.tornado` to v5 in dd936ccdb9)
that broke the `setup.py` from version 6.4.

Bumping to the latest stable version (6.5.1) fixes these issues.
2018-06-22 00:01:32 +02:00
Will Fancher
dc7a91392e Fix null deps in ghcWithHoogle 2018-06-21 17:53:37 -04:00
Matthew Justin Bauer
ec2ea29716
Merge pull request #41855 from obsidiansystems/gradle-app
init androidenv.buildGradleApp
2018-06-21 17:45:23 -04:00
Daiderd Jordan
26434c0924
Merge pull request #42329 from goertzenator/erlang-21.0
add erlang-21.0
2018-06-21 22:44:11 +02:00
Matthew Bauer
2a0c328712 androidenv: add "androidsdk_latest" for latest sdk
This is easier than having to remember which SDKs are supported, etc.
Stuff based on this can become more future-proof.
2018-06-21 16:09:11 -04:00
Matthew Bauer
b72da4bee8 androidenv.buildGradleApp: refactor 2018-06-21 15:57:56 -04:00
Matthew Bauer
2e8feba171 androidenv: Use fetchzip instead of googlerepository 2018-06-21 12:12:31 -04:00
Daniel Goertzen
4001a680cc erlangR21: init at 21.0 2018-06-21 09:36:54 -05:00
adisbladis
3813d5dcec
Merge pull request #42328 from holidaycheck/nodejs-10.5.0
nodejs: 10.4.1 -> 10.5.0
2018-06-21 21:42:40 +08:00
Lancelot SIX
5fc06030f9
Merge pull request #42256 from r-ryantm/auto-update/gsl
gsl: 2.4 -> 2.5
2018-06-21 15:21:48 +02:00
Mathias Schreck
7e7f286fe6 nodejs: 10.4.1 -> 10.5.0 2018-06-21 15:03:53 +02:00
Peter Simons
624a9ff647
Merge pull request #42312 from obsidiansystems/fix-android-prebuilt-ghc
Fix Android-prebuilt ghc build
2018-06-21 10:15:56 +02:00
Jörg Thalheim
0f0c9a4f00
Merge pull request #42004 from r-ryantm/auto-update/libpfm
libpfm: 4.9.0 -> 4.10.0
2018-06-21 09:04:17 +01:00
Jörg Thalheim
0f94e4ba66
Merge pull request #42005 from r-ryantm/auto-update/libsixel
libsixel: 1.7.3 -> 1.8.1
2018-06-21 09:02:56 +01:00
Matthew Bauer
6572cb595c gmp: fix on android prebuilt 2018-06-20 22:04:08 -04:00
Matthew Bauer
9e4aebdd7b ghc8.4: add android triple
The triple is needed for armv7a-android-prebuilt to work (partly) with
GHC.

- also set EXTRA_CC_OPTS for ghc8.2
2018-06-20 22:03:59 -04:00
Matthew Justin Bauer
73fde65681
Merge pull request #41632 from voanhduy1512/add_leetcode-cli
leetcode-cli: init at 2.5.2
2018-06-20 21:46:16 -04:00
Matthew Bauer
fd7a6ea0af haskell: make generic builder follow compiler’s shared config
enableShared in generic-builder.nix should default to what the GHC
compiler was compiled with. Add a passthru to all of the GHC compilers
to hold the value of enableShared. If enableShared is not set in the
GHC we just use false as the default value for enableSharedLibraries.

Note: I may have missed some compilers. Only GHC & GHCJS are covered
by this commit but this shouldn’t break evaluation of anything else.
2018-06-20 18:40:53 -04:00
Jörg Thalheim
20a7c83a77
Merge pull request #42252 from r-ryantm/auto-update/lasso
lasso: 2.5.1 -> 2.6.0
2018-06-20 23:28:40 +01:00
Jörg Thalheim
0456edc275
Merge pull request #42258 from r-ryantm/auto-update/godot
godot: 3.0.2 -> 3.0.3
2018-06-20 23:24:51 +01:00
Jörg Thalheim
8b3b9e0804
Merge pull request #42277 from r-ryantm/auto-update/doclifter
doclifter: 2.17 -> 2.18
2018-06-20 22:42:00 +01:00
Jan Tojnar
173c749f31
sysprof: fix includedir in pc file 2018-06-20 23:01:22 +02:00
Daiderd Jordan
654960c1cd
Merge pull request #42290 from mnacamura/r-igraph-darwin
rPackages.igraph: fix Darwin build
2018-06-20 19:52:36 +02:00
Matthew Justin Bauer
d62db0bff0
Merge pull request #42289 from mnacamura/r-RcppEigen-darwin
rPackages.RcppEigen: fix Darwin build
2018-06-20 13:48:40 -04:00
Daiderd Jordan
94a926816e
fribidi: fix dylib install_name on darwin 2018-06-20 18:55:23 +02:00
Domen Kožar
7a7463d0a3
pipenv: 11.9.0 -> 2018.5.18 2018-06-20 17:31:37 +01:00
Jörg Thalheim
5b2dc32015
Merge pull request #42286 from r-ryantm/auto-update/brial
brial: 1.2.3 -> 1.2.4
2018-06-20 10:37:47 +01:00
R. RyanTM
ec93a51187 grails: 3.3.5 -> 3.3.6
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/grails/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/sp0w4frknlgjhmw18j8rsj5sgaf95zhm-grails-3.3.6/bin/grails had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 3.3.6 with grep in /nix/store/sp0w4frknlgjhmw18j8rsj5sgaf95zhm-grails-3.3.6
- directory tree listing: https://gist.github.com/8278e7c1c9d28a8983fdaf23975bb930
- du listing: https://gist.github.com/10a146e1e865583f68e892f13c310026
2018-06-20 11:02:05 +02:00
Jörg Thalheim
7afab16eba
Merge pull request #42254 from Moredread/platformio/bump
Platformio: 3.5.2 -> 3.5.3 and fix for click dependency
2018-06-20 09:58:57 +01:00
Mitsuhiro Nakamura
f972a30f16 rPackages.igraph: fix Darwin build 2018-06-20 11:08:29 +09:00