Commit Graph

354 Commits

Author SHA1 Message Date
Alexis Hildebrandt
f8c4a98e8e treewide: Remove the definite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"([Tt]he)? ' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Tt]he (.)/\1\U\2/'
2024-06-09 23:08:46 +02:00
Sigmanificient
5d4c768de0 libauto: remove 2024-05-30 02:03:57 +02:00
github-actions[bot]
6ff1451c6f
Merge master into staging-next 2024-05-20 12:01:29 +00:00
Sigmanificient
a2353716f6 treewide: remove unused occurence of fetchurl argument 2024-05-20 05:20:23 +02:00
toonn
3e8f078a97
Merge pull request #306697 from reckenrode/apple-oss-python
apple-source-releases: always use python3Minimal
2024-05-06 20:17:21 +02:00
Randy Eckenrode
0293a353ee
apple-source-releases: always use python3Minimal
Using python3Minimal avoids infinite recursions in the stdenv bootstrap on x86_64-darwin when building Python with configd support.
2024-05-01 17:15:17 -04:00
toonn
473eaafe1f
Merge pull request #306960 from reckenrode/system_cmds-fix
darwin.system_cmds: fix build without CoreFoundation hook
2024-05-01 19:45:36 +02:00
Randy Eckenrode
e7b5b44f9d
darwin.libiconv: remove and add to darwin-aliases 2024-04-27 18:09:53 -04:00
Randy Eckenrode
1e497778a3
darwin.system_cmds: fix build without CoreFoundation hook 2024-04-26 08:16:31 -04:00
Weijia Wang
3f59355d84 Merge branch 'staging-next' into staging 2024-04-09 08:26:23 +02:00
iliana etaoin
e42705c982 licenses: rename apsl{10,20} -> apple-psl{10,20}
Part 1 of #301908.

This renames the two versions of the Apple Public Source License seen in
nixpkgs; `apsl20` was often confused as being for the widely-used Apache
License 2.0.
2024-04-08 20:39:37 +02:00
Silvan Mosberger
b9261ad2e6
Merge pull request #301066 from philiptaron/compatible-typos
treewide: fix typos around "compatible" and "compatibility"
2024-04-04 04:18:31 +02:00
Philip Taron
0c73cbb6f0
libdispatch: fix typo: compatability to compatibility 2024-04-02 14:50:10 -07:00
Weijia Wang
3f88034387
Merge pull request #299969 from runeksvendsen/fix-libsystem-bug
Libsystem: remove broken `postFetch` step in `darling.src`
2024-04-02 05:49:09 +02:00
Rune K. Svendsen
4f911a7247 Libsystem: fix broken postFetch step in darling.src
Fixes #297765

The `postFetch` step was broken in several ways:
1. It attempts to unpack the archive, but this has already been done before reaching this step.
2. It unpacks the file `$downloadedFile`, but this file no longer exists because it's been moved to `$renamed`.

