3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

681 commits

Author SHA1 Message Date
Ben Siraphob 16d91ee628 pkgs/os-specific: stdenv.lib -> lib 2021-01-17 23:26:08 +07:00
Monson Shao 5f1d105505
darwin: add impure-cmds
On darwin, there are some commands neither opensource nor able to build in nixpkgs.
We have no choice but to use those system-shipped impure ones.
2021-01-17 23:44:40 +08:00
Monson Shao b9be1501fe
darwin.libauto: mark broken and drop stdenv.lib 2021-01-14 01:21:59 +08:00
Monson Shao 5f6e6516e0
darwin.hfs: mark broken 2021-01-13 19:05:21 +08:00
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
github-actions[bot] 581059aed4
Merge staging-next into staging 2021-01-04 00:57:38 +00:00
John Ericson f52263ced0 treewide: Start to break up static overlay
We can use use `stdenv.hostPlatform.isStatic` instead, and move the
logic per package. The least opionated benefit of this is that it makes
it much easier to replace packages with modified ones, as there is no
longer any issue of overlay order.

CC @FRidh @matthewbauer
2021-01-03 19:18:16 +00:00
Ben Siraphob b04fc593e7 treewide: cmake buildInputs to nativeBuildInputs, minor cleanups 2021-01-01 11:52:33 +07: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 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
Andrew Childs 34c8fae439 darwin/stdenv: tapi stub based bootstrap
Fixes bootstrapping on macOS Big Sur.
2020-12-22 11:43:54 +09:00
midchildan 10e8c6d323
libtapi: 1000.10.8 -> 1100.0.11
closes #106348
2020-12-21 00:55:58 +09:00
Sandro f097374754
Merge pull request #105938 from virusdave/dnicponski/scratch/add_osx-cpu-temp
osx-cpu-temp: Init at 1.0
2020-12-11 06:56:57 +01:00
Sandro Jäckel 848d1986b8
apple_sdk.frameworks.AVFoundation: Add missing MediaToolbox
This fixes:
/nix/store/7ckpydmlah3j86py3c4f27p0fbkxyzfi-apple-framework-AVFoundation/Library/Frameworks/AVFoundation.framework/Headers/AVAudioMix.h:15:9: fatal error: 'MediaToolbox/MTAudioProcessingTap.h' file not found
2020-12-09 20:10:59 +01:00
Sandro Jäckel eb1d742813
apple_sdk.frameworks.AVFoundation: Add missing CoreMedia
This fixes apple-framework-AVFoundation/Library/Frameworks/AVFoundation.framework/Headers/AVAsset.h:17:9: fatal error: 'CoreMedia/CMTime.h' file not found
2020-12-09 20:10:59 +01:00
Dave Nicponski 9fbe8cc64b osx-cpu-temp: Init at 1.0 2020-12-09 12:18:05 -05:00
Sandro 1a90114a95
Merge pull request #104192 from cmacrae/upgrade/yabai/3.3.4
yabai: 3.3.3 -> 3.3.4
2020-11-23 15:17:45 +01:00
Sandro a7fd3a21ca
Merge pull request #104191 from cmacrae/upgrade/spacebar/1.2.1
spacebar: 1.1.1 -> 1.2.1
2020-11-23 14:37:45 +01:00
cmacrae 69d9d5d88e
yabai: 3.3.3 -> 3.3.4 2020-11-18 17:14:53 +00:00
cmacrae d09c7c44a1
spacebar: 1.1.1 -> 1.2.1 2020-11-18 17:09:55 +00:00
Jason Lau 49325a0d7f reattach-to-user-namespace: 2.8 -> 2.9 2020-11-17 10:43:43 -08:00
Frederik Rietdijk 986c2d36da Merge master into staging-next 2020-11-16 09:01:53 +01:00
Frederik Rietdijk da6239dab3 Merge #98541 into staging-next 2020-11-14 09:19:31 +01:00
cmacrae 7fb1069a13
yabai: 3.3.0 -> 3.3.3 2020-11-13 14:47:11 +00:00
Andrew Childs f2b81a021e darwin/print-reexports: add an overview comment 2020-11-12 16:57:19 +09:00
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