Commit Graph
99 Commits
Author SHA1 Message Date
Ivan Babrou 274ec21015 gsl: cap MACOSX_DEPLOYMENT_TARGET at 10.16 2021-05-20 09:19:32 -07:00
Ivan Babrou 24f13758b9 gtk2: cap MACOSX_DEPLOYMENT_TARGET at 10.16 2021-05-20 09:05:30 -07:00
Ivan Babrou 59579ed4fa python3Packages.dbus-python: cap MACOSX_DEPLOYMENT_TARGET at 10.16 2021-05-20 09:01:57 -07:00
Ivan Babrou 703579f722 python3Packages.cryptography: add missing libiconv build dependency on darwin
Fixing the following:

```
error: linking with `/nix/store/l3ca456ppdy8hi9hc0rvyr6mrm76si08-clang-wrapper-11.1.0/bin/cc` failed: exit code: 1
  = note: ld: library not found for -liconv
```
2021-05-19 11:37:32 -07:00
Ivan Babrou f9e6eb090e llvmPackages: default to llvmPackages_11 on aarch64-darwin
It doesn't make sense to use llvm7, which doesn't work on arm64.
2021-05-17 00:28:02 +09:00
Ivan Babrou 68733c16f5 darwin.apple_sdk.frameworks: add missing dependencies
```
/nix/store/5mgn511gbldf7xl5kjm27z9lj10xcycl-apple-framework-CoreData-11.0.0/Library/Frameworks/CoreData.framework/Headers/NSPersistentCloudKitContainerOptions.h:10:9: fatal error: 'CloudKit/CKDatabase.h' file not found
        ^~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
```

```
/nix/store/a7k7kqj08602785vsrss0xa85b08hik4-apple-framework-CloudKit-11.0.0/Library/Frameworks/CloudKit.framework/Headers/CKRecord.h:9:9: fatal error: 'CoreLocation/CLLocation.h' file not found
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
```
2021-05-17 00:27:04 +09:00
Ivan Babrou d0eff87f68 darwin.file_cmds: add missing Libinfo dependency
Fixing:

