Commit Graph
100 Commits
Author SHA1 Message Date
Matthew Bauer 761f95efa6 Merge pull request #123431 from r-ryantm/auto-update/cog
cog: 0.8.0 -> 0.8.1
2021-05-18 22:45:14 -05:00
Matthew Bauer 3e7034abb9 darwin/xcode: provide libc++ from XCode toolchain
We could use our own libc++ here, but it is probably best to use the
provided one to ensure consistency. This fixes some C++ programs when
running aarch64-apple-ios-clang++.
2021-05-17 00:27:02 +09:00
Matthew Bauer a6753d0c42 lib/systems: add aarch64-darwin to mesaPlatforms 2021-05-17 00:27:02 +09:00
Matthew Bauer 33b59b8940 flake.nix: add aarch64-darwin 2021-05-17 00:27:02 +09:00
Matthew Bauer 8b51a45a55 Merge pull request #116099 from matthewbauer/fix-aws-sdk-cpp-on-big-sur-2
aws-sdk-cpp: propagate Security framework
2021-05-04 22:31:30 -05:00
Matthew Bauer fbb26ab536 shadow: add runtime-shell.patch
This gets the right shell in the closure.

By default, shadow wants to pull in the bash we are building it with,
while we would prefer it used the runtime bash.
2021-04-11 02:42:53 +02:00
Matthew Bauer 6255468c4e aws-sdk-cpp: propagate Security framework
We need to propagate the Security framework to avoid getting

ld: file not found: /System/Library/Frameworks/Security.framework/Versions/A/Security for architecture x86_64

on linking aws-sdk-cpp libraries.
2021-03-12 14:46:20 -06:00
Matthew Bauer c168e05c7e Merge pull request #86239 from tathougies/patch-2
[nixos/prometheus] promTypes.filter.value -> promTypes.filter.values
2021-02-26 19:28:18 -06:00
Matthew Bauer 91fe7257d3 Merge pull request #112421 from sternenseemann/fetchcvs-fix-missing-env
fetchcvs: fix ssh wrapper failing due to missing /usr/bin/env
2021-02-08 16:05:22 -06:00
Matthew Bauer 048e0d3f87 Merge pull request #108518 from 4z3/env-vars
stdenv: mute errors when failing to write env-vars
2021-01-30 18:37:10 -06:00
Matthew Bauer 58d07b1711 Merge pull request #111106 from r-burns/hydra-ppc64le-cross
release-cross: add ppc64le, ppc64le-musl
2021-01-29 22:22:40 -06:00
Matthew Bauer 6307346fd9 Merge pull request #98858 from sorki/cross/rpifw
raspberrypi-builder: allow passing firmware package as argument
2021-01-29 10:21:32 -06:00
Matthew Bauer e8338c9c1d Merge pull request #110739 from matthewbauer/fix-binfmt-nix-sandbox
nixos/binfmt: add bash to sandboxPaths
2021-01-25 11:53:27 -06:00
Matthew Bauer 35bd8f1153 nixos/binfmt: add bash to sandboxPaths
bash is needed to run the new binfmt shell script.

Fixes #110540
2021-01-24 22:47:59 -06:00
Matthew Bauer c0d053ea0e Revert "webkitgtk: enable WPE_RENDERER"
This reverts commit 132f7e6cfe.
2021-01-24 22:21:40 -06:00
Matthew Bauer 84408a6ad0 Merge pull request #100687 from spease/add-newer-xcode-hashes
darwin: update xcode versions
2021-01-23 20:04:50 -06:00
Matthew Bauer afc2edc3ee Merge pull request #108060 from matthewbauer/strip-musl-gcc
gcc: allow stripping gcc libraries
2021-01-21 19:31:26 -06:00
Matthew Bauer 4bdcddf9aa gcc: allow stripping gcc libraries
When cross compiling to the same kernel / arch combination, it is safe
to use strip of libraries. This happens when cross-compiling musl
programs. dontStrip is now set in each gcc compiler instead of in
gcc/builder.sh.