Additionally, since (1) neither directory `src/opendirectory` nor `src/OpenDirectory` are used for anything, and (2) it's not clear whether Nix produces different hashes depending on file system case sensitivity, the chosen solution is to just remove both these two directories for now. If later a file from either directory is needed, an investigation needs to be done on how Nix hashes archives with clashing names on case insensitive file systems.
2024-04-01 10:27:35 +02:00
Randy Eckenrode
a426aa3a3f
Revert "darwin.libiconv: remove and add to darwin-aliases"
This reverts commit 521ea079b9.
2024-03-31 09:57:54 -04:00
Randy Eckenrode
1500fe6dda
Merge pull request #299613 from reckenrode/libiconv-switch
darwin.libiconv: switch to libiconvReal and add to darwin-aliases
2024-03-28 23:35:42 -04:00
Randy Eckenrode
521ea079b9
darwin.libiconv: remove and add to darwin-aliases 2024-03-27 17:34:51 -04:00
Randy Eckenrode
25af398f88
darwin.system_cmds: 735.50.6 -> 970.0.4
- Update to the latest available version from Apple;
- Use Meson because dealing with xcbuild is too much trouble; and
- Conditionally build certain programs when newer SDKs are available.
2024-03-16 22:58:40 -04:00
Randy Eckenrode
55505c558f
darwin.libplatform: fix build of 11.0 SDK source release 2024-03-16 22:46:03 -04:00
Randy Eckenrode
912752b5b9
appleDerivation: support mkDerivation fixpoint 2024-03-15 20:23:45 -04:00
a-n-n-a-l-e-e
ce789e7e35
llvmPackages_{12,13,14,15,16,17,git}.{libcxx,libcxxabi}: merge libcxxabi into libcxx (#292043)
- merge libcxxabi into libcxx for LLVM 12, 13, 14, 15, 16, 17, and git.
- remove the link time workaround `-lc++ -lc++abi` from 58 packages as it is no longer required.
- fixes https://github.com/NixOS/nixpkgs/issues/166205
- provides alternative fixes for. https://github.com/NixOS/nixpkgs/issues/269548 https://github.com/NixOS/nix/issues/9640
- pkgsCross.x86_64-freebsd builds work again

This change can be represented in 3 stages
1. merge libcxxabi into libcxx -- files: pkgs/development/compilers/llvm/[12, git]/{libcxx, libcxxabi}
2. update stdenv to account for merge -- files: stdenv.{adapters, cc.wrapper, darwin}
3. remove all references to libcxxabi outside of llvm (about 58 packages modified)

### merging libcxxabi into libcxx
- take the union of the libcxxabi and libcxx cmake flags
- eliminate the libcxx-headers-only package - it was only needed to break libcxx <-> libcxxabi circular dependency
- libcxx.cxxabi is removed. external cxxabi (freebsd) will symlink headers / libs into libcxx.
- darwin will re-export the libcxxabi symbols into libcxx so linking `-lc++` is sufficient.
- linux/freebsd `libc++.so` is a linker script `LINK(libc++.so.1, -lc++abi)` making `-lc++` sufficient.
- libcxx/default.nix [12, 17] are identical except for patches and `LIBCXX_ADDITIONAL_LIBRARIES` (only used in 16+)
- git/libcxx/defaul.nix  does not link with -nostdlib when useLLVM is true so flag is removed. this is not much different than before as libcxxabi used -nostdlib where libcxx did not, so libc was linked in anyway.

### stdenv changes
- darwin bootstrap, remove references to libcxxabi and cxxabi
- cc-wrapper: remove c++ link workaround when libcxx.cxxabi doesn't exist (still exists for LLVM pre 12)
- adapter: update overrideLibcxx to account for a pkgs.stdenv that only has libcxx

### 58 package updates
- remove `NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}` as no longer needed
- swift, nodejs_v8 remove libcxxabi references in the clang override

https://github.com/NixOS/nixpkgs/pull/292043
2024-03-11 03:53:37 -07:00
Weijia Wang
39951cddc7 darwin.libiconv: set mainProgram 2023-11-18 16:57:39 +01:00
Randy Eckenrode
55bf8aa8c1
Revert "configd: fix build with clang 16"
This reverts commit 550137e330.
2023-11-12 10:45:22 -05:00
Randy Eckenrode
a678c55faf
darwin.mDNSResponder: patch header to match SDK
The upstream source release for 765.50.9 defines `_DNS_SD_LIBDISPATCH`
to `0` in `dns_sd.h`, but the SDK version of that header actually
defines it to `1`. Having it defined to `0` causes packages that expect
to use libdispatch-based symbols such as `DNSServiceSetDispatchQueue` to
fail to build. Define it to match the SDK to fix those packages.
2023-11-12 10:45:22 -05:00
Randy Eckenrode
940180423a
Merge pull request #265102 from reckenrode/darwin-corefoundation
darwin.stdenv: use CoreFoundation instead of CF
2023-11-11 12:10:10 -05:00
Randy Eckenrode
daa4cd2c2a
darwin.text_cmds: fix build with clang 16 2023-11-07 09:17:04 -05:00
Randy Eckenrode
080f7cc41e
darwin.configd: fix build with CoreFoundation 2023-11-02 17:45:59 -04:00
Randy Eckenrode
b810da025f
darwin.diskdev_cmds: fix build with clang 16
Fix an implicit `int` on argc, which is an error with newer clangs.
2023-10-27 08:40:47 -04:00
Randy Eckenrode
1974a25301
darwin.Libm: add missing function declarations
The patch in this commit is based on the SDK header, which has an ASPL
license header even though the updated header is not part of the source
distribution of Libm. Adding the missing declarations allows packages
such as jq, Ruby, and Guile to build without requiring an SDK that is
not built from the source releases.
2023-10-21 12:05:09 -04:00
Artturi
f42617f5b2
Merge pull request #243540 from reckenrode/adv_cmds-clang2 2023-08-01 07:29:25 +03:00
Artturin
afaab4f120 darwin.xnu: Fix stripDirs
`stripDirs: Ranlib command is empty`

Exposed by f46c8c1bcd
2023-07-23 14:50:40 +03:00
Randy Eckenrode
732e4469cb
darwin.adv_cmds: fix build with clang 16
darwin.Libc conflicts with libc++ 16. adv_cmds only needs `msgcat.h`, so
provide only that in `buildInputs` instead of all of Libc.
2023-07-14 17:27:16 -06:00
Randy Eckenrode
550137e330
configd: fix build with clang 16
This is an additional fix for clang 16, which fails due to an undeclared
symbol. Adding `_DNS_SD_LIBDISPATCH` makes the symbol visible in
`dns_sd.h`, allowing the build to complete successfully.
2023-06-30 08:54:26 -04:00
toonn
62f759132d
Merge pull request #237348 from reckenrode/darwin-libc-cleanup
darwin.Libsystem: fix existing file error during build
2023-06-20 17:20:45 +02:00
Randy Eckenrode
23cb6c155b
darwin.Libc: stop vendoring headers from other packages
A number of headers in Libc are being vendored from other packages.
Instead of copying them from an earlier Libc, Libsystem now sources them
from their respective packages (see below). This allows Libc_old to be
dropped and avoids any potential clashes when building Libsystem.

libmalloc:
* malloc/malloc.h

libplatform:
* setjmp.h
* ucontext.h
* libkern/OSAtomic.h
* libkern/OSCacheControl.h

libpthread:
* pthread*.h
* sched.h
* spawn.h

syslog (vendored because only one file is needed):
* asl.h

xnu:
* spawn.h (a different one from libpthread)
* libproc.h
2023-06-12 17:11:54 -04:00
Randy Eckenrode
a255182f56
darwin.Libsystem: get pthread headers from darwin.libpthread
Some of the headers are symlinked to the root `include` in upstream
Libsystem, so also symlink them there from `include/pthread`.
2023-06-12 09:15:29 -04:00
Randy Eckenrode
d2b670291f
darwin.Libsystem: get asl.h from upstream syslog sources 2023-06-12 09:15:29 -04:00
Randy Eckenrode
489ed84733
darwin.Libsystem: get malloc.h from darwin.libmalloc 2023-06-12 09:06:21 -04:00
Randy Eckenrode
81324e2ec3
darwin.libmalloc: add at 317.40.8 for the 11.0 SDK 2023-06-12 09:06:21 -04:00
Randy Eckenrode
a48c2d3e92
darwin.libmalloc: add at 116.50.8 2023-06-12 09:06:21 -04:00
Randy Eckenrode
2c149715fe
darwin.xnu: provide additional headers needed by Libsystem 2023-06-12 08:59:49 -04:00
toonn
b7ed52e26f
Merge pull request #235487 from reckenrode/system_cmds-clang-fix
darwin.system_cmds: fix build with clang 16
2023-06-11 20:14:59 +02:00
Randy Eckenrode
cd4ab1d9fd
darwin.system_cmds: fix build with clang 16
Clang 16 makes implicit declarations an error by default. The headers
are available, so include them.

`getline` was renamed to `get_line` to avoid a name clash. `util.h`
includes `stdio.h`, which defines `getline`.
2023-06-10 17:15:08 -04:00
toonn
501dcc2d3e
Merge pull request #234857 from reckenrode/configd-fix
configd: fix build with newer LLVM and bootstrap
2023-06-05 19:26:06 +02:00
Bernardo Meurer
1c31f7e109
Merge pull request #235052 from reckenrode/xnu-fix-mk2 2023-05-30 20:05:32 -04:00
Randy Eckenrode
1aa68d1d21
xnu: fix build with newer clang
Newer clangs require also including `-lc++abi` to build kextsymboltool.
2023-05-30 16:13:11 -04:00
Randy Eckenrode
56480a72c9
darwin.adv_cmds: fix implicit int, which is an error in clang 16 2023-05-29 16:27:13 -04:00
Randy Eckenrode
15da7dce6a
configd: fix build with newer LLVM and bootstrap
Clang 15 does not like the fake xpc headers. Use the real ones instead.
Doing this no longer causes an infinite recursion because xnu now
depends on python3Minimal, which does not include configd support.
2023-05-29 15:30:39 -04:00
Weijia Wang
12b91012e5 darwin.darling: drop 2023-04-25 22:45:59 +03:00