Commit Graph

805 Commits

Author SHA1 Message Date
Andrew Childs
7e49fb6592 darwin/apple-sdk: explain why Kernel.framework has no .tbd file 2020-11-12 16:57:19 +09:00
Andrew Childs
3456ef6f30 darwin/apple-sdk: use darwin stubs 2020-11-12 00:23:09 +09:00
Andrew Childs
8e6d830423 darwin/objc4: use darwin-stubs 2020-11-12 00:23:09 +09:00
Andrew Childs
193c91233c darwin/IOKit: use darwin-stubs 2020-11-12 00:23:09 +09:00
Andrew Childs
03988a5fec darwin/Security: use darwin-stubs 2020-11-12 00:23:09 +09:00
Andrew Childs
b176ad9546 darwin/Libsystem: use darwin-stubs 2020-11-12 00:23:09 +09:00
Andrew Childs
fd33052999 darwin/print-reexports: nixpkgs-specific utility to inspect .tbd files
Used during bootstrap to check that re-exported libraries are not
dangling.
2020-11-12 00:23:09 +09:00
Andrew Childs
8946ff8d71 darwin/darwin-stubs: init 2020-11-12 00:23:09 +09:00
Dmitry Kalinkin
7c1e712c39
Merge pull request #103180 from veprbl/pr/darwin_adv_cmds_fix
darwin.adv_cmds: fix build
2020-11-10 13:26:28 -05:00
Dmitry Kalinkin
f0efe2d16c
darwin.adv_cmds: fix build
Also disable pgrep that depends on pkill
2020-11-08 20:28:45 -05:00
Frederik Rietdijk
470f05cb5d Merge staging-next into staging 2020-11-03 12:06:41 +01:00
Jonathan Ringer
16357a697f libtapi: add homepage and description, use pname 2020-10-29 14:05:46 -07:00
bb2020
5ef5d96c08 discrete-scroll: added myself as maintainer 2020-10-26 18:38:52 +03:00
Ben Siraphob
683a87dbeb treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
Steven Pease
6217cc92b5 Add newer xcode versions 2020-10-15 23:17:55 -07:00
Bas van Dijk
d5b0c8bcdf libvirt: 6.3.0 -> 6.6.0
Also upgrades `python3Packages.libvirt`
and patches the `rpcgen` tool from Apple's `developer_cmds` package.
2020-09-29 00:18:24 +02: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
cmacrae
b9326ecf0a yabai: 3.2.1 -> 3.3.0 2020-09-03 17:23:46 +01:00
bb2020
026269906f discrete-scroll: init at 0.1.1 2020-08-27 13:47:08 +03:00
Andrew Childs
630f5d30df stdenv/darwin: enable tapi support in cctools 2020-08-21 01:09:42 +09:00
zowoq
0dc28e4475 smimesign: 0.0.13 -> 0.1.0 2020-08-18 10:25:43 +10:00
zowoq
cea7cd902e buildGoModule packages: set doCheck = false 2020-08-10 16:02:30 +10:00
Matthew Bauer
5a741d16ff
Merge pull request #93541 from matthewbauer/ios-deploy-update
ios-deploy: move out of nodePackages
2020-07-30 19:55:52 -05:00
Andrew Childs
b418d4c6a4 libtapi: fix build, install phase and install name
installTarget looks like a typo for installTargets. This causes a lot
of llvm and clang to be built and installed.

Clang is not intended to be an external dependency. The source bundle
includes llvm and clang. Adding include paths and building clangBasic
first is sufficient to use the internal clang components.
2020-07-28 19:16:24 +09:00
Matthew Bauer
95eabdfd5f xcode/sdk-pkgs.nix: set -platform_version in addition to -miphoneos-version-min
The App Store looks at LC_VERSION_MIN_IPHONEOS to verify you have a
new enough SDK version. This is not just the minimum version, but also
the sdk version used. When the linker can’t figure it out, it tries to
infer it from the sdk path[1]. When no sdk version is found, it
defaults to just using the -miphoneos-version-min value[2]. So, to make
sure we don’t rely on inference (which doesn’t work in the current
directory structure), we have to specify -platform_version.