Fixes #75476
2021-01-21 16:25:48 -06:00
Matthew Bauer 77403c1c19 Merge pull request #96140 from matthewbauer/add-cog
Init cog at 0.6.0
2021-01-20 17:42:54 -06:00
Matthew Bauer 914de3a3ca cog: init at 0.6.0 2021-01-20 16:54:49 -06:00
Matthew Bauer 132f7e6cfe webkitgtk: enable WPE_RENDERER 2021-01-20 16:54:48 -06:00
Matthew Bauer b2eb8992c7 libwpe-fdo: init at 1.7.1 2021-01-20 16:54:45 -06:00
Matthew Bauer da9fc7b068 Merge pull request #108072 from matthewbauer/fix-binfmt-activation
nixos/binfmt.nix: fix running commands in binfmt
2021-01-20 16:31:53 -06:00
Matthew Bauer 8f027e6b65 libwpe: init at 1.7.1 2021-01-20 16:14:33 -06:00
Matthew Bauer ba5f50a76c Merge pull request #107924 from matthewbauer/fix-duti
Fix duti on macOS Big Sur
2021-01-20 16:09:41 -06:00
Matthew Bauer dcbbbcdb05 duti: pass ApplicationServices directly 2021-01-20 15:30:57 -06:00
Matthew Bauer 299c95ac16 Merge pull request #107944 from matthewbauer/tensorflow-no-sysctl
tensorflow1: disable sysctl.h in hwloc
2020-12-31 23:40:14 -06:00
Matthew Bauer 08135a3caa nixos/binfmt.nix: fix running commands in binfmt
To allow arguments in binfmt, we need to put the command in a shell
script. This uses exec to run the binfmt interpreter.

Fixes #90683
2020-12-31 13:28:01 -06:00
Matthew Bauer 90a8f69fac Merge pull request #107262 from midchildan/update/libtapi
libtapi: 1000.10.8 -> 1100.0.11
2020-12-30 14:37:10 -06:00
Matthew Bauer 24efde00ed Merge pull request #107013 from thefloweringash/big-sur-bootstrap
darwin: Big Sur-compatible stdenv bootstrap
2020-12-30 14:36:58 -06:00
Matthew Bauer 9656774860 Merge pull request #107744 from mroi/patch-glibc
glibc: fix Darwin cross compilation for 2.32
2020-12-30 00:36:57 -06:00
Matthew Bauer a9ecac2538 tensorflow1: disable sysctl.h in hwloc
We need to override tensorflow's hwloc configuration, since it forces
sysctl.h usage which is removed since glibc 2.31. This does not appear
to effect tensorflow2.

See also https://github.com/tensorflow/tensorflow/issues/45861

Fixes #104801
2020-12-30 00:23:21 -06:00
Matthew Bauer c9c3dd4950 duti: set kernel to darwin18
Unfortunately, we can’t do arm64 multi-arch with the current nixpkgs
sdk, which duti assumes if your kernel is darwin20 (Big Sur). To fix
this, we can just hardcode to darwin18 which should be compatible with
Nixpkgs Darwin.

