Commit Graph
100 Commits
Author SHA1 Message Date
Matthew Bauer 173a5408d2 Merge pull request #65319 from nicknovitski/fix-darwin-ngrok
ngrok: fix build on darwin
2019-07-25 09:54:43 -04:00
Matthew Bauer 6ff7c2ca93 Merge pull request #65049 from matthewbauer/zmq-enable-drafts
zmq: enable drafts api
2019-07-25 09:54:00 -04:00
Matthew Bauer 3b8e595810 zmq: add enableDrafts option
This is needed by emacs-zmq, and will be used by it.
2019-07-24 16:12:40 -04:00
Matthew Bauer 6399cdbe9c Merge pull request #64612 from NixOS/add-emacs-zmq
emacs: add zmq package
2019-07-17 17:12:41 -04:00
Matthew Bauer 2255f29206 Merge pull request #64901 from dgchurchill/emacs-imagemagick-macos
emacs: Also allow imagemagick dependency when using withNS
2019-07-17 10:07:01 -04:00
Matthew Bauer 99c04c74cf Merge pull request #63581 from PsyanticY/zabbix-4.0
zabbix:1.8 -> 4.0 | remove old packages
2019-07-11 15:05:05 -04:00
Matthew Bauer 7fc87a4cbd emacs: add zmq package
This builds emacs-zmq.so automatically.

Fixes #59774
2019-07-10 22:13:26 -04:00
Matthew Bauer 87ec2627b0 Merge pull request #62870 from ambrop72/nvidia-icd-absolute
nvidia-x11: Put absolute library paths into ICD config files.
2019-07-10 17:37:00 -04:00
Matthew Bauer d059185bad Revert "Revert "systems/doubles.nix: add Apple doubles""
This reverts commit ce2f74df2c.