[1]:
43f32a4c61/cctools/ld64/src/ld/Options.cpp (L5355-L5376)
[2]: 43f32a4c61/cctools/ld64/src/ld/ld.hpp (L58)
2020-07-23 10:44:51 -05:00
Matthew Bauer
753e80125f darwin/xcode: default to 11.3.1 2020-07-21 21:58:51 -05:00
cmacrae
fcdb62dc73
spacebar: 1.1.0 -> 1.1.1 2020-07-21 20:13:03 +01:00
Matthew Bauer
3c6bd61560 darwin.cctools: 927.0.2 -> 949.0.1
Needed for iOS 13 support
2020-07-21 10:34:24 -05:00
Matthew Bauer
39c536c8db darwin.libtapi: update, fix installTargets 2020-07-21 10:30:19 -05:00
Matthew Bauer
c36cf877f1 darwin.xcode: add hash for 11.3.1 2020-07-21 10:27:55 -05:00
Matthew Bauer
10aa776340 ios-deploy: move out of nodePackages
This doesn’t need nodePackages to work, so we can move it to
pkgs/os-specific/darwin. Note that it still requires xcodebuild to
work.
2020-07-21 10:24:53 -05:00
cmacrae
8bc2e52c88
spacebar: 0.5.0 -> 1.1.0
Also update owner, description, & homepage
2020-07-17 14:20:55 +01:00
Calum MacRae
15e8fa9f96
yabai: 3.2.0 -> 3.2.1 (#90717) 2020-06-29 16:06:55 +02:00
cmacrae
b3a8e07fa0 yabai: 3.1.2 -> 3.2.0 2020-06-14 11:24:38 +01:00
cmacrae
154fc03194 yabai: 3.1.1 -> 3.1.2 2020-06-09 00:19:08 +01:00
cmacrae
e9198cb7a5 yabai: 3.1.0 -> 3.1.1 2020-06-08 22:42:42 +01:00
cmacrae
74e87de0ad yabai: 3.0.2 -> 3.1.0 2020-06-05 14:11:39 +01:00
Shardul Baral
2d95536210
yabai: 3.0.1 -> 3.0.2 2020-05-31 10:29:34 -04:00
Mario Rodas
9917caa5e8
Merge pull request #87542 from cmacrae/upgrade/yabai/3.0.1
yabai: 3.0.0 -> 3.0.1
2020-05-14 08:14:56 -05:00
Colin L Rice
d6162dab50
go-modules: Update files to use vendorSha256 2020-05-14 07:22:21 +01:00
cmacrae
89be001b27 yabai: 3.0.0 -> 3.0.1 2020-05-10 21:54:13 +01:00
Ryan Mulligan
3e73635e51
Merge pull request #86556 from cmacrae/pkgs/os-specific/darwin/spacebar
spacebar: init at v0.5.0
2020-05-06 15:19:38 -07:00
Frederik Rietdijk
9875bbae75 Merge master into staging-next 2020-05-05 19:51:09 +02:00
Daiderd Jordan
64279cff00
Merge pull request #86557 from cmacrae/upgrade/yabai/3.0.0
yabai: 2.4.3 -> 3.0.0
2020-05-02 11:34:56 +02:00
cmacrae
c57532cf4e spacebar: init at v0.5.0 2020-05-02 10:18:34 +01:00
cmacrae
fe9938ebd4 yabai: 2.4.3 -> 3.0.0 2020-05-02 10:17:32 +01:00
cmacrae
1e16e652d8 skhd: 0.3.0 -> 0.3.5 2020-05-02 09:58:41 +01:00
Frederik Rietdijk
afb1041148 Merge master into staging-next 2020-05-02 09:39:00 +02:00
cmacrae
8e8459921a yabai: init at 2.4.3 2020-05-01 11:57:28 +01:00
Dmitry Kalinkin
c00ad799a0
darwin.cctools: install ar man pages
In the distribution they are located in a separate directory from the
others and the standard installation doesn't process them.
2020-04-20 23:56:51 -04:00
Dmitry Kalinkin
125c469d3e
darwin.binutils.bintools: propagate man pages from cctools 2020-04-20 23:49:02 -04:00
Dmitry Kalinkin
3e880bad79
darwin.cctools: split man output 2020-04-20 19:51:49 -04:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Jörg Thalheim
066db11215
Revert "Merge pull request #83099 from marsam/fix-buildGoModule-packages-darwin"
This reverts commit 4e6bf03504, reversing
changes made to afd997aab6.

Instead we propagate those frameworks from the compiler again
2020-03-27 07:33:21 +00:00
Mario Rodas
78f00558e2 smimesign: fix build on darwin 2020-03-21 06:22:00 -05:00
Daiderd Jordan
3987ea9a9d
mpv: add flag for swift on darwin
While we currently don't have a pure swift build on macOS it's possible
to build mpv using the swift compiler from CLT. eg.

    self: super:
    let
      CommandLineTools = "/Library/Developer/CommandLineTools";
    in
    {
      swift = super.stdenv.mkDerivation {
        name = "swift-CommandLineTools-0.0.0";
        phases = [ "installPhase" "fixupPhase" ];

        propagatedBuildInputs = [ self.darwin.DarwinTools ];

        installPhase = ''
            mkdir -p $out/bin $out/lib
            ln -s ${CommandLineTools}/usr/bin/swift $out/bin
            ln -s ${CommandLineTools}/usr/lib/swift $out/lib
            ln -s ${CommandLineTools}/SDKs $out
        '';

        setupHook = builtins.toFile "hook" ''
            addCommandLineTools() {
                echo >&2
                echo "WARNING: this is impure and unreliable, make sure the CommandLineTools are installed!" >&2
                echo "  $ xcode-select --install" >&2
                echo >&2
                [ -d ${CommandLineTools} ]
                export NIX_LDFLAGS+=" -L@out@/lib/swift/macosx"
                export SWIFT=swift
                export SWIFT_LIB_DYNAMIC=@out@/lib/swift/macosx
                export MACOS_SDK_VERSION=$(sw_vers -productVersion | awk -F. '{print $1 "." $2}')
                export MACOS_SDK=@out@/SDKs/MacOSX$MACOS_SDK_VERSION.sdk
            }

            prePhases+=" addCommandLineTools"
        '';

        __impureHostDeps = [ CommandLineTools ];
      };

      mpv = super.mpv.override { swiftSupport = true; };
    }
2020-02-06 14:15:35 +01:00
Daiderd Jordan
6567823996
stdenv: introduce appleSdkVersion and macosVersionMin 2020-01-31 21:52:11 +01:00
hlolli
78b34b5e5b
graalvm8: 19.1.1 -> 19.2.1
- - nixpkgs now with full darwin support
2020-01-18 16:43:03 +01:00
Frederik Rietdijk
bc18cc72dd
Merge pull request #77610 from LnL7/darwin-stdenv-python3
darwin-stdenv: bootstrap with python3
2020-01-15 09:24:57 +01:00
Daiderd Jordan
c05efedd4d
darwin.iproute2mac: explicitly use python2 2020-01-13 11:41:23 +01:00
Daiderd Jordan
da6bc4b4cb
darwin.libtapi: python2 -> python3 2020-01-13 11:41:23 +01:00
Daiderd Jordan
73db5d8c38
darwin.apple_sdk: python2 -> python3 2020-01-13 11:13:57 +01:00
Daiderd Jordan
453e009947
darwin.CF: python2 -> python3 2020-01-13 11:13:06 +01:00
Daiderd Jordan
c7d457c9da
darwin.xnu: python2 -> python3 2020-01-13 11:13:01 +01:00
Vladimír Čunát
5c780036c5
Merge branch 'master' into staging-next
The nss rebuild isn't so small.
2020-01-08 22:48:13 +01:00
squalus
9314327dee keepassxc: fix darwin build
- Removed the unnecessary libmicrohttpd dependency, which doesn't
  build on macOS. KeepassXC removed this dependency in 2.1.2
- Fixed a compiler error related to the Touch ID feature by adding a
  dependency on the LocalAuthentication framework
2020-01-08 16:44:14 +01:00
Greg Pevnev
a17dbd86ad
reattach-to-user-namespace: 2.7 -> 2.8
Add macOS Catalina (10.15) "support".
2020-01-08 13:50:08 +03:00
Matthew Bauer
04000331c1
Merge pull request #74284 from matthewbauer/ios-with-xcode-11
Update iOS for XCode 11
2020-01-03 15:35:41 -05:00
Matthew Bauer
9c1a2ac51e Merge remote-tracking branch 'origin/master' into ios-with-xcode-11 2020-01-03 15:34:20 -05:00
Matthew Bauer
8b41b16a9f cctools: fixup gnu-config detection 2020-01-03 15:20:55 -05:00
Matthew Bauer
6f8b2f3961 cctools: only add libtool on native builds
libtool is not really needed and it interferes with
updateAutotoolsGnuConfigScriptsHook. So remove it when
cross-compiling, but leave it in native to preserve hashes.
2020-01-03 15:20:54 -05:00
Matthew Bauer
010d2f4aa2 lib/systems: use newer ios sdk 2020-01-03 15:20:54 -05:00
Matthew Bauer
3432b1baa8 xcode: don’t use libstdc++ on iOS
Apple no longer ships with it, so best to avoid forcing it into use.
2020-01-03 15:19:34 -05:00
John Ericson
28c37155d7 xcode: Add more hashes, and fix some old ones 2020-01-03 15:19:08 -05:00
Robin Gloster
edfdd0f3e4
darwin: use dontUnpack instead of phases 2019-12-31 01:24:10 +01:00
Robin Gloster
bb2a6f7396
treewide: structured attrs fixes 2019-12-31 00:51:41 +01:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Daiderd Jordan
d5d8b3514d darwin.CF: fix retry condition (close PR #75528)
Using a function in an if condition when set -e is set doesn't seem to
break out or return false which means the workaround from 41ca86129f
never gets triggered.
2019-12-12 08:16:32 +01:00
Denis Redozubov
7233afc886 apple_sdk: broken link update (#73984) 2019-11-27 14:17:43 -05:00
Matthew Bauer
fa383dcb7c cctools: fixup gnu-config detection
Use autoreconfHook instead of preConfigure autogen.sh. This avoids
getting the bad version of the gnu-config script and makes the newish
iOS triples work.
2019-11-27 10:04:32 -05:00
Matthew Bauer
848d4a08a0 cctools: readd ld-rpath-nonfinal patch
This patch is needed to build ghc, which adds -rpath flags for some
reason. Updated patch for newest cctools and reapplied.
2019-11-27 10:01:57 -05:00
Matthew Bauer
08d6c4019d Merge remote-tracking branch 'origin/staging' into dnicponski/scratch/update_darwin_cctools 2019-11-25 22:00:13 -05:00
Matthew Bauer
0c6a0c817a cctools: only add libtool on native builds
libtool is not really needed and it interferes with
updateAutotoolsGnuConfigScriptsHook. So remove it when
cross-compiling, but leave it in native to preserve hashes.
2019-11-25 21:57:56 -05:00
Matthew Bauer
f0f4f90847 libtapi: bump to 1000.10.8 2019-11-25 21:57:39 -05:00
John Ericson
6d3b7458cc
Merge pull request #74065 from Ericson2314/cc-versions
compilers, binutils: Add version and pname
2019-11-24 18:35:13 -05:00
John Ericson
ef328622e0 cctools, darwin biutils: Use pname and version 2019-11-24 18:36:40 +00:00
Dave Nicponski
7b77c09e40 darwin.cctools: 895 -> 927.0.2
Update the version of `cctools` on darwin.  The older version fails
to work on some modern packages, such as `bazel 1.1`.
2019-11-19 09:20:13 -05:00
Daiderd Jordan
41ca86129f
darwin.CF: workaround intermittent CFRuntime.c failures
Based on testing this issue seems to only occur with clang_7, so
we should be able to revert this when the default llvm versions are
updated.

Fixes #66811
2019-11-17 14:55:00 +01:00
John Ericson
f1481f2c90 apple-sdk setup hooks: NIX_CFLAGS_COMPILE may be undefined 2019-11-08 13:28:59 -05:00
John Ericson
beda0365a6 darwin private frameworks setup hook: NIX_CFLAGS_COMPILE may be undefined 2019-11-08 13:24:20 -05:00
Jason Felice
e4c34f2db4 osxsnarf: init at 0.1.0 2019-10-30 08:57:59 -07:00
volth
8276314608 treewide: fix string escapes 2019-09-16 22:15:38 +00:00
Nikita Voloboev
8b75a0a25f wifi-password: init at 0.1.0 (#68373)
* wifi-password: init at 0.1.0

* Apply suggestions from code review

Co-Authored-By: symphorien <symphorien@users.noreply.github.com>
2019-09-10 00:40:05 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
Frederik Rietdijk
98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
volth
35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Robin Gloster
64f6a951eb
darwin.network_cmds: pin to openssl 1.0.2 2019-08-26 01:31:10 +02:00
Frederik Rietdijk
fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Robert Winslow
e91d400dff darwin.adv_cmds: Fix fetchzip call by using https not http (#64546) 2019-08-14 10:24:34 -04:00
Frederik Rietdijk
7cf5909fad Merge staging-next into staging 2019-07-09 15:44:08 +02:00
Eric Norris
de9bf55774
smimesign: init at v0.0.13 2019-07-04 12:43:43 -04:00
Daiderd Jordan
4e7695fc69
darwin.trash: remove cf-private 2019-07-03 22:20:23 +02:00
Daiderd Jordan
8ea702a484
darwin-frameworks: add import CoreFoundation to CoreServices 2019-07-03 22:20:09 +02:00
Daiderd Jordan
73d9cac377
darwin-frameworks: replace cf-private and move it's setup-hook
The only remaining use-case for cf-private are symbols that are not
available in the opensource build.  This generally solved the problem
because of it's setup-hook.
2019-07-03 22:20:09 +02:00
Daiderd Jordan
c2b76fa13c
darwin-frameworks: remove CF
CoreFoundation is included by the stdenv, moving the decision of what
version should be used there makes it possible to override it entirely
rather then prepending flags like cf-private does which can be
unreliable.
2019-07-03 22:20:04 +02: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
4e22fe4f63 apple-sdk: add MetalKit 2019-06-23 18:28:36 -04:00
Mario Rodas
2932be89af
Merge pull request #63051 from marsam/init-noah
noah: init at 0.5.1
2019-06-22 13:18:45 -05:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Mario Rodas
7b2325622a
noah: init at 0.5.1 2019-06-12 21:30:00 -05: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
Daiderd Jordan
6b363b3717
chunkwm: init at 0.4.9 2019-06-07 22:15:53 +02:00
Benjamin Esham
6586effe96 trash: 0.9.1 -> 0.9.2 2019-06-04 15:58:40 -04:00
Renaud
2fb1b3156f
Merge pull request #60932 from c0bw3b/patches-cleanup
[treewide] delete (some) unused patches
2019-05-07 23:34:04 +02:00
c0bw3b
9cb260d091 [treewide] delete unused patches 2019-05-04 19:52:24 +02:00
Matthew Bauer
87944c3125
Merge pull request #56744 from matthewbauer/macos-10-12
Update macOS to 10.12
2019-04-26 22:20:03 -04:00
Matthew Bauer
d1f988ca3c darwin: correct framework dependency
AudioUnit depends on AudioToolbox now, so use that to keep
compatibility.
2019-04-26 21:55:03 -04:00
Matthew Bauer
43cda1b854 apple-sdk: add Metal framework for QuartzCore 2019-04-26 21:54:56 -04:00
Matthew Bauer
9d2326c622 Libsystem: get os/{log,trace,activity}.h from darling
This is the only place I can find the headers.
2019-04-26 21:54:56 -04:00
Matthew Bauer
4faa8d0238 cctools: add patch for apfs 2019-04-26 21:54:55 -04:00
Matthew Bauer
9da646ed29 darwin.xnu: install os/log.h file in Libsystem 2019-04-26 21:54:55 -04:00
Matthew Bauer
e3a9b1ea23 apple-sdk: Foundation needs cf-private 2019-04-26 21:54:54 -04:00
Matthew Bauer
4903e825fa apple-sdk: update frameworks location
Some have been removed like:

- DrawSprocket
- DVComponentGlue
2019-04-26 21:54:53 -04:00
Matthew Bauer
565f28fba7 Libsystem: add os/availability.h 2019-04-26 21:54:53 -04:00
Matthew Bauer
dc483505d4 cf-private: don’t use private sdk
no private sdk is available for 10.12.
2019-04-26 21:54:51 -04:00
Matthew Bauer
8cabf4d5c5 treewide: rename llvm-dsymutil to dsymutil
This is a change introduced between llvm 5 and llvm 7.
2019-04-26 21:54:50 -04:00
Matthew Bauer
7f08b28bbf Revert "Revert "cctools: bump to latest commit""
This reverts commit 0e78f2bd10.
2019-04-26 21:54:47 -04:00
Matthew Bauer
36450d8d0b cctools: enable tapi everywhere
Gets us closer to #19906.
2019-04-26 21:54:46 -04:00
Matthew Bauer
f76c7b8fab libtapi: init
(cherry picked from commit 69347697d3336d4b6add8276d9f75daf6f0cacf3)
2019-04-26 21:54:46 -04:00
Joachim F
50833cdc62
Merge pull request #53863 from thefloweringash/osxfuse
osxfuse: init at 3.8.3
2019-04-21 07:42:08 +00:00
Matthew Bauer
d69cc779b5 Revert "Revert "darwin 10.12 commits""
This reverts commit 8505e710e7.
2019-04-20 23:17:04 -04:00
Vladimír Čunát
8d502fd425
Merge branch 'staging-next' into staging 2019-03-10 08:05:27 +01:00
Matthew Bauer
1e7bac9401 xcode-sdk-pkgs: add sdk to extraPackages
this gives you access to libraries like Foundation.
2019-03-09 18:12:25 -05:00
Matthew Bauer
8a08d7e7cc
Merge pull request #56031 from matthewbauer/priorities
Add some more priorities
2019-03-09 18:02:55 -05:00
Frederik Rietdijk
2fcb11a244 Merge staging-next into master 2019-03-01 09:06:20 +01:00
Jörg Thalheim
dadc7eb329
treewide: use runtimeShell instead of stdenv.shell whenever possible
Whenever we create scripts that are installed to $out, we must use runtimeShell
in order to get the shell that can be executed on the machine we create the
package for. This is relevant for cross-compiling. The only use case for
stdenv.shell are scripts that are executed as part of the build system.
Usages in checkPhase are borderline however to decrease the likelyhood
of people copying the wrong examples, I decided to use runtimeShell as well.
2019-02-26 14:10:49 +00:00
Vladimír Čunát
71f4ba29a3
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1506218
2019-02-22 17:51:01 +01:00
Michael Raskin
a059fc7420
Merge pull request #56067 from oxij/tree/fetchurl-boot
treewide: assemble all `fetchurlBoot` uses in overrides to `fetchurl`
2019-02-21 09:43:11 +00:00
Frederik Rietdijk
e2cd07b997 Merge staging-next into staging 2019-02-21 07:54:33 +01:00
Vladimír Čunát
32767d139f
Merge branch 'staging-next'
This round is without the systemd CVE,
as we don't have binaries for that yet.
BTW, I just ignore darwin binaries these days,
as I'd have to wait for weeks for them.
2019-02-20 09:38:45 +01:00
Jan Malakhovski
a1fec8667d treewide: assemble all fetchurlBoot uses in overrides to fetchurl itself
The only outside-curl uses of `fetchurlBoot` left are `stdenv`
and `apple-source-releases`. The latter one can probably be removed
too, but I can't test it.

Pros:

- Aggregates all behind-the-scenes insanity in a single place.

Cons:

- At the cost of 10 more derivations (but 0 new outpaths).
2019-02-19 20:55:59 +00:00
Matthew Bauer
e3ca9d954e
Merge pull request #56029 from matthewbauer/revert-cctools-bump
Revert cctools bump
2019-02-19 11:44:17 -05:00
Vladimír Čunát
424efc7e71
Merge branch 'staging-next' into staging 2019-02-19 11:08:32 +01:00
Matthew Bauer
a4fbfe4217 darwin.binutils: set low priority 2019-02-18 21:09:14 -05:00
Matthew Bauer
c5639650b8 darwin.binutils: add myself as maintainer 2019-02-18 20:56:09 -05:00
Matthew Bauer
5464dbe40a cctools: add myself as maintainer 2019-02-18 20:45:35 -05:00
Matthew Bauer
0e78f2bd10 Revert "cctools: bump to latest commit"
This reverts commit ac682e362c.

This broke iOS building on master. Even Xcode 8.2 comes with TAPI
librarises. We need these patches to support those .tbd files.
Eventually we will move to using libtapi directly, but I have not
finished work on this right now.

Unfortunately, this will not have my changes for building cctools with
manpages. We will have to do this update at some later time.
2019-02-18 20:44:19 -05:00
Daiderd Jordan
b4ea47749a
darwin: remove references to Ubiquity.framework
It was removed on recent versions of macOS and these entries break
sandboxing if they don't exist.

	Aborted: while setting up the build environment: getting attributes of path '/System/Library/PrivateFrameworks/Ubiquity.framework/Versions/A/Ubiquity': No such file or directory
2019-02-17 15:30:30 +01:00
Daiderd Jordan
97c05bda52
darwin.architecture: fix sandbox build
Re-applies bad2db31b7.

This reverts commit f84aef11a4.
2019-02-17 10:11:25 +01:00
Daiderd Jordan
f84aef11a4
Revert "darwin.architecture: fix sandbox build"
Moving changes to staging, this is a mass-rebuild.

This reverts commit e79278e4cd.
2019-02-17 10:03:26 +01:00
Daiderd Jordan
e79278e4cd
darwin.architecture: fix sandbox build 2019-02-14 21:36:04 +01:00
Daiderd Jordan
051fcba987
swift-corefoundation: fix sandboxed build 2019-02-12 00:29:28 +01:00
Matthew Bauer
5f106e8aae darwin.xcode: update hashes 2019-01-25 16:37:37 -05:00
Andrew Childs
6300e62fd4 osxfuse: init at 3.8.3 2019-01-13 14:55:46 +09:00
Dmitry Kalinkin
1a7e65e146
adv_cmds: switch url to use https
warning: unable to download 'http://opensource.apple.com/tarballs/adv_cmds/adv_cmds-158.tar.gz': HTTP error 302 (curl error: Couldn't connect to server); retrying in 298 ms
2019-01-09 21:46:58 -05:00
Jorge Acereda
7dafdc1400 darwin: basic_cmds was installing binaries in the wrong path 2019-01-08 22:43:45 +01:00
Matthew Bauer
ed6148726b darwin: fix more *_cmds derivation
Doh
2019-01-06 22:34:19 -06:00
Matthew Bauer
2bbec30c2e darwin.diskdev_cmds: fix build with dsymutil
xcbuild doesn’t handle dsymutil correctly. fuser.pl does not contain
debug symbols, but xcbuild doesn’t handle this like xcodebuild does.
So, just disable the debug information. We probably should do this in
more places using xcbuild, but it requires some arbitrary patching.
2019-01-06 22:13:11 -06:00
Matthew Bauer
030f66400d darwin.adv_cmds: fix build 2019-01-04 10:28:22 -06:00
Matthew Bauer
8cb2d35760 darwin: fix typos in install scripts
fixes some issues in my commits in:

- basic_cmds
- network_cmds

(cherry picked from commit f283145308)
2019-01-03 15:20:26 -06:00
Matthew Bauer
8505e710e7 Revert "darwin 10.12 commits"
Reverts commits bumping to macOS stuff to 10.12:

commit ec1f78d1cb.
commit d0dc91d24f.
commit a1d297374d.
commit 425112151d.
commit e6f7f2928f.
2019-01-03 15:20:26 -06:00
Matthew Bauer
ec1f78d1cb darwin.libunwind: fix hash 2018-12-30 00:00:30 -06:00
Matthew Bauer
4f522648cb darwin: fix *_cmds installation
These just copy commands from Products/Release/. But with #52256 we
now build .dsym directories that somehow wind up in Products/Release/.
This makes things more exact by just copying the files in Products/Release/.
2018-12-29 23:58:10 -06:00
Matthew Bauer
d0dc91d24f darwin: bump apple_sdks to 10.12
(cherry picked from commit 0b468bf033)
2018-12-29 20:17:05 -06:00
Matthew Bauer
a1d297374d darwin.hfs: put headers in hfs/ directory
This is where they are supposed to go. My mistake in the original
commit.
2018-12-27 11:18:28 -06:00
Matthew Bauer
425112151d
darwin: remove missing symbols
these symbols are not needed apparently
2018-12-19 23:46:06 -06:00
Matthew Bauer
59ec6b559d
Merge pull request #52256 from matthewbauer/52148-fix
Provide real dsymutil to darwin stdenv
2018-12-18 10:00:24 -06:00
Matthew Bauer
d1dfc92187
Merge pull request #47678 from matthewbauer/landmarks
Update macOS frameworks to 10.12
2018-12-18 09:59:44 -06:00
Matthew Bauer
e6f7f2928f darwin: 10.11 → 10.12
Lots of stuff has gotten moved around. Many security libraries have been merged
into the Security monorepo. I’ve cleared them out for now, we will
need to modify Security to build them!

This also moves some things around to more clearly separate
bootstrapping the stdenv from everything else. We want the “normal”
mode to be the non-bootstrapped version. When you ask for “Security”,
you want the actual built software, not a crippled one.

- Add TARGET_OS_OSX to darwin.libSystem. Looks like something
  introduced in 10.12. TARGET_OS_MAC is only set when building for
  desktop (iOS will have TARGET_OS_MAC set)
- Bump darwin.dtrace
- Bump darwin.libpthread
- Remove SmartCardServices, libsecurity*, etc.
- Install some more headers for darling.
2018-12-17 00:07:09 -06:00
Matthew Bauer
0a996c8ef3 darwin: use llvm’s dsymutil instead of dummy version
We were previously using a dummy wrapper for dsymutil. This meant that
debug symbols were not getting generated when dsymutil was otherwise
available. This should fix that issue & provide a real dsymutil from
llvm.

Fixes #52148.
2018-12-15 12:26:11 -06:00
Matthew Bauer
9564b8ed9e cctools: don’t depend on clang at runtime
--disable-clang-as flag disables the use of clang by cctools-port
2018-12-10 17:31:47 -06:00
Jörg Thalheim
b2c86f46d9
Merge pull request #51549 from yurrriq/update/os-specific/darwin/skhd
skhd: 0.2.2 -> 0.3.0
2018-12-05 12:02:46 +00:00
Eric Bailey
aad111f567
skhd: 0.2.2 -> 0.3.0 2018-12-04 22:15:51 -06:00
Matthew Bauer
5e06294276 darwin/libiconv: fix static/shared logic
The conditional was incorrect - postInstall script should only hsppen
when enableShared = true.
2018-12-04 21:13:24 -06:00
Frederik Rietdijk
7863aae5b2 Merge master into staging-next 2018-11-11 08:59:44 +01:00
Frederik Rietdijk
53d00c3351 Merge master into staging-next 2018-11-10 11:08:54 +01:00
Daiderd Jordan
ee1c6f62f8
darwin.trash: add cf-private
Undefined symbols for architecture x86_64:
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in trash-571f39.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in trash-571f39.o
      "_OBJC_CLASS_$_NSUserDefaults", referenced from:
          objc-class-ref in trash-571f39.o
          objc-class-ref in HGCLIUtils-31f3b3.o
    ld: symbol(s) not found for architecture x86_64
2018-11-07 19:15:43 +01:00
Daiderd Jordan
f2fadc0e91
darwin: don't include cf-private in framework dependencies
Using cf-private can cause problems, it's better to include it
explicitly in places where it's actually required.
2018-11-05 00:24:04 +01:00
Matthew Bauer
bda626e3f0
Merge pull request #49371 from matthewbauer/cctools-bump
cctools: bump to latest commit
2018-10-28 21:03:34 -05:00
Matthew Bauer
ac682e362c cctools: bump to latest commit
Lots of our patches are no longer needed. This simplifies things a
bunch. In addition, it now includes man pages.
2018-10-28 16:44:05 -05:00
Nikita Voloboev
dd9e60f75e
goku: init 0.1.11 2018-10-27 16:15:36 +01:00
Daiderd Jordan
0fcd2ca7b2
darwin.cf-private: include headers from osx_private_sdk
This includes things like CFURLGetFSRef which are not part of the
swift-corelibs CoreFoundation.
2018-10-24 12:04:05 +02:00
Daiderd Jordan
d856710c1f reattach-to-user-namespace: 2.6 -> 2.7 (#48283)
Adds macOS Mojave (10.14) support.
2018-10-12 22:31:43 +02:00
John Ericson
7319013ea1 Merge remote-tracking branch 'upstream/master' into staging 2018-09-18 16:55:42 -04:00
Dan Peebles
110c252870 cctools: support LTO on Darwin
LTO is disabled during bootstrap to keep the bootstrap tools small and
avoid unnecessary LLVM rebuilds, but is enabled in the final stdenv
stage and should be usable by normal packages.
2018-09-16 02:12:11 -04:00
Dan Peebles
4efd4053ed stdenv/darwin: integrate a new CoreFoundation
This also updates the bootstrap tool builder to LLVM 5, but not the ones
we actually use for bootstrap. I'll make that change in a subsequent commit
so as to provide traceable provenance of the bootstrap tools.
2018-09-15 16:05:46 -04:00
Uli Baum
4795c2a23a darwin.maloader: mark as broken
no successfull build in Hydra history back to 2017-08-21
2018-09-08 20:08:34 +02:00
Dan Peebles
f223f417fa swift-corelibs.corefoundation: update and modernize
This actually makes it useful to the Darwin stdenv, which I'll soon be
adjusting to use this library
2018-09-08 03:08:16 -04:00
Shea Levy
18337f3ece
Merge branch 'no-toPath' 2018-09-06 08:09:53 -04:00
John Ericson
0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
Daiderd Jordan
ea1542e9ee
Merge pull request #43140 from LnL7/macos-10.14
darwin: fix Libsystem compatibility for macOS 10.14
2018-08-14 23:02:04 +02:00
Daiderd Jordan
54f901d346
Libsystem: remove version symbols
These no longer exist on 10.14

Fixes #42719
2018-08-12 00:32:18 +02:00
Matthew Bauer
52681db9a3 darwin.objc4: install Object.h header 2018-07-29 12:02:04 -04:00
Periklis Tsirakidis
09cfb65c99 skhd: bump 0.1.1 to 0.2.2 2018-07-25 11:19:27 +02:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Vladimír Čunát
0f01215203
Merge branch 'master' into staging-next
Hydra: ?compare=1468896
2018-07-14 18:15:30 +02:00
Jake Waksbaum
1dd67f1aef trash: f68ad25a -> 0.9.1 (#43361) 2018-07-11 21:07:22 +02:00
Matthew Bauer
0534ceac81 xcbuild: move setup hook to xcbuildHook
Not every package that needs xcbuild will want to use its build phase.
I have moved the xcbuild setup hook to the new attribute xcbuildHook.
This means that dontUseXcbuild is no longer needed. If you just need
to call xcbuild on its own you can just refer to xcbuild.
2018-07-09 17:13:58 -04:00
Daiderd Jordan
52b8b68e82
Libsystem: remove libsystem_network.dylib from reexport list
Fixes #42719
2018-07-07 11:42:50 +02:00
Matthew Bauer
f513d580b0
Merge pull request #43040 from matthewbauer/darwin-closure-reductions
Darwin stdenv tweaks
2018-07-05 14:34:54 -04:00
Matthew Bauer
c7ab795274 darwin.security_tool: disallow requiring sdk
As requested by @domenkozar
2018-07-04 15:08:35 -04:00
Matthew Bauer
d7591c44f0 apple_sdk.frameworks.Ruby: remove
This was broken & apparently unused.
2018-07-04 15:01:00 -04:00
Matthew Bauer
f7138342cb libiconv: use enableFeature for static/shared
This makes things more predictable w.r.t. what is actually being built.
2018-07-03 16:51:30 -04:00
Matthew Bauer
d568d5016a libsecurity: set NDEBUG
This prevents debugging stuff from coming into play. This avoids some
headers from accidentally winding up in the .dylib file.
2018-07-02 17:51:38 -04:00
Matthew Bauer
db414a2f5e xpc: copy instead of linking to sdk
This prevents the apple sdk from coming into security tool

Fixes #42836
2018-07-02 17:51:38 -04:00
Matthew Bauer
907d7518d8 darwin.libsecurity: switch to multiple outputs 2018-07-02 17:51:38 -04:00
Matthew Bauer
526103a82d darwin: fix syntax in makeFlagsArray
the double ’ should only be needed when using the braces. Otherwise
this will mess up some syntax highlighting, unfortunately, including nix-mode.
2018-07-02 17:51:38 -04:00
Matthew Bauer
e686bd2771 xcode: default to 8.2
There is some weird issue with 9.4 that needs to be resolved. 8.2 is
used by iOS anyway so that makes it easier.
2018-06-28 10:24:09 -04:00
Matthew Justin Bauer
fe9f4abec2
libsecurity_generic: fix apple_sdk lookup
apple_sdk is now multiple output.
2018-06-26 13:25:06 -04:00
Matthew Justin Bauer
e4d9ce9061
Merge pull request #42599 from obsidiansystems/xcodever-in-system
xcode: add xcodePlatform to system
2018-06-26 10:56:57 -04:00
Matthew Bauer
0bfffbc5e1 xcode: add xcodePlatform to system
This give us a little bit more control over what target we are using.
Eventually we can target other things like WatchOS or MacOS.
2018-06-25 22:18:23 -04:00
Matthew Justin Bauer
c16eb04425
Merge pull request #42399 from obsidiansystems/xcodever-in-system
xcode: add xcodeVer to system
2018-06-25 21:59:01 -04:00
Matthew Bauer
9b0b31d981 xcode: add xcodeVer to system
This version number controls which xcode version to use when building
cross to iOS.
2018-06-25 21:57:24 -04:00
Matthew Bauer
73e2f60837 libiconv: add "enableShared" option
When false, shared libraries will be disabled.

also adds patch to *really* disable shared libiconv.
2018-06-25 17:10:11 -04:00
Frederik Rietdijk
48110c1295 Merge staging into master 2018-06-22 13:20:37 +02:00
Matthew Bauer
3da395fd96 xcode: add 9.4 sdk
This is the newest sdk. I have skipped 9.3 for now but someone can
certainly add it if they need it for some reason.

Also I added a generic "xcode" that will always point to the newest
xcode that is available in Nixpkgs.
2018-06-21 13:24:52 -04:00
Frederik Rietdijk
ae215d1ba8 Merge master into staging 2018-06-10 10:10:42 +02:00
Florian Klink
dcdeaa1a24 darwin.iproute2mac: wrap network_cmds 2018-06-09 23:12:16 +02:00
Florian Klink
857ab32cca darwin.iproute2mac: init at 1.2.1 2018-06-09 22:47:21 +02:00
Matthew Bauer
06fa867498 apple_sdk: use multiple outputs 2018-06-09 00:05:38 -04:00
Matthew Justin Bauer
a1b5b1a660
xcode: update Xcode URL
Apple has changed this location. Now the url should look like:

https://developer.apple.com/services-account/download?path=/Developer_Tools/Xcode_8.2/Xcode_8.2.xip
2018-06-08 10:27:40 -04:00
Matthew Justin Bauer
3ebcac8d85
darwin.libiconv: use static library
This is necessary to get stuff into the Apple App Store for iOS. Apple does not really like using dynamic libraries in iOS. Also the libcharset thing is apparently a "private" symbol.

See https://github.com/reflex-frp/reflex-platform/pull/307 for more details.

See 3dee596ed1 (diff-261d74054a31954b7c6175e2e7e28356) for discussion
2018-06-07 10:53:02 -04:00
Matthew Bauer
050557ef8a PowerManagement: init at 572.50.1 2018-05-31 12:36:23 -04:00
Matthew Bauer
279fd72b33 darwin.ICU: fix cctools 2018-05-31 12:34:15 -04:00
Alexandre Esteves
129dfedaa9 xcode: remove extra quote from message (#41286) 2018-05-30 23:10:48 +02:00
Jan Malakhovski
ad35019501 Merge branch 'master' into staging
Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master
2018-05-26 00:20:17 +00:00
Alexandre Esteves
3ab9caa3fa
Use requireFile for impure Xcode dependency 2018-05-23 20:32:15 +01:00
Matthew Justin Bauer
89e196d971
libiconv: fix setup hook
Fixes issue from PR #40139.
2018-05-23 13:09:45 -05:00
John Ericson
18742471af Merge remote-tracking branch 'upstream/master' into staging
Use newer vagrant from master
2018-05-23 09:40:37 -04:00
John Ericson
266adab32d cctools: Remove a bunch of stuff no longer needed for Linux 2018-05-23 09:22:19 -04:00
Shea Levy
6da6accd30
treewide: Remove uses of builtins.toPath.
toPath has confusing semantics and is never necessary; it can always
either just be omitted or replaced by pre-concatenating `/.`. It has
been marked as "!!! obsolete?" for more than 10 years in a C++
comment, hopefully removing it will let us properly deprecate and,
eventually, remove it.
2018-05-22 16:42:02 -04:00
Vladimír Čunát
392e6de7d0
Merge branch 'master' into staging 2018-05-20 13:20:53 +02:00
Eric Bailey
84919cd3ef
m-cli: init at 0.2.5 2018-05-19 13:52:42 -05:00
John Ericson
ddbe9191ef Merge remote-tracking branch 'upstream/master' into staging
Keep the dontCheck because the test suite fails, get rid of the LDFLAGS
hack because we don't need it!
2018-05-16 15:16:08 -04:00
John Ericson
4956767f53 Make libiconv build for iOS with prefixed tools 2018-05-16 14:25:54 -04:00
Daiderd Jordan
f14841f3ce
Revert "darwin.libSystem: multiple outputs"
Broke the stdenv.

This reverts commit 69d1b7ab79.
2018-05-13 10:01:52 +02:00
Matthew Bauer
326d0bf2aa darwin.libSystem: cleanup
We don’t want to rely on a certain output so just use ‘getDev’ so Nix
will choose the right output for us.
2018-05-12 10:03:48 -05:00
Matthew Bauer
d000198ab7 darwin.architecture: correctly install headers
I’m not going to fix all of them but this is the best way to do this
in Apple things. Just add ‘EXPORT_DSTDIR’ to the installFlags & set
‘DSTDIR’ to $(out). Please do this instead of the patching!
2018-05-12 10:02:30 -05:00
John Ericson
ee4b56edd3 Merge remote-tracking branch 'upstream/master' into staging 2018-05-11 14:36:08 -04:00
Alexandre Esteves
cb44120b81 Fix typo 2018-05-11 14:41:24 +01:00
Matthew Justin Bauer
73833ee446
darwin.architecture: add postPatch back in
I didn't think it was even being called before, but now getting this error:

https://hydra.nixos.org/build/73955984/nixlog/1
2018-05-11 08:14:21 -05:00
Periklis Tsirakidis
b12850d421 skhd: Bump 0.0.14 to 0.1.1 2018-05-10 20:57:45 +02:00
Matthew Bauer
6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
Matthew Justin Bauer
1c87d77efe
ppp: add dontBuild = true
Hopefully this is the last one.
2018-05-07 12:47:07 -05:00
Matthew Bauer
9811bf2258 treewide: cleanup phases from last commit
The last commit broken Darwin stdenv. We still need to skip some
phases when Apple provides a Makefile that shouldn’t be used.
2018-05-06 16:07:55 -05:00
Matthew Justin Bauer
295815bec7 treewide: Remove phases 2018-05-06 07:20:03 +00:00
Matthew Justin Bauer
5f65ec3f22
Merge pull request #39940 from matthewbauer/work
macOS closure-size reduction
2018-05-06 04:27:02 +00:00