Fixes #105751
2020-12-29 17:03:34 -06:00
Matthew Bauer 46db547063 duti: 1.5.4pre -> 1.5.5pre
This adds changes including support for macOS Big Sur.
2020-12-29 16:58:38 -06:00
Matthew Bauer 44dae8d0c8 linux_rpi: 4.19.118 -> 5.4.51
Update to the new default branch for the Raspberry Pi vendor kernel.
2020-12-27 16:48:51 +01:00
Matthew Bauer eb3016b5ad Merge pull request #106763 from Atemu/fix/nfs-utils-cross
nfs-utils: pass native rpcsvc-proto to configureFlag
2020-12-14 16:56:23 -06:00
Matthew Bauer 079535f0df Merge pull request #106761 from Atemu/fix/cifs-utils-cross
cifs-utils: don't check for AC_FUNC_MALLOC when cross compiling
2020-12-14 16:56:03 -06:00
Matthew Bauer 1fb6bb9791 Merge pull request #106115 from matthewbauer/static-nix-darwin
Improve static Nix Darwin support
2020-12-08 15:55:22 -06:00
Matthew Bauer 805c9d4847 top-level/static.nix: put makeStaticDarwin first in staticAdapters
This needs to go first since the .override will reset the mkDerivation
function, removing any other customisations done afterwards. Kind of
hacky, but seems to work correctly right now.
2020-12-06 17:09:07 -06:00
Matthew Bauer 399ac47521 top-level/static.nix: also enable static for nixUnstable 2020-12-06 17:06:50 -06:00
Matthew Bauer 924c4ebc08 top-level/static.nix: Don’t add -static LDFLAGS in darwin
We can’t do fully static here, like "static" flag in libev does. I’m
not 100% sure if this is necessary for Linux (makeStaticBinaries
should set -static flag automatically), but leaving as is to avoid
breaking anything.
2020-12-06 17:04:36 -06:00
Matthew Bauer 989b403c7f Merge pull request #96318 from matthewbauer/provide-patchelf-in-native-stdenv
stdenv/native: provide patchelf on linux
2020-10-30 13:32:13 -05:00
Matthew Bauer a4ad9e740a Merge pull request #97507 from jonascarpay/gambatte-alsa-fix
gambatte: add alsa dependency, 2016-05-03 -> 2020-03-14
2020-09-14 21:44:19 -05:00
Matthew Bauer 59eecacd2d python3Packages.tensorflow: use cudatoolkit 11 2020-09-10 23:36:23 -05:00
Matthew Bauer 9cd240c14a python3Packages.h5py: 2.9.0 -> 2.10.0
also disable on python 2.7
Co-authored-by: Jon <jonringer@users.noreply.github.com>
2020-09-10 23:36:12 -05:00
Matthew Bauer 74338f636a python3Packages.tensorflow-estimator: 2.2.0 -> 2.3.0 2020-09-10 23:35:48 -05:00
Matthew Bauer 9112a9d882 Merge pull request #93596 from obsidiansystems/ios-13
Support iOS 13 in cross
2020-09-10 23:24:47 -05:00
Matthew Bauer 86d8c55470 Merge branch 'staging' into ios-13 2020-09-10 23:24:26 -05:00
Matthew Bauer 61517de024 Merge pull request #93912 from thefloweringash/cctools-tapi
stdenv/darwin: enable tapi support in cctools
2020-09-10 23:23:52 -05:00
Matthew Bauer 8483d29d60 Merge pull request #97587 from arcnmx/arch-fix
Fix arch eval error
2020-09-10 14:48:25 -05:00
Matthew Bauer c85fc341b0 pytorch: update to use passthru's for checks
This makes the checks a little easier to understand - we can just
check it in the passthru. Also increase major check for cuda 11.
2020-09-10 14:23:15 -05:00
Matthew Bauer 58823ac103 Merge pull request #97462 from kampka/raspberrypi-builder
Revert "nixos/raspberrypi-builder: fix cross using buildPackages"
2020-09-08 19:25:23 -05:00
Matthew Bauer bbdc1d118b Merge pull request #97343 from cmacrae/emacs_mac/json_support
emacs-mac: json support
2020-09-08 12:36:39 -05:00
Matthew Bauer b3d5272ff0 numpy: set runtime_library_dirs too
This appears to be needed in some Python distutils for the library to
get on RPATH correctly. I’m not sure why this worked before, but I
needed this value set for Python 3.8 numpy to work correctly.
2020-09-04 20:10:53 +02:00
Matthew Bauer 3a9b91b486 Merge pull request #96562 from obsidiansystems/bazel-add-dont-add-bazel-opts
build-bazel-package: add dontAddBazelOpts arg
2020-09-02 16:29:53 -05:00
Matthew Bauer 304de03193 Merge pull request #96402 from matthewbauer/bazel-jdk-headless
Fix Bazel on macOS
2020-09-02 16:29:47 -05:00
Matthew Bauer 8e6f466967 Merge pull request #96563 from obsidiansystems/skip-cudnn_cnn_infer-instead-of-removing
cudnn: skip libcudnn_cnn_infer.so, instead of removing
2020-09-02 16:29:28 -05:00
Matthew Bauer fc726e3494 Revert "nixos/nix-daemon.nix: assert distributedBuilds and buildMachines!=[]"
This reverts commit 67b6e56391.
This reverts commit 250885d0ca.

