Commit Graph

56274 Commits

Author SHA1 Message Date
Matthew Bauer
73951bc0c8
Merge pull request #50293 from matthewbauer/cleanups2
Add setup-hooks for scons and waf
2018-11-13 19:17:00 -06:00
Matthew Bauer
bfbfe941ab treewide: use scons setup hook
Lots of packages can use it. Here is the list:

- jackmix
- klick
- mixx
- nova-filters
- rhvoice
- giv
- mypaint
- swift-im
- bombono
- mapnik
- serf
- nuitka
- pyexiv2
- godot
- hammer
- toluapp
- btanks
- dxx-rebirth
- endless-sky
- globulation
- the-powder-toy
- fceux
- gpsd
- mongodb
- rippled
- mariadb
- lprof
2018-11-13 19:14:10 -06:00
Matthew Bauer
1ba9fd335d scons: add setup hook
The scons build system is python-based and has a binary named scons. Unlike CMake, it cannot generate makefiles so we end up having to override the build, install, and check phases. I have added the setupHook to the scons package so that integration requires no unique steps - just putting scons in nativeBuildInputs should be enough. sconsFlags controls the flags specifically passed to scons while buildFlags, installFlags, and checkFlags should still be usable. Some packages use different names for the prefix flag. In those cases you will have to set "prefixKey" to something like "PREFIX=" as there are multiple names for the "prefix" used in scons.
2018-11-13 19:13:50 -06:00
Matthew Bauer
f2a20b6e52 treewide: use wafHook
Replace "waf" phases with wafHook that manages everything
automatically. Should make things more modular.

Packages affected here are:

- a2jmidid
- ams-lv2
- ardour
- fomp
- guitarix
- ingen
- jalv
- mda-lv2
- non
- patchage
- hamster-time-tracker
- kupfer
- xiphos
- xfce4-dockbarx-plugin
- xfce4-namebar-plugin
- dropbox
- clasp
- aubio
- liliv
- lv2
- lvtk
- ntk
- raul
- sratom
- suil
- ganv
- ndn-cxx
- ns3
- serd
- sord
- termbox
- wxmupen64plus
- jackaudio
- pflask
- blockhash
- glmark2
- weighttp
2018-11-13 19:13:48 -06:00
Matthew Bauer
92ebfa1383 wafHook: init
The waf build system is python-based and hosted locally in each package in the executable file named "waf". Unlike CMake, it cannot generate makefiles so we end up having to override the configure, build, and install phases. I've tried to keep these as close to what's in setup.sh as possible. If there is no waf file in the root directory, then we just copy the one hosted in Nixpkgs. Otherwise the only thing you have to add to a package using Waf is "wafHook" into nativeBuildInputs. wafFlags controls the flags specifically passed to waf while configureFlags, buildFlags, and installFlags are still used as in the generic builder.
2018-11-13 19:13:13 -06:00
Frederik Rietdijk
daf3297cb4 Merge master into staging-next 2018-11-12 18:59:08 +01:00
Frederik Rietdijk
917400bcff Revert "Python: reduce amount of warnings when building with buildPython*"
Turns out that many packages' testsuites rely on the default warnings setup.

