Commit Graph

159523 Commits

Author SHA1 Message Date
Matthew Bauer
b6fce7201e xboxdrv: add dontUseSconsInstall flag
xboxdrv doesn’t use scons for installing, but instead using a
makefile! Everything else is in scons so we have to keep that. I’ve
added a dontUseSconsInstall flag to the scons setup-hook to skip the
automatic overwrite of default “make install” call.
2018-11-14 13:57:41 -06:00
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
83d02fad5f wxmupen64plus: fix with fpermissive
This flag seems to make things work again.
2018-11-13 19:15:26 -06:00
Matthew Bauer
06c403e846 treewide: remove unstable packages
There’s nothing wrong with unstable packages when they are maintained
and frequently updated. However, when they become out-of-date, as many
do, it is usually best to just get rid of them as the stable version
is become newer than the unstable version. This removes any packages
called "unstable" that have not been updated in over 1 year. Affected
packages include:

- isyncUnstable
- sxhkd-unstable
- dosbox-unstable

Revert "treewide: remove unstable packages"

This reverts commit df01b0b37a04624cfe6f8d2ccb42b99289841b68.
2018-11-13 19:14:44 -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 c1e003ff2f8a43189d48b7194ec8556aa3d88641.
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
lewo
9e4456ce49
Merge pull request #49414 from nlewo/pr/buildImageWithNixDb
dockerTools.buildImageWithNixDb: simplifications and switch to closure info
2018-11-12 18:33:21 +01:00
Antoine Eiche
c12f75649e dockerTools.buildImageWithNixDb: simplifications and switch to closureInfo
Since Nix 2 is now the stable Nix version, we can use closureInfo
which simplifies the Nix database initialisation (size and hash are
included in the "dump").
2018-11-12 18:30:53 +01: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
Matthew Bauer
3ec657ab0c
Merge pull request #50275 from Ekleog/fix-syntax-error
nixos-build-vms: fix syntax error
2018-11-12 10:15:01 -06:00
Léo Gaspard
27a5427526
nixos-build-vms: fix syntax error
Introduced by 6c68fbd4e1
2018-11-13 00:40:07 +09:00
Peter Simons
1b35b1c73a all-cabal-hashes: update to Hackage at 2018-11-12T01:24:24Z 2018-11-12 16:25:46 +01: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
aszlig
12d7f9a640
nixos/tests/networking: Fix syntax error
Introduced by 6c68fbd4e1f8beac39cb1f499ff90c78256262d6.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Ekleog
2018-11-12 16:18:58 +01:00
aszlig
2ea5e68b24
ip2unix: 1.1.1 -> 1.2.0
Upstream changes:

  - Fixed: Don't fail when building the manual with AsciiDoc and xmllint.
  - Fixed: Some long options (--rule, --rules-file and --rules-data) were
           ignored.
  - Fixed: Manpage formatting is now more consistent.
  - Added: A new --version command line argument for showing version
           information.

With the new upstream release recommending to use AsciiDoc to generate
the manpage, I also switched to AsciiDoc instead of Asciidoctor. The
resulting manpage looks better in some ways (for example when definition
lists are used).

I also added an installCheckPhase to ensure that the manpage exists in
the resulting store path.

Signed-off-by: aszlig <aszlig@nix.build>
2018-11-12 15:45:23 +01:00
Linus Heckemann
362ac95d64
Merge pull request #50265 from romildo/upd.matcha
matcha: 2018-10-30 -> 2018-11-12
2018-11-12 15:44:32 +01:00
aszlig
a815f53c60
libredirect: Add preload wrapper for stat()
Pull request #50246 was merged a bit too quickly and it was supposed to
fix libredirect on Darwin. However it still failed on Darwin and this
was missed by the person merging the pull request.

The reason this was failing was that there is no __xstat* on Darwin.

So I'm adding a wrapper for stat() as well as it works on Darwin and it
still doesn't hurt on GNU/Linux.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra, @zimbatm
2018-11-12 13:31:43 +01:00
Peter Simons
22a802584f
Merge pull request #50179 from Thra11/r-without-jdk
R: Remove jdk dependency on aarch32/64
2018-11-12 12:42:39 +01:00
Gabriel Ebner
adb5b610bd
Merge pull request #50022 from Ekleog/opensmtpd-extras-6.4.0
opensmtpd-extras: 5.7.1 -> 6.4.0
2018-11-12 12:30:21 +01:00
José Romildo Malaquias
114581b05e matcha: 2018-10-30 -> 2018-11-12 2018-11-12 09:24:29 -02:00
Eelco Dolstra
f7d5b76e03
Merge pull request #50246 from aszlig/libredirect-darwin
libredirect: Add support for Darwin
2018-11-12 12:21:38 +01:00
Sarah Brofeldt
7cedee3c79
Merge pull request #50261 from lsix/nano_3_2
nano: 3.1 -> 3.2
2018-11-12 11:49:51 +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
dbceff85b9 home-assistant: 0.81.5 -> 0.82.0 2018-11-12 11:21:41 +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
Robert Schütz
b230ad0e29 python.pkgs.protobuf3_1: drop
Using the specific version of protobuf can be achieved by a simple
`python.pkgs.protobuf.override { protobuf = protobuf3_1; }`.
2018-11-12 11:10:02 +01:00
aszlig
34dd1c68f8
libredirect: Add a small test
This is just a sanity check on whether the library correctly wraps the
syscalls and it's using the "true" executable for posix_spawn() and
execv().

The installCheckPhase is not executed if we are cross-compiling, so this
shouldn't break cross-compilation.

One thing I'm not actually sure is whether ${coreutils}/bin/true is
universally available on all the platforms, nor whether all the
functions we use in the test are available, but we can still fix that
after we've found out about that.

Signed-off-by: aszlig <aszlig@nix.build>
2018-11-12 11:02:54 +01:00
Lancelot SIX
6c3b9c359d
nano: 3.1 -> 3.2
See http://lists.gnu.org/archive/html/info-gnu/2018-11/msg00008.html for
release information
2018-11-12 10:28:20 +01:00
aszlig
ba1fddb315
libredirect: Use extensions.sharedLibrary
This is to make sure we get the correct shared library suffix of the
target platform. While for example on Darwin it would even work with the
hardcoded .so prefix it's IMHO a bit nicer to have the actual native
extension.

Signed-off-by: aszlig <aszlig@nix.build>
2018-11-12 10:08:02 +01:00
Samuel Dionne-Riel
49df3150c7
Merge pull request #49451 from fgaz/sfxr-qt/init
sfxr-qt: init at 1.2.0
2018-11-12 04:21:40 +00: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
63399aea74
Merge pull request #50252 from fuerbringer/diskus
diskus: init at 0.4.0
2018-11-12 03:42:07 +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
Tim Steinbach
55cad35506
linux: 4.20-rc1 -> 4.20-rc2 2018-11-11 22:08:16 -05:00
John Ericson
df9334b646
Merge pull request #50233 from Ekleog/fix-test-system
Fix meta.tests system
2018-11-11 19:05:13 -05: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
fuerbringer
fa4aa79892
diskus: init at 0.4.0 2018-11-12 00:16:59 +01:00
zimbatm
9ef52352bd
assume that it works on all unix platforms 2018-11-12 00:09:36 +01:00
zimbatm
d76ec523bb
use for cross-compilation 2018-11-12 00:08:18 +01: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