cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
342473 commits 1 branch 0 tags 3.7 GiB
Commit graph

767 commits

Author SHA1 Message Date
Jonathan Ringer
5263fb820e
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
	pkgs/development/python-modules/django-rq/default.nix
	pkgs/top-level/all-packages.nix
 2021-12-05 22:02:00 -08:00
Christian Kögler
7980f52d0c yabai: 3.3.4 -> 3.3.10 2021-12-05 19:15:43 +01:00
Jonathan Ringer
3bbe9a9459
Merge remote-tracking branch 'origin/staging-next' into staging 
Conflicts:
	pkgs/top-level/all-packages.nix
 2021-11-29 10:15:20 -08:00
toonn
e33c11a557 Libc: Merge TARGET_OS_EMBEDDED patches 
Both patches implement the same fix so they'll probably have to be
removed at the same time. This avoids one of them being left behind.
 2021-11-24 15:17:13 -08:00
toonn
459dc34b2b Libc: Define target in stdio too 2021-11-24 15:17:13 -08:00
toonn
5aa4c46dcd Libc: Define target instead of including 
Including `TargetConditionals.h` had knock-on effects, breaking the zlib
build because `TARGET_OS_MAC` gets defined, for instance.

Defining `TARGET_OS_EMBEDDED` to be `0` if it's not defined is simpler
and maintains the default behavior so it shouldn't break any dependents.
 2021-11-24 15:17:13 -08:00
toonn
99bef31835 Libc: stdlib uses undefined TARGET_OS_EMBEDDED 2021-11-24 15:17:13 -08:00
Sandro Jäckel
7e9d442837 darwin.CF: Add pre-/postBuild hooks to buildPhase 2021-11-24 15:17:13 -08:00
toonn
3b2d3f65b7 darwin.CF: Drop clang 7 workaround 2021-11-24 15:17:13 -08:00
toonn
2bb0e256ea darwin.CF: Include missing TARGET_OS_* defines 
This patch is static and may not be appropriate if the compilation
target is iOS.
 2021-11-24 15:17:13 -08:00
toonn
84454c3233 darwin.Libsystem: Patch TargetConditionals.h 
`TargetConditionals.h` was missing several definitions, like
`TARGET_OS_TV` that are part of SDK 10.12 at least. And one that doesn't
seem to occur in any SDK afaict, `TARGET_OS_EMBEDDED_OTHER`.

I added the definitions from SDK 10.12 verbatim and defined
`TARGET_OS_EMBEDDED_OTHER` to be equal to `0`.

I think none of this works if `darwin.Libsystem` is used to build for
linux or iOS though so maybe this needs a more thorough fix?

This reverts 336d82617f because it's no
longer necessary.
 2021-11-24 15:17:13 -08:00
toonn
e07eef85e8 xnu: Fix python3 patch 
This reverts 7da313e10a because it's no
longer necessary.
 2021-11-24 15:17:13 -08:00
Jan Tojnar
b8c07facaa Fix eval with nix-env -qas 
At least on NixOS, it fails to evaluate as follows:

	$ nix-env -qaPs -f .
	error: attribute '__propagatedImpureHostDeps' missing
 2021-11-17 16:28:55 +01:00
Felix Buehler
9480444dae treewide: rename name to pname&version 2021-11-09 22:24:57 +01:00
Lein Matsumaru
ae4666c415
darwin.rewrite-tbd: only build on darwin 2021-11-08 13:11:29 +00:00
Andrew Childs
e456e9b1ae sigtool: 0.1.0 -> 0.1.2 
Fixes build on x86_64-darwin
 2021-09-25 10:38:35 +09:00