Doubles are treated as -darwin here, to provide some consistency.
There is some ambiguity between “x86_64-darwin” and “i686-darwin”
which could refer to binaries linked between iOS simulator or real
macOS binaries. useiOSPrebuilt can be used to determine which to use,
however.
2019-07-10 15:14:59 -04:00
Matthew Bauer 5c8472a2a1 mesa: fix darwin and use meson auto features (PR #63912)
This fixes the darwin build, while also using Meson’s auto features as
much as possible. As a result, we avoid using having to specify
default drivers and instead delegate that to Mesa’s build system.
Removed other flags that were specified to the default in Mesa.

The -fno-common is needed to address undefined symbol _lp_dummy_tile
in the build.
2019-07-09 14:51:41 +02:00
Matthew Bauer 00ba557856 systems/doubles.nix: add Apple doubles
These are used in cross-compilation to iOS devices and simulators.

Fallout from #60349.
2019-07-08 12:33:16 -04:00
Matthew Bauer c3991a8c08 Merge pull request #64415 from jabranham/emacs-site-start
emacs: Silence compiler warnings in site-start.el
2019-07-08 12:18:38 -04:00
Matthew Bauer d505283766 Merge pull request #64233 from solson/wla-dx-9.8
wla-dx: git-2017-06-05 -> 9.8
2019-07-03 11:58:22 -04:00
Matthew Bauer e7572af2ec emacs-irony: Remove server directory
This contains the build files and is not needed for irony-server.
Previously, the wrong directory was removed, adding elpa/ gets thje
correct one.
2019-07-01 13:37:22 -04:00
Matthew Bauer eea33299ff Merge pull request #64027 from ehamberg/fix-postgres-ext-dirs
Install postgresql extensions under `$out/share/postgresql`
2019-07-01 11:54:10 -04:00
Matthew Bauer f496357585 cc-wrapper: use -iframework instead of -F
This avoids dumping -Wall warnings when they appear in framework
headers. As a result, we are closer to how regular headers are
included (via -isystem).

Also remove ccIncludeFlag lookup, this was unused & not very useful.
2019-06-28 16:27:27 -04:00
Matthew Bauer 24fea40d92 Merge pull request #56261 from eadwu/mesa/extract-stubs
mesa: extract stubs
2019-06-26 17:00:52 -04:00
Matthew Bauer 525f0b0436 Merge pull request #62869 from ambrop72/vulkan-loader-search-path
vulkan-loader: Always include /run/opengl-driver(-32)/share in search path.
2019-06-26 13:21:10 -04:00
Matthew Bauer f9b7348283 Merge pull request #63166 from ambrop72/libelf-fix
libelf: Add patch to prevent -Wundef warnings.
2019-06-23 22:00:44 -04:00
Matthew Bauer b24d5e48b9 Merge pull request #63695 from arcnmx/python-hidapi-darwin
pythonPackages.hidapi: enable on darwin
2019-06-23 21:48:00 -04:00
Matthew Bauer 500c13ed46 Merge pull request #63609 from tokudan/udev-executable-check
udev: change error message if RUN entry is not executable
2019-06-23 21:43:31 -04:00
Matthew Bauer dc5e4cfa3c Merge pull request #63595 from romildo/upd.wxgtk
wxGTK31: 3.1.0 -> 3.1.2; use a real derivation
2019-06-23 21:43:05 -04:00
Matthew Bauer 778bd7a1a1 Merge pull request #63638 from oxij/pkgs/revert-amdsdk-removal
Revert "Remove amdadlsdk and amdappsdk."
2019-06-23 21:42:30 -04:00
Matthew Bauer 3726505510 Merge pull request #63670 from arcnmx/acpilight-build-fix
acpilight: fix build error
2019-06-23 21:41:51 -04:00
Matthew Bauer e49729f9b1 Merge pull request #63707 from matthewbauer/fix-63043
Qt5 + Darwin fixes
2019-06-23 20:37:54 -04:00
Matthew Bauer 8768d1c83a nixos: add hardware/network/intel-2200bg.nix to module-list
this is referenced by nixos-generate-config.pl. See
https://github.com/NixOS/nixpkgs/pull/63091 for more discussion.
2019-06-23 20:30:27 -04:00
Matthew Bauer 758712c6f4 qt5: make qt512 the default on darwin 2019-06-23 18:31:20 -04:00
Matthew Bauer 4c3e09b022 qt5.12: patch to work on x86_64-darwin
unfortunately, some private headers making the logging hard to handle.
Specifically, os/activity.h that is included does not match what Qt5
is expected. This removes the activity logging (while keeping the
other logging methods) on macOS.

Fixes #63528
2019-06-23 18:29:04 -04:00
Matthew Bauer 4e22fe4f63 apple-sdk: add MetalKit 2019-06-23 18:28:36 -04:00
Matthew Bauer 79c0e740a7 qttools: patch qmlimportscanner for darwin builds
This needs to be the full path for qtmacdeploy to work. We add
${qt5.qttools.dev}/bin/qmlimportscanner as the default.

Fixes #63093
2019-06-22 22:21:38 -04:00
Matthew Bauer 1f46aaab1b buildGoPackage: keep string context (#63680)
In Nix, each string has a context that it carries of where it
originated. Some functions like filterAttrs modify the context of its
args when doing comparisons. That is important because we use the
string context of “name” to get where a derivation was defined. This
causes some builtins like unsafeGetAttrPos to report incorrectly that
the string was set in lib/attrsets.nix and reporting that as the
source file. Using removeAttrs avoids this problem.

Fixes #63679
2019-06-22 19:07:26 -07:00
Matthew Bauer 9d9b98cdfb Merge pull request #62891 from jtojnar/nixos-documentation-nixos-help-use-w3m-1-by-default
nixos/documentation: nixos-help: use w3m(1) by default
2019-06-22 21:37:22 -04:00
Matthew Bauer 4d9a4aa3f1 openbsm: don’t check for /usr/include/mach/audit_triggers.defs
Users with CLT installed in /usr/include have this, but it we don’t
have all of the headers needed in the stdenv.

Fixes #46429
2019-06-22 12:06:47 -04:00
Matthew Bauer 987ec8aed4 Merge pull request #63627 from LnL7/darwin-gstreamer
gstreamer: fix darwin build
2019-06-21 15:09:56 -04:00
Matthew Bauer a33837391a gstreamer: don’t use libvisual
Fixes #63617
2019-06-21 11:29:11 -04:00
Matthew Bauer 5662977e35 Merge pull request #62164 from benley/benley/org-packages
orgPackages:  2018-12-30 -> 2019-05-27
2019-06-20 15:33:34 -04:00
Matthew Bauer 2b8ea614b8 Merge pull request #63090 from NixOS/nomodeset
kernel.nix: boot.vesa implies nomodeset
2019-06-20 15:31:17 -04:00
Matthew Bauer 04e6a1bb9b Merge pull request #63081 from caadar/master
Improve ZFS Bash completions user expirience
2019-06-20 15:29:03 -04:00
Matthew Bauer 808d6fc7de Merge pull request #63087 from matthiasbeyer/fix-ddclient-extraconfig
Fix ddclient extraConfig
2019-06-20 15:28:04 -04:00
Matthew Bauer 3d86336dca Merge pull request #63584 from volth/patch-344
fix ofborg evaluations broken in #63113
2019-06-20 15:07:08 -04:00
Matthew Bauer 38f426787f emacsPackages.irony: add clang for Linux builds
libclang is needed as a library here. Adding it to fix building on
Linux. This worked on macOS because clang is already provided.
2019-06-19 13:27:08 -04:00
Matthew Bauer c08cdfa781 Merge pull request #54543 from thefloweringash/git-prefetch-errors
nix-prefetch-git: propagate errors under --quiet
2019-06-18 11:20:28 -04:00
Matthew Bauer 4d6f65b81f Merge pull request #62167 from matthewbauer/alias-libgl
Add libGL* aliases
2019-06-17 15:18:29 -04:00
Matthew Bauer 263f5891b6 treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesa
Just use mesa for these to be more clear. Move these to aliases.nix
2019-06-17 14:43:18 -04:00
Matthew Bauer f7e2bb8cff mesa: rename from mesa-noglu to mesa 2019-06-17 11:49:27 -04:00
Matthew Bauer f0733a07d5 treewide: remove libGLSupported from pkgs
This isn’t a package, and we already have mesaPlatforms to handle this logic.
2019-06-17 11:49:22 -04:00
Matthew Bauer 486626bd70 Merge pull request #62934 from lilyball/macvim
macvim: 7.4.909 -> 8.1.1517
2019-06-16 15:04:02 -04:00
Matthew Bauer 4d5c1c8136 Merge pull request #62971 from lilyball/bundlerApp-passthru
bundlerApp: Set up passthru properly
2019-06-16 15:03:10 -04:00
Matthew Bauer a9c4486931 Merge pull request #63047 from marsam/fix-zfs
zfs: fix install completions
2019-06-12 19:39:34 -04:00
Matthew Bauer 262baf0977 Merge pull request #62995 from rasendubi/emacs-packages-2019-06-06
melpa-stable-packages: remove unstable packages
2019-06-11 22:14:27 -04:00
Matthew Bauer 21edffefc3 Merge pull request #62992 from eraserhd/plan9port-enable-darwin-x11
plan9port: build everything on Darwin
2019-06-11 19:35:22 -04:00
Matthew Bauer dba9208407 Merge pull request #62684 from bdesham/trash-0.9.2
trash: 0.9.1 -> 0.9.2
2019-06-11 19:32:55 -04:00
Matthew Bauer 4e74a13fcb Merge pull request #62894 from womfoo/fix/llvm_7-skip-x86-tests-on-armv7l
llvm_7: skip failing X86 test cases on armv7l
2019-06-11 17:45:44 -04:00
Matthew Bauer 288eb1485b Merge pull request #62900 from thefloweringash/mysql55-clang6
mysql55: fix build under clang 6 (and newer)
2019-06-11 17:45:12 -04:00
Matthew Bauer c51d8d97b0 Merge pull request #62896 from womfoo/fix/orc-skip-tests-on-armv7l
orc: disable tests on armv7l
2019-06-11 17:34:15 -04:00
Matthew Bauer 82dd4e03e4 Merge pull request #56131 from mbrock/master
ipad_charge: enable installation udev rules
2019-06-10 23:24:24 -04:00
Matthew Bauer c3de4e83d9 Merge pull request #62877 from matthewbauer/irony-server-custom-install
emacs-irony: prebuild irony-server executable
2019-06-10 22:43:21 -04:00
Matthew Bauer 72e67bd6ba emacs-irony: prebuild irony-server executable
This has melpaBuild compile the irony-server executable automatically.
This means each user of the irony executable doesn’t have to wait for
it to compile on each new use. This depends on this PR to work
correctly:

https://github.com/Sarcasm/irony-mode/pull/537
2019-06-10 22:39:27 -04:00
Matthew Bauer dd125a10ab Merge pull request #53821 from eadwu/linux_rpi/allow-modDirVersion-override
linux_rpi: allow modDirVersion override
2019-06-10 21:40:36 -04:00
Matthew Bauer 4e5c9b8cf4 Merge pull request #54921 from grabango/master
Use nativeBuildInputs for building Docker images
2019-06-10 21:38:47 -04:00
Matthew Bauer ebd038dc2d Merge pull request #56161 from coreyoconnor/appimage-run-xcbutil
appimage build-support: add xorg.xcbutil*
2019-06-10 21:37:15 -04:00
Matthew Bauer 123d61c5e6 Merge pull request #58037 from Twey/neocomp-2019-03-12
neocomp: init at 2019-03-12
2019-06-10 21:33:55 -04:00
Matthew Bauer fc04ec9274 Merge pull request #58063 from illegalprime/nss-cross
nss: cross compile support
2019-06-10 21:33:19 -04:00
Matthew Bauer d641d2b741 Merge pull request #58941 from cyounkins/rdesktop-darwin
rdesktop: enable darwin support without libgssglue and credssp
2019-06-10 21:31:53 -04:00
Matthew Bauer 62aa4f8136 Merge pull request #59702 from thefloweringash/darwin-rcs
rcs: fix darwin build
2019-06-10 21:31:30 -04:00
Matthew Bauer 3db2fc56ff Merge pull request #59795 from jacereda/samba-darwin
samba: fix darwin build
2019-06-10 21:30:59 -04:00
Matthew Bauer 02698c4a61 Merge pull request #59803 from volth/patch-316
nixos/netboot: import -> callPackage
2019-06-10 21:30:23 -04:00
Matthew Bauer 66658d5674 Merge pull request #62464 from r-ryantm/auto-update/libobjc2
gnustep.libobjc: 1.9 -> 2.0
2019-06-10 21:26:16 -04:00
Matthew Bauer 049884ba12 Merge pull request #62941 from woffs/openvpn-url
openvpn: fix static key mini howto url
2019-06-10 21:24:53 -04:00
Matthew Bauer 290737edf0 Merge pull request #57103 from natemonster321/master
pcsx2: add -DXDG_STD build flag
2019-06-10 21:20:57 -04:00
Matthew Bauer b6db1b9edf Merge pull request #62878 from marsam/mirrors-rename-sourceforgejp-to-osdn
mirrors: rename sourceforgejp to osdn
2019-06-10 11:39:15 -04:00
Matthew Bauer 80b51d983a gdb: patch to use mach-o.h instead of bfd/mach-o.h
For unclear reasons, this doesn’t seem to work anymore. bfd/mach-o.h
is not accessible but mach-o.h is.

https://hydra.nixos.org/build/94542582
2019-06-09 23:56:08 -04:00
Matthew Bauer 8ca59e0a39 Merge pull request #62740 from risicle/ris-spglib-assert-fix
pythonPackages.spglib: add patch fixing darwin/py27 build
2019-06-09 17:56:41 -04:00
Matthew Bauer a592a9053d Merge pull request #62784 from rasendubi/emacs-packages-2019-06-06
Emacs packages update: 2019-06-06
2019-06-09 17:56:10 -04:00
Matthew Bauer b22fa4e091 Merge pull request #62842 from lopsided98/lkl-cross
lkl: fix cross
2019-06-09 17:49:57 -04:00
Matthew Bauer 70de27bbb4 Merge pull request #61668 from minijackson/jellyfin-skia
jellyfin: add bundled libraries to LD_LIBRARY_PATH
2019-06-08 12:02:42 -04:00
Matthew Bauer b0053ae92e Merge pull request #62836 from veprbl/pr/gpgme_darwin_fix
gpgme: disable tests on darwin
2019-06-07 17:42:00 -04:00
Matthew Bauer cb385daf95 gdb: remove applied patch for darwin
This patch is no longer needed. The commit was included in this
release.

https://hydra.nixos.org/build/94447561
2019-06-07 15:52:14 -04:00
Matthew Bauer 8bb03d3891 metrics: don’t output nix output for qaDrv*
These have a hug log that will hit “log limit exceeded” on Hydra. This
commit skips the biggest offenders - qaDrv and qaDrvAggresive, giving
smaller logs.

https://hydra.nixos.org/build/94487387
2019-06-07 15:52:10 -04:00
Matthew Bauer 48ba8a4fb5 ghc: add bash to buildInputs
Fixes #62417.
Closes #62553.
2019-06-07 10:07:39 +02:00
Matthew Bauer 73679b51f4 Merge pull request #62777 from thefloweringash/mariadb-clang
mariadb: fix clang and darwin build
2019-06-06 12:04:09 -04:00
Matthew Bauer d598eca41e Merge pull request #62752 from matthewbauer/darwin-fixes100
Fixes for x86_64-darwin failures on Hydra
2019-06-06 09:46:41 -04:00
Matthew Bauer 9a0ced7e45 opencv: disable QTKit backend
QTKit was removed in macOS 10.12
2019-06-06 01:00:40 -04:00
Matthew Bauer eb189808c4 python-cld2-cffi: don’t error on c++11-narrowing 2019-06-06 00:33:23 -04:00
Matthew Bauer 0c3b7ea547 postgresql: disable tests on darwin
reported in https://www.postgresql.org/message-id/4D8E1BC5-BBCF-4B19-8226-359201EA8305%40gmail.com
2019-06-06 00:18:38 -04:00
Matthew Bauer 402b717de7 openimageio1: mark broken on x86_64-darwin
https://hydra.nixos.org/build/93723034
2019-06-05 23:48:09 -04:00
Matthew Bauer 50998c8475 opencv2: only works on linux
https://hydra.nixos.org/build/94234038
2019-06-05 23:45:27 -04:00
Matthew Bauer 1f22e71439 ksh: add libiconv dependency 2019-06-05 23:43:37 -04:00
Matthew Bauer 441485af66 iv: only use patchelf on linux 2019-06-05 23:42:58 -04:00
Matthew Bauer e0a33f36fd slop: mark linux only
https://hydra.nixos.org/build/94247171
2019-06-05 23:04:19 -04:00
Matthew Bauer a04bbae81c l-smash: use gccStdenv 2019-06-05 23:03:40 -04:00
Matthew Bauer a74150e66e libgssglue: mark linux only
https://hydra.nixos.org/build/94203083
2019-06-05 22:57:51 -04:00
Matthew Bauer f2a33b8709 libdc1394: remove patch
applied in newer version
2019-06-05 22:55:15 -04:00
Matthew Bauer a430a5c963 libtommatch: fix substituteInPlace
var name was changed
2019-06-05 22:54:38 -04:00
Matthew Bauer 9edd196312 fsv: only works on linux
https://hydra.nixos.org/build/94218493
2019-06-05 22:54:08 -04:00
Matthew Bauer 8633a12224 kconfig-frontends: don’t error on security warning
needed for clang 7
2019-06-05 22:52:58 -04:00
Matthew Bauer 641a59ab6d mysql55: broken on darwin
https://hydra.nixos.org/build/94204716
2019-06-05 22:52:04 -04:00
Matthew Bauer 87a69edf67 Merge pull request #60559 from JohnAZoidberg/patchshebangs-multiple-args
patchShebangs: Allow multiple args
2019-06-05 20:36:12 -04:00
Matthew Bauer e44fdaa9c2 Merge pull request #62715 from matthewbauer/darwin-gl
Darwin GL Experiments
2019-06-05 20:30:48 -04:00
Matthew Bauer f8c12edfdf Merge pull request #62333 from kampka/buildPackages-for-config-builders
Build packages for config builders
2019-06-05 14:47:16 -04:00