This reverts commit c1e003ff2f.
2018-11-12 18:55:50 +01:00
Jörg Thalheim
968b20e2c7
Merge pull request #50276 from corngood/android-emulator-fix
androidsdk: fix emulator
2018-11-12 17:48:56 +00:00
Théo Zimmermann
208aedb971 ocamlPackages.*: remove unnecessary unpackCmd 2018-11-12 17:25:18 +00:00
Clemens Fruhwirth
b4d9f6ddca androidsdk: Re-add emulator that was broken out of the sdk-tools package. 2018-11-12 13:06:22 -04:00
Peter Simons
632fc6ba61 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1-4-g8927afe from Hackage revision
1fba236a8a.
2018-11-12 16:25:41 +01:00
Peter Simons
bcab3daac7 LTS Haskell 12.18 2018-11-12 16:25:40 +01:00
Robert Schütz
b9494ac352
Merge pull request #50166 from dotlambda/home-assistant-0.82
home-assistant: 0.81.5 -> 0.82.0
2018-11-12 11:37:06 +01:00
Robert Schütz
e58c5024f0 openzwave: 2018-04-04 -> 2018-11-04
Switch to Home Assistant's source
(https://github.com/home-assistant/open-zwave/tree/hass)
because openzwave is only used in combination with Home Assistant afaik.
2018-11-12 11:19:15 +01:00
Jörg Thalheim
92c478babd
Merge pull request #50176 from Mic92/docker-componse
docker-compose: rename from docker_compose, python3 by default
2018-11-12 10:14:53 +00:00
Robert Schütz
92148ea5a0 python3.pkgs.homeassistant-pyozw: init at 0.1.0 2018-11-12 11:10:12 +01:00
Chris Ostrouchov
484a5c6152 pythonPackages.ruamel_yaml: refactor move to python-modules 2018-11-12 11:10:02 +01:00
Samuel Dionne-Riel
242282d92d
Merge pull request #47887 from mmlb/python-dpath
pythonPackages.dpath: init at 1.4.2
2018-11-12 03:51:56 +00:00
Samuel Dionne-Riel
d746c53e2e
Merge pull request #46845 from Twey/plyplus
python2Packages.plyplus: init at 0.7.5
2018-11-12 03:31:26 +00:00
John Ericson
c94ccfd81e
Merge pull request #50223 from ryan4729/go-cross-compile
go: make compiler usable for cross compiles
2018-11-11 18:31:44 -05:00
Samuel Dionne-Riel
9997a3dc16
Merge pull request #43686 from Pneumaticat/rdocker-init
rdocker: init at unstable-2018-07-17
2018-11-11 22:42:04 +00:00
ryan4729
b46f5e1277 go: organize GOARCH and GOOS 2018-11-11 14:37:12 -08:00
Thomas Tuegel
b529b81be3
Merge pull request #50207 from Thra11/qtwebglplugin
qtwebglplugin: init at 5.11
2018-11-11 13:51:29 -06:00
Edward Tjörnhammar
1de9c8a023
catch: 1.12.0 -> 1.12.2 2018-11-11 17:55:36 +01:00
Jason Hilton
7759fe1f22
catch2: init at 2.4.2 2018-11-11 17:55:31 +01:00
Silvan Mosberger
921b63134a
Merge pull request #50215 from volth/patch-285
gnum4: set platforms=all; it works on Windows
2018-11-11 14:55:26 +01:00
Jörg Thalheim
7a86bc32cb
docker-compose: rename from docker_compose, python3 by default
The command is called docker-compose hence the package should be called the same.
Also prefer python3.
2018-11-11 11:16:44 +00:00
Niklas Thörne
0a7d20ece5 uftrace: 0.9 -> 0.9.1 (#50228) 2018-11-11 12:15:06 +01:00
Robert Schütz
879789666f python.pkgs.py3status: 3.13 -> 3.14 2018-11-11 11:01:10 +01:00
Sebastien Maret
880fae6a08 matplotlib: 2.2.3 -> 3.0.2
Python 3 will use the new matplotlib 3.x while Python 2
will use 2.x.

matplotlib: keep 2.2.3 for Python2k
2018-11-11 10:14:25 +01:00
Frederik Rietdijk
961180afc8 scour: call via python-packages.nix 2018-11-11 09:54:28 +01:00
Frederik Rietdijk
02bf0e5896 python: autopep8: 1.3.5 -> 1.4.2 2018-11-11 09:48:24 +01:00
Franz Pletz
ae3e9b5a27 python27: add patch to fix CVE-2018-1000802 2018-11-11 09:00:31 +01:00
Frederik Rietdijk
7863aae5b2 Merge master into staging-next 2018-11-11 08:59:44 +01:00
Frederik Rietdijk
ed8400bb9a pythonPackages.cryptography: ignore pytest warnings
The test suite was generating a lot of warnings, causing the hydra build
to fail. Unfortunately, PYTHONWARNINGS env var is completely ignored.
2018-11-11 08:55:35 +01:00
Maximilian Bosch
3c4f70996e s/propogatedBuildInputs/propagatedBuildInputs 2018-11-11 08:39:19 +01:00
Jethro Kuan
0a82eb4377 change to propogatedBuildInputs 2018-11-11 08:39:19 +01:00
Jethro Kuan
3723b2d8ab remove absl-py, change to buildInputs 2018-11-11 08:39:19 +01:00
Jethro Kuan
5165ecb7f6 remove tests
PyPI archive does not contain tests
2018-11-11 08:39:19 +01:00
Jethro Kuan
c98731b8fa don't propogate tensorflow 2018-11-11 08:39:19 +01:00
Jethro Kuan
2b4a70d21e remove withTensorflow option 2018-11-11 08:39:19 +01:00
Maximilian Bosch
32d8215a58 fix eval 2018-11-11 08:39:19 +01:00
Jethro Kuan
78e557806e add option to build without Tensorflow 2018-11-11 08:39:19 +01:00
Jethro Kuan
f11cd8165d fix maintainer 2018-11-11 08:39:19 +01:00
Jethro Kuan
baeb8bd5a7 gin-config: init 2018-11-11 08:39:19 +01:00
ryan4729
5302222337 go: make compiler usable for cross compiles 2018-11-10 22:41:46 -08:00
Orivej Desh
b3e2a48453 SDL_sound: enable on Darwin 2018-11-11 02:42:33 +00:00
Jan Tojnar
3bf5411996
Merge pull request #50171 from r-ryantm/auto-update/appstream-glib
appstream-glib: 0.7.13 -> 0.7.14
2018-11-11 02:59:45 +01:00
volth
31beea9818
gnum4: set platforms=unix++windows 2018-11-11 01:42:40 +00:00
Silvan Mosberger
87377a259d
Merge pull request #49960 from r-ryantm/auto-update/python3.6-texttable
python36Packages.texttable: 1.4.0 -> 1.5.0
2018-11-11 02:23:02 +01:00