Causes issues for some configs, see https://github.com/NixOS/nixpkgs/commit/67b6e5639126ab6e8ec5d2b303aa9736a626b609
2020-08-29 22:39:24 -05:00
Matthew Bauer 10ee14442d Merge pull request #95864 from obsidiansystems/nvidia-x11-no32bit
nvidia-x11: add disable32Bit arg to not include 32-bit nvidia
2020-08-29 22:09:58 -05:00
Matthew Bauer ed950bb104 cudnn: skip libcudnn_cnn_infer.so, instead of removing
This is needed to build the CUDNN samples, so we should make sure it
winds up in $out/lib. The library is too big to support patchelf, so
we need to skip it. Most programs will still get the opengl path
because it also links to other libraries.
2020-08-28 15:16:15 -05:00
Matthew Bauer 27fb209194 build-bazel-package: add dontAddBazelOpts arg
This adds an option to skip adding --copt and --linkopt to Bazel
flags. In some cases, Bazel doesn’t like these flags, like when a
custom toolchain is being used (as opposed to the builtin one. The
compiler can still get the dependencies since it is invoked through
gcc wrapper and picks up the NIX_CFLAGS_COMPILE / NIX_LDFLAGS.
2020-08-28 15:10:59 -05:00
Matthew Bauer d0e52b6b32 Merge pull request #95309 from obsidiansystems/mobile-fixes
Support Android 29 in cross-compilation
2020-08-28 14:59:37 -05:00
Matthew Bauer 0daf71f97f nixos/cage: supply pamEnvironment
Without this, you don’t get any of the sessionVariables in the cage
application. Things like XDG_DATA_DIRS, XCURSOR_PATH, etc. are
missing.
2020-08-28 14:09:31 +02:00
Matthew Bauer 3814422afa Merge pull request #96218 from matthewbauer/cage-supply-pam-environment
nixos/cage: supply pamEnvironment
2020-08-27 10:15:29 -05:00
Matthew Bauer fe8d0c2e0b nixos/cage: supply pamEnvironment
Without this, you don’t get any of the sessionVariables in the cage
application. Things like XDG_DATA_DIRS, XCURSOR_PATH, etc. are
missing.
2020-08-27 10:11:45 -05:00
Matthew Bauer 25ac498482 Merge pull request #96404 from matthewbauer/gcc-cross
Fix cycle detected in Darwin->Linux cross GCC
2020-08-26 16:17:14 -05:00
Matthew Bauer 0b8312660a gcc10: fix building darwin->linux cross compiler
same as 459c60dda2 but for gcc10
2020-08-26 16:15:05 -05:00
Matthew Bauer 872b23d214 Merge remote-tracking branch 'origin/master' into gcc-cross 2020-08-26 16:10:02 -05:00
Matthew Bauer 3777a4af76 bazel: pass -stdlibc=libc++ correctly
Fixes #93787
2020-08-26 15:52:38 -05:00
Matthew Bauer 6d583084cc bazel: use headless for jdk8 too 2020-08-26 14:39:08 -05:00
Matthew Bauer 4830967736 Fix cc-wrapper in native stdenv 2020-08-26 14:36:26 -05:00
Matthew Bauer ca3fa9c32a Merge pull request #95956 from matthewbauer/qemu-cpu-max
runInLinuxVM, test-driver: use -cpu max instead of -cpu host
2020-08-26 12:59:57 -05:00
Matthew Bauer 54210573c1 stdenv/native: provide patchelf on linux
This provides consistency with the pure stdenv, which provides
patchelf this way. Native stdenv can always just manually install
patchelf on their system, but like xz, it’s unlikely to be provided in
/usr/bin/. In addition, it’s not even in the RHEL7 repos.
2020-08-25 17:54:27 -05:00
Matthew Bauer 47b56e7c19 runInLinuxVM, test-driver: use -cpu max instead of -cpu host
This appears to avoid requiring KVM when it’s not available. This is
what I originally though -cpu host did. Unfortunately not much
documentation available from the QEMU side on this, but this appears
to square with help:

$ qemu-system-x86 -cpu help
...
x86 host                  KVM processor with all supported host features
x86 max                   Enables all features supported by the accelerator in the current host
...

Whether we actually want to support this not clear, since this only
happens when your CPU doesn’t have full KVM support. Some Nix builders
are lying about kvm support though. Things aren’t too slow without it
though.

Fixes https://github.com/NixOS/nixpkgs/issues/85394

Alternative to https://github.com/NixOS/nixpkgs/pull/83920
2020-08-21 23:42:07 -05:00
Matthew Bauer bc0a6b113b nccl: remove nccl_cudatoolkit_9
This doesn’t work with latest nccl anymore.
2020-08-20 10:44:23 -05:00
Matthew Bauer 31d8669a72 nvidia-x11: add disable32Bit arg to not include 32-bit nvidia
In some contexts, we don’t want to have to build the whole i686 stdenv
just to use the x86_64 nvidia driver. It’s hard to know ahead of time
what we want, so it’s best to leave this as an overridable option.
2020-08-20 10:29:28 -05:00
Matthew Bauer e57df5816d undmg: use file name instead of pipe
There’s some issue in really big files with pipes that doesn’t occur
in filename decompression.
2020-08-19 19:35:29 -05:00
Matthew Bauer 4694b671b1 undmg: 1.0.5 -> 1.1.0 2020-08-19 19:35:14 -05:00
Matthew Bauer e7d1b6b59b Merge pull request #95779 from matthewbauer/lzfse-shared
lzfse: use cmake build system
2020-08-19 19:32:18 -05:00
Matthew Bauer d1c2a9ed97 lzfse: use cmake build system
this builds .so correctly
2020-08-19 19:31:30 -05:00
Matthew Bauer a378ae61e2 Merge pull request #95129 from aaronjanse/aj-fix-llvm-for-redox
mkDerivation: use `Generic` as system name for Redox in cmakeFlags
2020-08-19 15:07:20 -05:00
Matthew Bauer abba9a2154 nccl: 2.4.8-1 -> 2.7.8-1 2020-08-19 13:34:56 -05:00
Matthew Bauer 164f8024e9 cudatoolkit: init v11.0.3 2020-08-19 13:34:52 -05:00
Matthew Bauer c5617381bc ghc: document Stage1Only setting 2020-08-17 23:51:59 -05:00
Matthew Bauer ff33855bf0 android: readd 18b ndk
This is referenced in all-packages.nix, so might as well leave it
heref or now.
2020-08-17 23:51:59 -05:00
Matthew Bauer 4cbca0893a androidenv: remove duplicate addons.nix entries 2020-08-17 23:51:59 -05:00
Matthew Bauer 0be29459d6 ghc: set Stage1Only = YES on iOS
We want stage1Only here even if system == system, since we can’t run
the native arch simulator binaries locally.
2020-08-17 23:51:59 -05:00
Matthew Bauer d2fce26c40 Merge pull request #95363 from lopsided98/crda-cross
crda: fix cross compilation
2020-08-17 16:24:35 -05:00
Matthew Bauer 21d0eb3b32 Merge pull request #95680 from helsinki-systems/feat/john/perl
john: ship internal perl modules
2020-08-17 16:22:08 -05:00
Matthew Bauer a4fd659299 Merge pull request #95702 from Thra11/fix-llvm-10-aarch32
llvm_10: disable failing test on 32-bit ARM
2020-08-17 16:21:37 -05:00
Matthew Bauer 6fffd50623 Merge pull request #95220 from obsidiansystems/ipfs-quic-socket-activated
nixos/ipfs: Allow QUIC connections to socket activate too
2020-08-12 13:47:29 -05:00
Matthew Bauer e707f1f72c Merge pull request #95200 from matthewbauer/emacs-macport-27
emacs-macport: 26.3-7.7 -> 27.1-8.0
2020-08-11 15:00:00 -05:00
Matthew Bauer 669f0d3f36 emacs-macport: 26.3-7.7 -> 27.1-8.0 2020-08-11 11:51:24 -05:00
Matthew Bauer d0468f86e8 nss: set install name correctly 2020-08-02 22:35:30 -05:00
Matthew Bauer 203538bd4f lzfse: supports unix 2020-08-02 21:01:41 -05:00
Matthew Bauer dab2ed10e1 gyp: update no-xcode.patch 2020-08-02 21:01:12 -05:00
Matthew Bauer d0677e6d45 treewide: add warning comment to “boot” packages
This adds a warning to the top of each “boot” package that reads:

  Note: this package is used for bootstrapping fetchurl, and thus cannot
  use fetchpatch! All mutable patches (generated by GitHub or cgit) that
  are needed here should be included directly in Nixpkgs as files.

This makes it clear to maintainer that they may need to treat this
package a little differently than others. Importantly, we can’t use
fetchpatch here due to using <nix/fetchurl.nix>. To avoid having stale
hashes, we need to include patches that are subject to changing
overtime (for instance, gitweb’s patches contain a version number at
the bottom).
2020-07-31 08:56:53 +02:00
Matthew Bauer f36899e118 attr: inline syscall patch
Unfortunately the output of git.savannah.nongnu.org changes with each
gitweb update. This means that the current has
“0gja54fz79a9ma6b4mprnjxq77l5yg2z9xknlwhmkcrfnam02qxp” is no longer
correct:

$ nix-prefetch-url
https://git.savannah.nongnu.org/cgit/attr.git/patch/\?id=14adc898a36948267bfe5c63b399996879e94c98
1g8sky52rjg9fpmrddza1af89s9qd4bzsbxqb7mc5bv8gyh10s1k

Normally, we use fetchpatch to strip this out, but unfortunately attr
cannot use fetchpatch due to being used in bootstrapping fetchurl.
That is, it can’t use a custom postFetch since <nix/fetchurl.nix>
doesn’t support that.

To solve this problem, just inline the patch for now.
2020-07-31 08:56:53 +02:00
Matthew Bauer 67b6e56391 nixos/nix-daemon.nix: fix nix.distributedBuilds assertion 2020-07-30 21:38:24 -05:00
Matthew Bauer ed1423b03c Merge pull request #92415 from matthewbauer/nix-daemon-distributed-builds
Add assertion on distributedBuilds & buildMachines != []
2020-07-30 19:56:23 -05:00