```
/private/tmp/nix-build-file_cmds-264.1.1-osx-10.11.6.drv-0/file_cmds-264.1.1/ls/print.c:56:10: fatal error: 'membershipPriv.h' file not found
         ^~~~~~~~~~~~~~~~~~
1 error generated.
```
2021-05-17 00:27:03 +09:00
Ivan Babrou 577bcf38f8 darwin.shell_cmds: add missing dependency on launchd 2021-05-17 00:27:03 +09:00
Ivan Babrou 6815776cb0 python3Packages.cryptography: ignore test_openssl_memleak.py on aarch64-darwin
The test fails due to dependency on W+X memory, which is forbidden as of 11.2.
2021-05-17 00:27:03 +09:00
Ivan Babrou da3ae0231a apple-source-releases: make it compile on aarch64 2021-05-17 00:27:03 +09:00
Ivan Babrou 2eb97f2ddd darwin.developer_cmds: wrap clang -E from clang-wrapped as clang-cpp 2021-05-17 00:27:03 +09:00
Ivan Babrou bac1418031 xcbuild: allow building arm64 binaries
File paths are copied from XCode 12.
2021-05-17 00:27:03 +09:00
Ivan Babrou 51f6036e41 python2: only pass -msse2 on x86_64-darwin, not any darwin 2021-05-14 09:15:03 -07:00
Ivan Babrou 07e4cbde16 autogen: fix compilation on aarch64-darwin 2021-05-13 19:08:47 -07:00
Ivan Babrou 4aa95e3312 gcc: native aarch64-darwin support 2021-05-10 19:07:30 -07:00
Ivan Babrou 99d0c004d1 gcc6, gcc7, gcc8, gcc9, gcc10, gcc11: do not modify code in prePatch
Doing any modifications before patching risks invalidating patch base.
2021-05-04 22:53:21 -07:00
Ivan Babrou 8cf144d139 gnat11: extract gnat-cflags-11.patch from gnat-cflags.patch 2021-05-04 20:14:01 -07:00
Ivan Babrou 6ba5ac89d2 gfortran11, gnat11: init at 11.1.0
I forgot to add it in #121115.
2021-05-04 18:26:33 -07:00
Ivan Babrou d75d0b9c62 gcc11: init at 11.0.0
Pretty much copy-pasted from gcc10 with changed version and sha256.
2021-04-29 22:05:32 -07:00
Ivan Babrou af8164fba2 python3Packages.trustme: skip disallowed w+x test on aarch64-darwin 2021-04-10 17:19:36 -07:00
Ivan Babrou 66d1da7e00 pythonPackages.ptyprocess: fix stuck tests on darwin (#118948) 2021-04-10 00:00:03 -04:00
Ivan Babrou 300c240afa clickhouse-cli: init at 0.3.7 2021-04-08 19:01:57 -07:00
Ivan Babrou 021d18ee39 cloudflared: 2021.2.1 -> 2021.3.3 2021-03-25 17:32:48 -07:00
Ivan Babrou 2cf3641a5c rustc: update llvm on darwin to current
We downgraded when LLVM 10 wasn't working well on Darwin: #101136.
Now that we're using LLVM 11, the issue is no longer present.
2021-03-20 06:12:48 +10:00
Ivan Babrou 12238b08ef pythonPackages.pylint: fix build on darwin
The test no longer exists after #112908:

```
Disabled tests path "pylint/test/test_functional.py" does not exist. Aborting
```
2021-03-18 19:55:20 -07:00
Ivan Babrou d4d14bd4b6 liblapack: disable select tests on all darwin platforms (#116779) 2021-03-18 16:34:50 -04:00
Ivan Babrou 06c5ea2a14 liblapack: disable failing tests on darwin
Tests were enabled in #113021 and staging is broken since then.
2021-03-18 20:27:14 +01:00
Ivan Babrou 6c2c725485 openblas: aarch64-darwin target support (#116672) 2021-03-18 02:05:05 -04:00
Ivan Babrou c31077a602 pythonPackages.lxml: fix build on darwin 2021-03-18 00:49:23 +00:00
Ivan Babrou a730703e6f darwin.binutils: use clang for as on aarch64-darwin (#115167)
Without this change `as` on `aarch64-darwin` is defunct:

```
$ /nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/bin/as -v
/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/bin/as: assembler (/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/arm64/as or /nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/arm64/as) for architecture arm64 not installed
Installed assemblers are:
/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/ppc64/as for architecture ppc64
/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/x86_64/as for architecture x86_64
/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/ppc/as for architecture ppc
/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/i386/as for architecture i386
/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/arm/as for architecture arm
```

Apple defaults to Clang in all cases from what I see, but nixpkgs prefers `cctools`: #51881.
2021-03-17 00:27:34 -04:00
Ivan Babrou d4b7278fbd python3Packages.py-cpuinfo: add sysctl to runtime dependencies 2021-03-05 21:27:50 -08:00
Ivan Babrou 223126456c python3Packages.py-cpuinfo: fix another aarch64-darwin test 2021-03-05 17:49:41 -08:00
Ivan Babrou 81aa7a1344 erlangR23, erlangR22, erlangR21: remove obsolete substituteInPlace 2021-03-03 17:20:07 -08:00
Ivan Babrou b00c7c2d1d python37, python2: remove win64 workaround to fix aarch64-darwin
The issue manifests itself as the following on `aarch64-darwin`:

```
>>> import ctypes
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/nix/store/i8cq0xrjirz1rcp65wzcyhj6ypzlw9il-python3-3.7.10/lib/python3.7/ctypes/__init__.py", line 551, in <module>
    _reset_cache()
  File "/nix/store/i8cq0xrjirz1rcp65wzcyhj6ypzlw9il-python3-3.7.10/lib/python3.7/ctypes/__init__.py", line 273, in _reset_cache
    CFUNCTYPE(c_int)(lambda: None)
MemoryError
```

The commit we backport is included in Python 3.8, and it reverts
the change that was introduced all the way back in Python 2.7.
2021-03-03 16:02:07 -08:00
Ivan Babrou 4aff0e523a pinentry_mac: make it compile on arm64 2021-03-03 19:23:49 +00:00
Ivan Babrou 015ce9d3b6 python3Packages.curio: fix another flaky test 2021-03-02 18:14:51 -08:00
Ivan Babrou fbc1d07e79 aws-c-io: depend on Security.framework on darwin
This is needed on `aarch64-darwin` with newer SDK.
2021-03-01 23:57:37 -08:00
Ivan Babrou 2f00f46269 cryptopp: run configure.sh before make
This prevents failure on `aarch64-darwin`.
2021-03-01 08:20:32 -08:00
Ivan Babrou b6fa405edd python3Packages.gssapi: 1.6.10 -> 1.6.12 2021-02-28 15:15:41 -08:00
Ivan Babrou e96c9b30fa erlang: add missing WebKit framework on darwin
Fixing the following error:

```
 LD     ../priv/x86_64-apple-darwin20.3.0/wxe_driver.so
ld: file not found: /System/Library/Frameworks/WebKit.framework/Versions/A/WebKit for architecture x86_64
clang-7: error: linker command failed with exit code 1 (use -v to see invocation)
```
2021-02-28 11:58:25 -08:00
Ivan Babrou d85965dcf5 llvmPackages_11.libcxx: backport block.h fix from llvm12
As a concrete example, this fixes graphviz compilation:

* https://gitlab.com/graphviz/graphviz/-/issues/1785
2021-02-28 10:19:14 -08:00
Ivan Babrou a026ea9856 erlang: add missing AGL framework for aarch64-darwin
Preventing this:

```
 LD     ../priv/aarch64-apple-darwin20.3.0/wxe_driver.so
ld: file not found: /System/Library/Frameworks/AGL.framework/Versions/A/AGL for architecture arm64
clang-11: error: linker command failed with exit code 1 (use -v to see invocation)
make[3]: *** [Makefile:176: ../priv/aarch64-apple-darwin20.3.0/wxe_driver.so] Error 1
```
2021-02-28 17:40:00 +00:00
Ivan Babrou 7993fc70af erlangR21: 21.3.8.3 -> 21.3.8.21 2021-02-28 17:40:00 +00:00
Ivan Babrou 025f1c4c87 erlangR22: 22.3 -> 22.3.4.16 2021-02-28 17:40:00 +00:00
Ivan Babrou 428ff5779a erlangR23: 23.1.4 -> 23.2.6 2021-02-28 17:40:00 +00:00
Ivan Babrou d191f2278d python3Packages.grpcio: remove cctools from build inputs
This fixes `aarch64-darwin` build in #105026. Without this the `strip` in `PATH`
is the one from `darwin.cctools`, which doesn't preserve code signatures,
resulting in code that cannot run and pass `pythonImportsCheckPhase`.

The dependency on cctools was introduced in #44902 in 2018,
but it doesn't seem to be necessary on `x86_64-darwin` today.
2021-02-28 16:37:49 +00:00
Ivan Babrou 5ce1b566dc python38Packages.py-cpuinfo: aarch64-darwin support 2021-02-27 23:37:51 -08:00
Ivan Babrou 20dba8a982 rst2html5: fix download now that it is a wheel
Fixing up #105489.
2021-02-27 10:30:42 -08:00
Ivan Babrou 83d3f74bab python3Packages.watchdog: fix flaky test on macOS 2021-02-27 10:27:34 -08:00
Ivan Babrou 2e1a7b94f3 ocamlPackages.ocaml: fix assembler detection for aarch64-darwin 2021-02-27 10:43:14 +01:00
Ivan Babrou afbb72faef perl530: backport aarch64-darwin patch
This was originally in #105026, but then 5.30.1 happened with
this change included, so there were conflict and the patch
got dropped. Let's introduce it separately for only one version
that still needs it.
2021-02-26 20:46:09 -08:00
Ivan Babrou 86702daaf2 ocamlPackages.ocaml: 4.10.0 -> 4.10.2 2021-02-26 20:27:13 -08:00
Ivan Babrou 59f21b70a9 soxr: add patch to fix aarch64-darwin compilation 2021-02-26 14:51:08 -08:00
Ivan Babrou ef13a2129b libglvnd: disable asm on aarch64-darwin
libglvnd itself doesn't know about `aarch64-darwin`, so it tries
to use assembly that is not supported by mach-o, failing as a result.
2021-02-26 09:45:13 -08:00
Ivan Babrou f78f6cd339 llvmPackages_11.openmp: make it compile on aarch64-darwin 2021-02-26 09:24:00 -08:00
Ivan Babrou a422684c87 cargo-deb: do not expect glibc dependency to be added
The test was introduced in v1.25.0:

* https://github.com/mmstick/cargo-deb/commit/3597cf28e
2021-02-24 23:41:29 -08:00
Ivan Babrou ba4c0bf16f aws-c-common: fix build on clang 11 2021-02-24 23:32:52 -08:00
Ivan Babrou 0ae422a4f2 cargo-deb: 1.24.0 -> 1.29.1 2021-02-24 19:42:04 -08:00
Ivan Babrou 9cd5107391 cargo-deb: run tests in release profile
The `checkType` attribute does not apply after #113193,
and since we're changing tests anyway, let's run them
in the release mode to avoid the need for `checkType`.

This fixes the otherwise broken build.
2021-02-24 19:42:00 -08:00
Ivan Babrou 62e729bf88 python3Packages.curio: fix flaky test due to slow moving time 2021-02-24 12:31:24 -08:00
Ivan Babrou b4976c28fa python3Packages.parso: fix flaky test due to slow moving time 2021-02-24 18:14:15 +00:00
Ivan Babrou 5269ed23f2 cmake: remove obsolete substituteInPlace (#113843)
This `substituteInPlace` was introduced in 2016 when cmake was at v3.4:

* https://github.com/NixOS/nixpkgs/commit/5286c0aebb

In 2018 cmake v3.12.0 changed the code to make it not match anything:

* https://github.com/Kitware/CMake/commit/50b5e9ed13

```
substituteStream(): WARNING: pattern '${PYTHON_EXECUTABLE}' doesn't match anything in file 'Modules/FindCxxTest.cmake'
```

Having it around in 2021 with cmake v3.19.3 doesn't help,
and tests are disabled anyway.
2021-02-21 22:29:45 -05:00
Ivan Babrou dd54d77845 libgcrypt: disable asm on aarch64-darwin
See: https://dev.gnupg.org/T5157
2021-02-20 14:57:31 -08:00
Ivan Babrou 7b63dbf9d3 bzip2: 1.0.6.0.1 -> 1.0.6.0.2 2021-02-20 11:07:22 -08:00
Ivan Babrou 5363f1714b mesa: fix missing timespec_get on aarch64-darwin
This doesn't affect any other target.

See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1020
2021-02-20 10:03:52 -08:00
Ivan Babrou c62662c962 garble: fix aarch64 build 2021-02-20 21:13:46 +10:00
Ivan Babrou 7e2baa21b5 garble: pin to go1.15 2021-02-20 21:13:46 +10:00
Ivan Babrou 3a3721c585 pythonPackages.dask-gateway-server: use GO111MODULE=off to build on go1.16 2021-02-20 08:09:42 +10:00
Ivan Babrou d8da3220c0 oauth2_proxy: pin to go 1.15 2021-02-20 08:09:42 +10:00
Ivan Babrou 99f4524c5f coyim: pin to go 1.15 2021-02-20 08:09:42 +10:00
Ivan Babrou 8fd0bb4db3 step-ca: pin to go 1.15 2021-02-20 08:09:42 +10:00
Ivan Babrou 9433fde4fe grafana-loki: pin to go 1.15 2021-02-20 08:09:42 +10:00
Ivan Babrou 31fe7ad887 trillian: pin to go 1.15 2021-02-20 08:09:42 +10:00
Ivan Babrou c5b7370de2 nncp: pin to go 1.15 2021-02-20 08:09:42 +10:00
Ivan Babrou f2d233cde6 ibus-engines.bamboo: pin to go 1.15 2021-02-20 08:09:42 +10:00
Ivan Babrou 0551dc7798 galene: pin to go 1.15 2021-02-20 08:09:42 +10:00
Ivan Babrou 6fff56280f go: do not strip bootstrap on darwin 2021-02-20 08:09:42 +10:00
Ivan Babrou cf69b3e801 go: use binary bootstrap for all platforms
This mirrors what Rust does and allows us to drop go1.4 from the process.
2021-02-20 08:09:42 +10:00
Ivan Babrou f26b6bb75b universal-ctags: bump to p5.9.20210124.0 from git tags (#111216) 2021-02-17 21:12:47 +01:00
Ivan Babrou a9e51112e8 boringssl: fix aarch64-linux build 2021-02-17 00:08:56 -08:00
Ivan Babrou 368ed8fb3d go_1_14, go_1_15, go_2-dev: do not override stdenv if it is not gcc (#112248)
This doesn't do anything for existing packages, but it helps #105026,
since `aarch64-darwin` doesn't have a working gcc today.
2021-02-15 10:19:15 -08:00
Ivan Babrou 9a858b6305 cargo-whatfeatures: init at 0.9.6 2021-02-14 11:50:21 -08:00
Ivan Babrou 52756df546 nodejs: remove util-linux from build inputs
These were introduced with nodejs itself back in 2016: 822abc49ad.
Removing `util-linux` from build inputs doesn't break the builds,
so there's no reason to keep them.
2021-02-13 11:21:52 -08:00
Ivan Babrou e99678639d libaom: only disable cpu detectio on arm64 and do it as recommended
Having `OFF` instead of `0` makes x86_64 build unhappy.
2021-02-11 23:31:03 -08:00
Ivan Babrou aaf5c54afd libaom: disable runtime cpu detection on darwin (#112685)
CPU detection is only enabled for PPC and ARM. It's also not implemented
on Darwin, so no reason to keep it enabled there. This helps #105026.
2021-02-11 18:36:43 +01:00
Ivan Babrou 4492265eb8 libpcap: disable universal build for libpcap on darwin
This allows building libpcap on top of #105026.
2021-02-11 02:41:06 +00:00
Ivan Babrou 631aeb11cf pythonPackages.protobuf: remove no longer useful NIX_CFLAGS_COMPILE
* It builds fine on `x86_64-darwin`
* It allows builds on `aarch64-darwin` (#105026)
* There are no Python versions older than 2.7
2021-02-09 23:03:15 -08:00
Ivan Babrou edd386ea7f haproxy: use default clang
It's been nearly two years and it builds fine for me on clang11.
2021-02-09 22:02:25 -08:00
Ivan Babrou 251add14cf qemu: only apply autoPatchelfHook on linux
It fails on darwin due to missing `patchelf` and the missing ELFs:

```
/nix/store/...-auto-patchelf-hook/nix-support/setup-hook: line 220: -l: command not found
```
2021-02-08 13:48:16 -08:00
Ivan Babrou d29e8f0e59 qemu: rename VERSION to QEMU_VERSION to avoid name clash
In libc++ starting with LLVM8 there's `<version>` include in `cstddef`:

The following things also align:

* QEMU has a file called `VERSION` in repo root
* QEMU prepends repo root to include path in build
* macOS has a case-insensetive filesystem

All of this combined means that `VERSION` file is included as a header.

Working around this be renaming `VERSION` -> `QEMU_VERSION` to resolve ambiguity.

The problem really only appears on `aarch64-darwin`, since on `x86_64-darwin`
there are no C++ files to compile. The workaround is harmless enough to apply.
2021-02-08 13:45:47 -08:00
Ivan Babrou bb475b01d2 qemu: do not force x86_64 cpu on darwin
This change produces the following warning:

```
... configure: line 619: sysctl: command not found
```

It's benign and sysctl is only useful on MacOS X Leopard:

* https://github.com/qemu/qemu/blob/v5.2.0/configure#L615-L621

Leopard is 13 years old and is not supported by Nix.

The sysctl check is removed in qemu master branch already.

Plus aarch64-darwin is coming in #105026, so there's no reason to force x86_64.
2021-02-08 13:39:10 -08:00
Ivan Babrou b2ce768e60 libxslt: make python3 an input 2021-02-01 08:47:36 +01:00
Ivan Babrou 86de9261f8 libxslt: use python3 on darwin
See #63174 where the condition was first introduced.
2021-02-01 08:47:36 +01:00
Ivan Babrou a7f0bf7916 mc: move dependency pruning from post to pre fixup
See: https://github.com/NixOS/nixpkgs/pull/105026#issuecomment-751163086
2021-01-23 14:20:31 -08:00
Ivan Babrou aea19f284a docker: correct substitution path with buildx enabled
Starting with Docker 20.10, the client repo moved and the path changed.
2021-01-22 13:43:30 -08:00
Ivan Babrou deb0d298a2 docker: add buildx support to docker client 2021-01-21 12:52:46 -08:00
Ivan Babrou e431ff7e2e docker-buildx: init at 0.5.1
Installing docker-buildx enables buildx subcommand on the client:

* https://github.com/docker/buildx
2021-01-21 12:52:45 -08:00
Ivan Babrou 6e2bc82e72 maintainers: add ivan-babrou 2021-01-21 12:52:09 -08:00
Ivan Babrou 47f4eb0d66 gnutls: remove autogen from build dependencies
There's an error when compiling autogen on macos Big Sur with #105026,
and it compiles fine without autogen, so I see no reason to keep it.

The dependency on autogen was originally introduced in 31a128b32b,
but unfortunately there's no explanation for the reason and no linked issue.
2021-01-20 07:36:45 +00:00