Michael Stone
470466fdbd
sigtool: 4a3719b4 -> 2a13539d (#138453) 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-09-23 17:14:07 +02:00
github-actions[bot]
6f038e8b11
Merge master into staging-next 2021-09-14 12:01:03 +00:00
Emily
35a1ca8a0a darwin.trash: fix on aarch64-darwin 
None of these clang options should be necessary with the nixpkgs stdenv
infrastructure, and the -arch was breaking Apple Silicon builds.
 2021-09-14 03:31:31 +01:00
github-actions[bot]
dbad333a72
Merge master into staging-next 2021-08-28 12:01:06 +00:00
Domen Kožar
09818c59fa
Merge pull request #135345 from prusnak/ghc-aarch64-darwin 
ghc: enable build on aarch64-darwin (aka Apple Silicon)
 2021-08-28 13:10:55 +02:00
Pavol Rusnak
236fd9c902 darwin.signingUtils: move signDarwinBinariesIn from fixupOutputHooks to postFixupHooks 
to fix ghc build
 2021-08-28 12:54:05 +02:00
github-actions[bot]
b13b005f0e
Merge master into staging-next 2021-08-26 12:01:09 +00:00
zowoq
13ea123c74 treewide: buildFlagsArray -> ldflags 2021-08-26 21:35:06 +10:00
Jan Tojnar
4ff3577f25 Merge branch 'staging-next' into staging 2021-08-23 14:19:54 +02:00
github-actions[bot]
1f6dedd364
Merge master into haskell-updates 2021-08-18 00:05:52 +00:00
Jan Tojnar
e286e1cfa0 Merge branch 'staging-next' into staging 
- boost 167 removed on staging-next (7915d1e03f) × boost attributes are inherited on staging (d20aa4955d)

- linux kernels were moved to linux-kernels.nix on staging-next (c62f911507) × hardened kernels are versioned on staging (a5341beb78) + removed linux_5_12 (e55554491d)

- conflict in node-packages – I regenerated it using node2nix from nixos-unstable (does not build on staging)
 2021-08-17 18:52:37 +02:00
Jasper
00037f7403
darwin.binutils: fix wrapper of as when cross-compiling to aarch64-darwin (#134097) 2021-08-16 22:12:51 -04:00
sternenseemann
283d622397 darwin.xattr: init at 61.60.1 2021-08-14 17:06:29 +02:00
Dmitry Kalinkin
dda4394889
Merge pull request #127229 from veprbl/pr/libsystem_targetconditionals 
darwin.Libsystem: add definitions TARGET_OS_{IOS,WATCH,BRIDGE,TV,SIMULATOR,NANO} to TargetConditionals.h
 2021-08-06 02:14:09 -04:00
Angus Trau
6395aaba17 darwin.apple_sdk.frameworks.AVFoundation: Add missing dependencies 2021-08-01 12:51:26 +10:00
Sandro
d0f62aae75
Merge pull request #130501 from SuperSandro2000/remove-noop-phases-mass 
Convert phases that contain ":" to dont* = true
 2021-07-18 23:46:50 +02:00
Sandro Jäckel
dc48d23a0f
Convert phases that contain ":" to dont* = true 2021-07-17 23:39:16 +02:00
Luke Granger-Brown
a7be563707 darwin.apple_sdk.frameworks.CoreSymbolication: expose under SDK 11.0 
This is used by the `root` package, and otherwise prevents the
nixpkgs.tarball build from succeeding (e.g.
https://hydra.nixos.org/build/146838433).
 2021-07-05 02:09:35 +00:00
Andrew Childs
55dcd99859 root: use pure CoreSymbolication on Darwin 
The current build works by linking against CoreSymbolication in
/System/Library/PrivateFrameworks. This is impure and doesn't work in
newer versions of macOS.

See https://github.com/NixOS/nixpkgs/issues/128576
 2021-06-29 11:00:05 +09:00
Dmitry Kalinkin
03137b50d2
darwin.Libsystem: add definitions TARGET_OS_{IOS,WATCH,BRIDGE,TV,SIMULATOR,NANO} to TargetConditionals.h 
These are defined in the SDK for Apple compilers and some projects assume those are defined unconditionally.

https://reviews.llvm.org/D103598
 2021-06-17 11:01:16 -04:00
Jonathan Ringer
d1d37feb6d
Merge branch 'master' into staging-next 
Conflicts:
  pkgs/servers/x11/xorg/default.nix
 2021-06-15 19:32:36 -07:00
Jason Lau
8a2d578017
reattach-to-user-namespace: support apple silicon 2021-06-15 11:30:21 -07:00
Jan Tojnar
91171e2955
Merge branch 'master' into staging-next 
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
 2021-06-15 11:19:41 +02:00
Sandro
b083c7e9eb
darwin.mas: Fix dontBuild 2021-06-14 14:59:21 +02:00
github-actions[bot]
65a7d168af
Merge master into staging-next 2021-06-12 18:04:56 +00:00
Zach Coyle
88fc8922a4 mas: 1.8.1 -> 1.8.2 2021-06-11 19:22:35 -04:00
Jonathan Ringer
430ac9b830 apple_sdk_11: alias JavaVM 
Apple removed JavaVM but JavaNativeFoundation seems to be
the replacement. Should be safe to substitute usage of
JavaVM with JavaNativeFoundation.
 2021-06-06 15:09:41 -07:00
Domen Kožar
aeb44a891a
Merge pull request #125184 from domenkozar/aarch64-darwin-eval 
Aarch64 darwin eval
 2021-06-03 11:21:20 +02:00
Domen Kožar
9e6417f2a4
fix tarball job evaluation for aarch64-darwin 2021-06-03 10:52:46 +02:00
Anbang Wen
2565e3bba6 nixos/apple-sdk: 11.0 -> 11.1 
The previous URL is a dead link. This commit updates it and bump the
SDK version to 11.1.
 2021-06-02 09:23:28 -07:00
Andrew Childs
e592d342da darwin.ICU: avoid platform.darwinMinVersion references on non-darwin 
This package isn't expected to work outside of darwin, but must still
evaluate cleanly.
 2021-05-17 00:28:05 +09:00
Andrew Childs
3706fe567b darwin.DarwinTools: remove reference to CFPriv.h 
Fixes build on aarch64-darwin.
 2021-05-17 00:28:05 +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