Commit graph

144199 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
Frederik Rietdijk
509eb612b3
Merge pull request #42442 from averelld/fix-jupyterlab-build
Revert "python: jupyterlab_launcher: 0.10.5 -> 0.11.0"
2018-06-23 17:56:27 +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
Will Dietz
19ef534fbb
Merge pull request #41762 from tilpner/appimage-run
appimage-run: init
2018-06-23 07:23:08 -05:00
Pasquale
cdd5b90b02 home-manager:2017-12-7 -> 2018-06-14 2018-06-23 13:59:18 +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
Frederik Rietdijk
14b28269b3 octoprint: fix build 2018-06-23 13:45:09 +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
bb79a46357 freecad: fix build 2018-06-23 11:02:41 +02:00
Okina Matara
794c91b49e dolphinEmuMaster: 20180618 -> 2018-06-22 2018-06-23 01:48:52 -07:00
Okina Matara
25d4708c95 dolphinEmuMaster: Add option-dependent desktop file 2018-06-23 01:48:52 -07:00
Okina Matara
e4a32f980b dolphinEmuMaster: 20180609 -> 20180618 2018-06-23 01:48:52 -07:00
Cray Elliott
950d667b3d phpPackages.composer: 1.6.3 -> 1.6.5 2018-06-23 01:48:27 -07: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
Tim Steinbach
2624f90796
Merge pull request #42376 from dtzWill/update/git-2.18.0
git: 2.17.1 -> 2.18.0
2018-06-23 00:00:13 +00: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
5ac6ab091a
Merge pull request #42389 from tobiasBora/master
imapnotify: added in all-packages.nix
2018-06-22 15:25:11 -04:00
Leo Colisson
4509fdba3f imapnotify: inherit inside all-packages 2018-06-22 21:24:31 +02:00
Michael Weiss
f0520361a1 androidStudioPackages.{beta,dev,canary}: 3.2.0.17 -> 3.2.0.18 2018-06-22 20:58:10 +02: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
Leo Colisson
94bfc2cdc3 imapnotify: added in all-packages.nix 2018-06-22 20:22:21 +02:00
Jan Tojnar
876598a2dd
Merge pull request #42373 from symphorien/gnirehtet
gnirehtet: init at 2.2.1
2018-06-22 19:49:23 +02:00
Symphorien Gibol
f5307941cc gnirehtet: init at 2.2.1 2018-06-22 19:21:23 +02: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
Will Dietz
26f24fe09a git: indicate when last tested to "still" fail, for checking updates 2018-06-22 10:10:20 -05: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
Will Dietz
1190af39b9 git: disable failing completion test as well 2018-06-22 10:02:57 -05:00
Will Dietz
4136cb5ba9 git: disable "editor with a space" tests due to fails
Need to investigate.
2018-06-22 10:00:42 -05:00
Will Dietz
e65e6cad23 git: disable working-tree-encoding tests on musl
Makes assumptions about BOM.
2018-06-22 09:56:20 -05:00
Will Dietz
5f27396e8f git: remove symlinks-in-bin patch 2018-06-22 09:15:54 -05:00
Will Dietz
18231121f4 git: 2.17.1 -> 2.18.0 2018-06-22 09:12:06 -05:00
adisbladis
25ee8e0f70
firefox-devedition-bin: 62.0b1 -> 62.0b2 2018-06-22 22:05:26 +08:00