diff options
Diffstat (limited to 'pkgs/os-specific/darwin')
32 files changed, 198 insertions, 466 deletions
diff --git a/pkgs/os-specific/darwin/apparency/default.nix b/pkgs/os-specific/darwin/apparency/default.nix index 0bae99c14b37e..d5f9a7be172b1 100644 --- a/pkgs/os-specific/darwin/apparency/default.nix +++ b/pkgs/os-specific/darwin/apparency/default.nix @@ -4,13 +4,18 @@ , undmg }: +let + snapshot = "20240601172844"; +in stdenv.mkDerivation { pname = "apparency"; - version = "1.5.1"; + version = "2.0"; src = fetchurl { - url = "https://web.archive.org/web/20230815073821/https://www.mothersruin.com/software/downloads/Apparency.dmg"; - hash = "sha256-JpaBdlt8kTNFzK/yZVZ+ZFJ3DnPQbogJC7QBmtSVkoQ="; + # Use externally archived download URL because + # upstream does not provide stable URLs for versioned releases + url = "https://web.archive.org/web/${snapshot}/https://www.mothersruin.com/software/downloads/Apparency.dmg"; + hash = "sha256-XKxWxqfxy9AQneILLrN9XqLt4/k2N8yumZ5mrSvczFk="; }; nativeBuildInputs = [ undmg ]; @@ -28,7 +33,7 @@ stdenv.mkDerivation { ''; meta = { - description = "The App That Opens Apps"; + description = "App That Opens Apps"; homepage = "https://www.mothersruin.com/software/Apparency/"; license = lib.licenses.unfreeRedistributable; maintainers = with lib.maintainers; [ Enzime ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 87fb8512fb646..206f46125b9bf 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -167,7 +167,7 @@ appleDerivation' stdenv { appleHeaders = builtins.readFile ./headers.txt; meta = with lib; { - description = "The Mac OS libc/libSystem (tapi library with pure headers)"; + description = "Mac OS libc/libSystem (tapi library with pure headers)"; maintainers = with maintainers; [ copumpkin gridaphobe ]; platforms = platforms.darwin; license = licenses.apple-psl20; diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 1bd574fe46a49..3eae8749c4e4d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -11,7 +11,6 @@ let }; "osx-10.12.6" = { xnu = "3789.70.16"; - libiconv = "50"; Libnotify = "165.20.1"; objc4 = "709.1"; dyld = "433.5"; @@ -38,7 +37,6 @@ let dtrace = "168"; xnu = "3248.60.10"; libpthread = "138.10.4"; - libiconv = "44"; Libnotify = "150.40.1"; objc4 = "680"; eap8021x = "222.40.1"; @@ -106,7 +104,6 @@ let }; "osx-10.9.5" = { launchd = "842.92.1"; - libauto = "185.5"; Libc = "997.90.3"; # We use this, but not from here Libsystem = "1197.1.1"; Security = "55471.14.18"; @@ -229,7 +226,7 @@ let pname = builtins.head (lib.splitString "/" namePath); appleDerivation' = stdenv: appleDerivation'' stdenv pname version sdkName sha256; appleDerivation = appleDerivation' stdenv; - callPackage = self.newScope { inherit appleDerivation' appleDerivation; }; + callPackage = self.newScope { inherit appleDerivation' appleDerivation; python3 = pkgs.buildPackages.python3Minimal; }; in callPackage (./. + "/${namePath}"); applePackage = namePath: sdkName: sha256: let @@ -261,7 +258,6 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { eap8021x = applePackage "eap8021x" "osx-10.11.6" "sha256-54P3+YhVhOanoZQoqswDnr/GbR/AdEERse135nyuIQo=" {}; IOKit = applePackage "IOKit" "osx-10.11.6" "" { inherit IOKitSrcs; }; launchd = applePackage "launchd" "osx-10.9.5" "sha256-dmV0UK7hG9wvTr+F4Z47nCFXcVZCV+cQ46WbE0DBtJs=" {}; - libauto = applePackage "libauto" "osx-10.9.5" "sha256-GnRcKq8jRbEsI/PSDphwUjWtpEIEcnLlQL9yxYLgSsU=" {}; Libc = applePackage "Libc" "osx-10.12.6" "sha256-LSsL7S3KFgGU9qjK4atu/4wBh8ftgfsk6JOvg+ZTZOY=" { Libc_10-9 = fetchFromGitHub { owner = "apple-oss-distributions"; @@ -272,7 +268,6 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { }; libclosure = applePackage "libclosure" "osx-10.11.6" "sha256-L5rQ+UBpf3B+W1U+gZKk7fXulslHsc8lxnCsplV+nr0=" {}; libdispatch = applePackage "libdispatch" "osx-10.10.5" "sha256-jfAEk0OLrJa9AIZVikIoHomd+l+4rCfc320Xh50qK5M=" {}; - libiconv = applePackage "libiconv" "osx-10.12.6" "sha256-ZzPFkchK3EU95UQUVVrR0t8iilhi/VnIkjjtP6KT2oI=" {}; Libinfo = applePackage "Libinfo" "osx-10.11.6" "sha256-6F7wiwerv4nz/xXHtp1qCHSaFzZgzcRN+jbmXA5oWOQ=" {}; Libm = applePackage "Libm" "osx-10.7.4" "sha256-KjMETfT4qJm0m0Ux/F6Rq8bI4Q4UVnFx6IKbKxXd+Es=" {}; Libnotify = applePackage "Libnotify" "osx-10.12.6" "sha256-6wvMBxAUfiYcQtmlfYCj1d3kFmFM/jdboTd7hRvi3e4=" {}; @@ -292,9 +287,7 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { ppp = applePackage "ppp" "osx-10.12.6" "sha256-M1zoEjjeKIDUEP6ACbpUJk3OXjobw4g/qzUmxGdX1J0=" {}; removefile = applePackage "removefile" "osx-10.12.6" "sha256-UpNk27kGXnZss1ZXWVJU9jLz/NW63ZAZEDLhyCYoi9M=" {}; xnu = if stdenv.isx86_64 then - applePackage "xnu" "osx-10.12.6" "sha256-C8TPQlUT3RbzAy8YnZPNtr70hpaVG9Llv0h42s3NENI=" { - python3 = pkgs.buildPackages.buildPackages.python3; # TODO(@Ericson2314) this shouldn't be needed. - } + applePackage "xnu" "osx-10.12.6" "sha256-C8TPQlUT3RbzAy8YnZPNtr70hpaVG9Llv0h42s3NENI=" {} else macosPackages_11_0_1.xnu; hfs = applePackage "hfs" "osx-10.12.6" "sha256-eGi18HQFJrU5UHoBOE0LqO5gQ0xOf8+OJuAWQljfKE4=" {}; Librpcsvc = applePackage "Librpcsvc" "osx-10.11.6" "sha256-YHbGws901xONzAbo6sB5zSea4Wp0sgYUJ8YgwVfWxnE=" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix index e4431c68c9aad..b642b993df0e3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -1,5 +1,5 @@ { lib, appleDerivation, xcbuildHook, Libc, stdenv, macosPackages_11_0_1, xnu -, fetchurl, libutil }: +, libutil }: let xnu-src = if stdenv.isAarch64 then macosPackages_11_0_1.xnu.src else xnu.src; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libauto/auto_dtrace.h b/pkgs/os-specific/darwin/apple-source-releases/libauto/auto_dtrace.h deleted file mode 100644 index bf367a3cabb3f..0000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/libauto/auto_dtrace.h +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Generated by dtrace(1M). - */ - -#ifndef _AUTO_DTRACE_H -#define _AUTO_DTRACE_H - -#include <unistd.h> - -#ifdef __cplusplus -extern "C" { -#endif - -#define GARBAGE_COLLECTION_STABILITY "___dtrace_stability$garbage_collection$v1$1_1_0_1_1_0_1_1_0_1_1_0_1_1_0" - -#define GARBAGE_COLLECTION_TYPEDEFS "___dtrace_typedefs$garbage_collection$v2$6175746f5f636f6c6c656374696f6e5f70686173655f74$6175746f5f636f6c6c656374696f6e5f747970655f74$6d616c6c6f635f7a6f6e655f74" - -#if !defined(DTRACE_PROBES_DISABLED) || !DTRACE_PROBES_DISABLED - -#define GARBAGE_COLLECTION_AUTO_BLOCK_LOST_THREAD_LOCALITY(arg0, arg1) \ -do { \ - __asm__ volatile(".reference " GARBAGE_COLLECTION_TYPEDEFS); \ - __dtrace_probe$garbage_collection$auto_block_lost_thread_locality$v1$766f6964202a$75696e7436345f74(arg0, arg1); \ - __asm__ volatile(".reference " GARBAGE_COLLECTION_STABILITY); \ -} while (0) -#define GARBAGE_COLLECTION_AUTO_BLOCK_LOST_THREAD_LOCALITY_ENABLED() \ - ({ int _r = __dtrace_isenabled$garbage_collection$auto_block_lost_thread_locality$v1(); \ - __asm__ volatile(""); \ - _r; }) -#define GARBAGE_COLLECTION_AUTO_REFCOUNT_ONE_ALLOCATION(arg0) \ -do { \ - __asm__ volatile(".reference " GARBAGE_COLLECTION_TYPEDEFS); \ - __dtrace_probe$garbage_collection$auto_refcount_one_allocation$v1$75696e7436345f74(arg0); \ - __asm__ volatile(".reference " GARBAGE_COLLECTION_STABILITY); \ -} while (0) -#define GARBAGE_COLLECTION_AUTO_REFCOUNT_ONE_ALLOCATION_ENABLED() \ - ({ int _r = __dtrace_isenabled$garbage_collection$auto_refcount_one_allocation$v1(); \ - __asm__ volatile(""); \ - _r; }) -#define GARBAGE_COLLECTION_COLLECTION_BEGIN(arg0, arg1) \ -do { \ - __asm__ volatile(".reference " GARBAGE_COLLECTION_TYPEDEFS); \ - __dtrace_probe$garbage_collection$collection_begin$v1$6d616c6c6f635f7a6f6e655f74202a$6175746f5f636f6c6c656374696f6e5f747970655f74(arg0, arg1); \ - __asm__ volatile(".reference " GARBAGE_COLLECTION_STABILITY); \ -} while (0) -#define GARBAGE_COLLECTION_COLLECTION_BEGIN_ENABLED() \ - ({ int _r = __dtrace_isenabled$garbage_collection$collection_begin$v1(); \ - __asm__ volatile(""); \ - _r; }) -#define GARBAGE_COLLECTION_COLLECTION_END(arg0, arg1, arg2, arg3, arg4) \ -do { \ - __asm__ volatile(".reference " GARBAGE_COLLECTION_TYPEDEFS); \ - __dtrace_probe$garbage_collection$collection_end$v1$6d616c6c6f635f7a6f6e655f74202a$75696e7436345f74$75696e7436345f74$75696e7436345f74$75696e7436345f74(arg0, arg1, arg2, arg3, arg4); \ - __asm__ volatile(".reference " GARBAGE_COLLECTION_STABILITY); \ -} while (0) -#define GARBAGE_COLLECTION_COLLECTION_END_ENABLED() \ - ({ int _r = __dtrace_isenabled$garbage_collection$collection_end$v1(); \ - __asm__ volatile(""); \ - _r; }) -#define GARBAGE_COLLECTION_COLLECTION_PHASE_BEGIN(arg0, arg1) \ -do { \ - __asm__ volatile(".reference " GARBAGE_COLLECTION_TYPEDEFS); \ - __dtrace_probe$garbage_collection$collection_phase_begin$v1$6d616c6c6f635f7a6f6e655f74202a$6175746f5f636f6c6c656374696f6e5f70686173655f74(arg0, arg1); \ - __asm__ volatile(".reference " GARBAGE_COLLECTION_STABILITY); \ -} while (0) -#define GARBAGE_COLLECTION_COLLECTION_PHASE_BEGIN_ENABLED() \ - ({ int _r = __dtrace_isenabled$garbage_collection$collection_phase_begin$v1(); \ - __asm__ volatile(""); \ - _r; }) -#define GARBAGE_COLLECTION_COLLECTION_PHASE_END(arg0, arg1, arg2, arg3) \ -do { \ - __asm__ volatile(".reference " GARBAGE_COLLECTION_TYPEDEFS); \ - __dtrace_probe$garbage_collection$collection_phase_end$v1$6d616c6c6f635f7a6f6e655f74202a$6175746f5f636f6c6c656374696f6e5f70686173655f74$75696e7436345f74$75696e7436345f74(arg0, arg1, arg2, arg3); \ - __asm__ volatile(".reference " GARBAGE_COLLECTION_STABILITY); \ -} while (0) -#define GARBAGE_COLLECTION_COLLECTION_PHASE_END_ENABLED() \ - ({ int _r = __dtrace_isenabled$garbage_collection$collection_phase_end$v1(); \ - __asm__ volatile(""); \ - _r; }) - - -extern void __dtrace_probe$garbage_collection$auto_block_lost_thread_locality$v1$766f6964202a$75696e7436345f74(const void *, uint64_t); -extern int __dtrace_isenabled$garbage_collection$auto_block_lost_thread_locality$v1(void); -extern void __dtrace_probe$garbage_collection$auto_refcount_one_allocation$v1$75696e7436345f74(uint64_t); -extern int __dtrace_isenabled$garbage_collection$auto_refcount_one_allocation$v1(void); -extern void __dtrace_probe$garbage_collection$collection_begin$v1$6d616c6c6f635f7a6f6e655f74202a$6175746f5f636f6c6c656374696f6e5f747970655f74(const malloc_zone_t *, auto_collection_type_t); -extern int __dtrace_isenabled$garbage_collection$collection_begin$v1(void); -extern void __dtrace_probe$garbage_collection$collection_end$v1$6d616c6c6f635f7a6f6e655f74202a$75696e7436345f74$75696e7436345f74$75696e7436345f74$75696e7436345f74(const malloc_zone_t *, uint64_t, uint64_t, uint64_t, uint64_t); -extern int __dtrace_isenabled$garbage_collection$collection_end$v1(void); -extern void __dtrace_probe$garbage_collection$collection_phase_begin$v1$6d616c6c6f635f7a6f6e655f74202a$6175746f5f636f6c6c656374696f6e5f70686173655f74(const malloc_zone_t *, auto_collection_phase_t); -extern int __dtrace_isenabled$garbage_collection$collection_phase_begin$v1(void); -extern void __dtrace_probe$garbage_collection$collection_phase_end$v1$6d616c6c6f635f7a6f6e655f74202a$6175746f5f636f6c6c656374696f6e5f70686173655f74$75696e7436345f74$75696e7436345f74(const malloc_zone_t *, auto_collection_phase_t, uint64_t, uint64_t); -extern int __dtrace_isenabled$garbage_collection$collection_phase_end$v1(void); - -#else - -#define GARBAGE_COLLECTION_AUTO_BLOCK_LOST_THREAD_LOCALITY(arg0, arg1) \ -do { \ - } while (0) -#define GARBAGE_COLLECTION_AUTO_BLOCK_LOST_THREAD_LOCALITY_ENABLED() (0) -#define GARBAGE_COLLECTION_AUTO_REFCOUNT_ONE_ALLOCATION(arg0) \ -do { \ - } while (0) -#define GARBAGE_COLLECTION_AUTO_REFCOUNT_ONE_ALLOCATION_ENABLED() (0) -#define GARBAGE_COLLECTION_COLLECTION_BEGIN(arg0, arg1) \ -do { \ - } while (0) -#define GARBAGE_COLLECTION_COLLECTION_BEGIN_ENABLED() (0) -#define GARBAGE_COLLECTION_COLLECTION_END(arg0, arg1, arg2, arg3, arg4) \ -do { \ - } while (0) -#define GARBAGE_COLLECTION_COLLECTION_END_ENABLED() (0) -#define GARBAGE_COLLECTION_COLLECTION_PHASE_BEGIN(arg0, arg1) \ -do { \ - } while (0) -#define GARBAGE_COLLECTION_COLLECTION_PHASE_BEGIN_ENABLED() (0) -#define GARBAGE_COLLECTION_COLLECTION_PHASE_END(arg0, arg1, arg2, arg3) \ -do { \ - } while (0) -#define GARBAGE_COLLECTION_COLLECTION_PHASE_END_ENABLED() (0) - -#endif /* !defined(DTRACE_PROBES_DISABLED) || !DTRACE_PROBES_DISABLED */ - - -#ifdef __cplusplus -} -#endif - -#endif /* _AUTO_DTRACE_H */ diff --git a/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix deleted file mode 100644 index 8a551dcc892ca..0000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib, stdenv, appleDerivation, libdispatch, Libsystem }: - -appleDerivation { - # these are included in the pure libc - buildInputs = lib.optionals stdenv.cc.nativeLibc [ libdispatch Libsystem ]; - - buildPhase = '' - cp ${./auto_dtrace.h} ./auto_dtrace.h - - substituteInPlace ThreadLocalCollector.h --replace SubZone.h Subzone.h - - substituteInPlace auto_zone.cpp \ - --replace "#include <msgtracer_client.h>" ''$'#include <asl.h>\nstatic void msgtracer_log_with_keys(...) { };' - - substituteInPlace Definitions.h \ - --replace "#include <System/pthread_machdep.h>" "" \ - --replace 'void * const, void * const' 'void * const, void *' - - # getspecific_direct is more efficient, but this should be equivalent... - substituteInPlace Zone.h \ - --replace "_pthread_getspecific_direct" "pthread_getspecific" \ - --replace "_pthread_has_direct_tsd()" "0" \ - --replace "__PTK_FRAMEWORK_GC_KEY0" "110" \ - --replace "__PTK_FRAMEWORK_GC_KEY1" "111" \ - --replace "__PTK_FRAMEWORK_GC_KEY2" "112" \ - --replace "__PTK_FRAMEWORK_GC_KEY3" "113" \ - --replace "__PTK_FRAMEWORK_GC_KEY4" "114" \ - --replace "__PTK_FRAMEWORK_GC_KEY5" "115" \ - --replace "__PTK_FRAMEWORK_GC_KEY6" "116" \ - --replace "__PTK_FRAMEWORK_GC_KEY7" "117" \ - --replace "__PTK_FRAMEWORK_GC_KEY8" "118" \ - --replace "__PTK_FRAMEWORK_GC_KEY9" "119" - - substituteInPlace auto_zone.cpp \ - --replace "__PTK_FRAMEWORK_GC_KEY9" "119" \ - --replace "__PTK_FRAMEWORK_GC_KEY0" "110" \ - - substituteInPlace Zone.cpp \ - --replace "_pthread_getspecific_direct" "pthread_getspecific" \ - --replace "__PTK_FRAMEWORK_GC_KEY9" "119" \ - --replace "__PTK_FRAMEWORK_GC_KEY0" "110" \ - --replace "__PTK_LIBDISPATCH_KEY0" "20" \ - --replace "struct auto_zone_cursor {" ''$'extern "C" int pthread_key_init_np(int, void (*)(void *));\nstruct auto_zone_cursor {' - - substituteInPlace auto_impl_utilities.c \ - --replace "# include <CrashReporterClient.h>" "void CRSetCrashLogMessage(void *msg) { };" - - c++ -I. -O3 -c -Wno-c++11-extensions auto_zone.cpp - cc -I. -O3 -Iauto_tester -c auto_impl_utilities.c - c++ -I. -O3 -c auto_weak.cpp - c++ -I. -O3 -c Admin.cpp - c++ -I. -O3 -c Bitmap.cpp - c++ -I. -O3 -c Definitions.cpp - c++ -I. -O3 -c Environment.cpp - c++ -I. -O3 -c Large.cpp - c++ -I. -O3 -c Region.cpp - c++ -I. -O3 -c Subzone.cpp - c++ -I. -O3 -c WriteBarrier.cpp - c++ -I. -O3 -c Zone.cpp - c++ -I. -O3 -c Thread.cpp - c++ -I. -O3 -c InUseEnumerator.cpp - c++ -I. -O3 -c auto_gdb_interface.cpp - c++ -I. -O3 -c PointerHash.cpp - c++ -I. -O3 -c ThreadLocalCollector.cpp - c++ -I. -O3 -c ZoneDump.cpp - c++ -I. -O3 -c ZoneCollectors.cpp - c++ -I. -O3 -c SubzonePartition.cpp - c++ -I. -O3 -c ZoneCollectionChecking.cpp - c++ -I. -O3 -c ZoneCompaction.cpp - c++ -I. -O3 -c BlockRef.cpp - - c++ -Wl,-no_dtrace_dof --stdlib=libc++ -dynamiclib -install_name $out/lib/libauto.dylib -o libauto.dylib *.o - ''; - - installPhase = '' - mkdir -p $out/lib $out/include - cp auto_zone.h auto_weak.h auto_tester/auto_tester.h auto_gdb_interface.h $out/include - cp libauto.dylib $out/lib - ''; - - meta = { - # libauto is only used by objc4/pure.nix , but objc4 is now using the impure approach, so we don't bother to fix this. - broken = true; - platforms = lib.platforms.darwin; - }; -} diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix deleted file mode 100644 index 6a3bddc211e95..0000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, appleDerivation, lib -, enableStatic ? stdenv.hostPlatform.isStatic -, enableShared ? !stdenv.hostPlatform.isStatic -}: - -appleDerivation { - postUnpack = "sourceRoot=$sourceRoot/libiconv"; - - preConfigure = lib.optionalString stdenv.hostPlatform.isiOS '' - sed -i 's/darwin\*/ios\*/g' configure libcharset/configure - ''; - - configureFlags = [ - (lib.enableFeature enableStatic "static") - (lib.enableFeature enableShared "shared") - ]; - - postInstall = lib.optionalString enableShared '' - mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib - ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib - - # re-export one useless symbol; ld will reject a dylib that only reexports other dylibs - echo 'void dont_use_this(){}' | ${stdenv.cc.bintools.targetPrefix}clang -dynamiclib -x c - -current_version 2.4.0 \ - -compatibility_version 7.0.0 -current_version 7.0.0 -o $out/lib/libiconv.dylib \ - -Wl,-reexport_library -Wl,$out/lib/libiconv-nocharset.dylib \ - -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib - ''; - - setupHooks = [ - ../../../../build-support/setup-hooks/role.bash - ../../../../development/libraries/libiconv/setup-hook.sh - ]; - - meta = { - mainProgram = "iconv"; - platforms = lib.platforms.darwin; - }; -} diff --git a/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix b/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix index b4a7bbc4df243..2de90a0236761 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix @@ -27,7 +27,6 @@ file_cmds = applePackage' "file_cmds" "321.40.3" "macos-11.0.1" "0p077lnbcy8266m hfs = applePackage' "hfs" "556.41.1" "macos-11.0.1" "0a0s6b12b0q07wslfifna0bj51dml9v098i4crr2m1vivnx4xj75" {}; libclosure = applePackage' "libclosure" "78" "macos-11.0.1" "0vf9n0k3m8dbprv1bf45zqg0g43bidy2i5z1v9a826bsf8lv7am7" {}; libdispatch = applePackage' "libdispatch" "1271.40.12" "macos-11.0.1" "1ck5srcjapg18vqb8wl08gacs7ndc6xr067qjn3ngx39q1jdcywz" {}; -libiconv = applePackage' "libiconv" "59" "macos-11.0.1" "0lwa4brdwm4lvrdnxylzsn1yph4m7csgri2zkc4xb4xiisz32pwp" {}; libmalloc = applePackage' "libmalloc" "317.40.8" "macos-11.0.1" "sha256-Tdhb0mq3w4Hwvp3xHB79Vr22hCOQK6h28HCsd7jvITI=" {}; libplatform = applePackage' "libplatform" "254.40.4" "macos-11.0.1" "1qf3ri0yd8b1xjln1j1gyx7ks6k3a2jhd63blyvfby75y9s7flky" {}; libpthread = applePackage' "libpthread" "454.40.3" "macos-11.0.1" "0zljbw8mpb80n1if65hhi9lkgwbgjr8vc9wvf7q1nl3mzyl35f8p" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix b/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix deleted file mode 100644 index 6a0c819a0a31a..0000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ stdenv, fetchapplesource, libauto, launchd, libc_old, libunwind }: - -stdenv.mkDerivation rec { - version = "551.1"; - pname = "objc4"; - - src = fetchapplesource { - inherit version; - name = "objc4"; - sha256 = "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg"; - }; - - patches = [ ./spinlocks.patch ]; - - buildInputs = [ libauto launchd libc_old libunwind ]; - - buildPhase = '' - cp ${./objc-probes.h} runtime/objc-probes.h - - mkdir -p build/include/objc - - cp runtime/hashtable.h build/include/objc/hashtable.h - cp runtime/OldClasses.subproj/List.h build/include/objc/List.h - cp runtime/hashtable2.h build/include/objc/hashtable2.h - cp runtime/message.h build/include/objc/message.h - cp runtime/objc-api.h build/include/objc/objc-api.h - cp runtime/objc-auto.h build/include/objc/objc-auto.h - cp runtime/objc-class.h build/include/objc/objc-class.h - cp runtime/objc-exception.h build/include/objc/objc-exception.h - cp runtime/objc-load.h build/include/objc/objc-load.h - cp runtime/objc-sync.h build/include/objc/objc-sync.h - cp runtime/objc.h build/include/objc/objc.h - cp runtime/objc-runtime.h build/include/objc/objc-runtime.h - cp runtime/Object.h build/include/objc/Object.h - cp runtime/Protocol.h build/include/objc/Protocol.h - cp runtime/runtime.h build/include/objc/runtime.h - cp runtime/NSObject.h build/include/objc/NSObject.h - cp runtime/NSObjCRuntime.h build/include/objc/NSObjCRuntime.h - - # These would normally be in local/include but we don't do local, so they're - # going in with the others - cp runtime/maptable.h build/include/objc/maptable.h - cp runtime/objc-abi.h build/include/objc/objc-abi.h - cp runtime/objc-auto-dump.h build/include/objc/objc-auto-dump.h - cp runtime/objc-gdb.h build/include/objc/objc-gdb.h - cp runtime/objc-internal.h build/include/objc/objc-internal.h - - cc -o markgc markgc.c - - FLAGS="-Wno-deprecated-register -Wno-unknown-pragmas -Wno-deprecated-objc-isa-usage -Wno-invalid-offsetof -Wno-inline-new-delete -Wno-cast-of-sel-type -Iruntime -Ibuild/include -Iruntime/Accessors.subproj -D_LIBCPP_VISIBLE= -DOS_OBJECT_USE_OBJC=0 -DNDEBUG=1" - - cc -std=gnu++11 $FLAGS -c runtime/hashtable2.mm - cc -std=gnu++11 $FLAGS -c runtime/maptable.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-auto.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-cache.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-class-old.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-class.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-errors.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-exception.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-file.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-initialize.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-layout.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-load.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-loadmethod.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-lockdebug.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-runtime-new.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-runtime-old.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-runtime.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-sel-set.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-sel.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-sync.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-typeencoding.mm - cc -std=gnu++11 $FLAGS -c runtime/Object.mm - cc -std=gnu++11 $FLAGS -c runtime/Protocol.mm - - cc -std=gnu++11 $FLAGS -c runtime/objc-references.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-os.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-auto-dump.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-file-old.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-block-trampolines.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-externalref.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-weak.mm - cc -std=gnu++11 $FLAGS -c runtime/NSObject.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-opt.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-cache-old.mm - cc -std=gnu++11 $FLAGS -c runtime/objc-sel-old.mm - - cc -std=gnu++11 $FLAGS -c runtime/Accessors.subproj/objc-accessors.mm - - cc $FLAGS -c runtime/objc-sel-table.s - - cc $FLAGS -c runtime/OldClasses.subproj/List.m - cc $FLAGS -c runtime/Messengers.subproj/objc-msg-arm.s - cc $FLAGS -c runtime/Messengers.subproj/objc-msg-i386.s - cc $FLAGS -c runtime/Messengers.subproj/objc-msg-x86_64.s - cc $FLAGS -c runtime/Messengers.subproj/objc-msg-simulator-i386.s - - cc $FLAGS -c runtime/a1a2-blocktramps-i386.s - cc $FLAGS -c runtime/a2a3-blocktramps-i386.s - - cc $FLAGS -c runtime/a1a2-blocktramps-x86_64.s - cc $FLAGS -c runtime/a2a3-blocktramps-x86_64.s - - cc $FLAGS -c runtime/a1a2-blocktramps-arm.s - cc $FLAGS -c runtime/a2a3-blocktramps-arm.s - - c++ -Wl,-no_dtrace_dof --stdlib=libc++ -dynamiclib -lauto -install_name $out/lib/libobjc.dylib -o libobjc.dylib *.o - - ./markgc -p libobjc.dylib - ''; - - installPhase = '' - mkdir -p $out/include $out/lib - - mv build/include/objc $out/include - mv libobjc.dylib $out/lib - ''; -} diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build index de73e88f5d4d3..af08b5074bef1 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build @@ -88,6 +88,7 @@ install_man('accton/accton.8') executable( 'arch', build_by_default : sdk_version.version_compare('>=11'), + dependencies : [ core_foundation ], install : sdk_version.version_compare('>=11'), sources : 'arch/arch.c' ) @@ -145,7 +146,7 @@ install_man('chkpasswd/chkpasswd.8') executable( 'chpass', - dependencies : [ cfopen_directory, directory_service, open_directory ], + dependencies : [ core_foundation, cfopen_directory, directory_service, open_directory ], install : true, sources : [ 'chpass/chpass.c', @@ -358,7 +359,7 @@ install_man( executable( 'nvram', c_args : '-DTARGET_OS_BRIDGE=0', - dependencies : [ iokit, libc_private, xnu_private ], + dependencies : [ core_foundation, iokit, libc_private, xnu_private ], install : true, sources : 'nvram/nvram.c' ) @@ -377,7 +378,7 @@ install_man('pagesize/pagesize.1') executable( 'passwd', - dependencies : [ cfopen_directory, directory_service, open_directory, pam ], + dependencies : [ core_foundation, cfopen_directory, directory_service, open_directory, pam ], install : true, sources : [ 'passwd/file_passwd.c', @@ -521,7 +522,7 @@ executable( 'zlog', build_by_default : sdk_version.version_compare('>=11'), c_args : '-DKERN_NOT_FOUND=56', - dependencies : core_symbolication, + dependencies : [ core_foundation, core_symbolication ], install : sdk_version.version_compare('>=11'), sources : [ 'zlog/SymbolicationHelper.c', diff --git a/pkgs/os-specific/darwin/bartender/default.nix b/pkgs/os-specific/darwin/bartender/default.nix index 011a356e54124..3650d0dcaf3cf 100644 --- a/pkgs/os-specific/darwin/bartender/default.nix +++ b/pkgs/os-specific/darwin/bartender/default.nix @@ -6,12 +6,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bartender"; - version = "5.0.49"; + version = "5.0.52"; src = fetchurl { name = "Bartender ${lib.versions.major finalAttrs.version}.dmg"; url = "https://www.macbartender.com/B2/updates/${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}/Bartender%20${lib.versions.major finalAttrs.version}.dmg"; - hash = "sha256-DOQLtdbwYFyRri3GBdjLfFNII65QJMvAQu9Be4ATBx0="; + hash = "sha256-gKsDD/4z397ZpT+8xu7BI1c9r+nledzrPfD/ACexFvQ="; }; dontPatch = true; @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { description = "Take control of your menu bar"; longDescription = '' Bartender is an award-winning app for macOS that superpowers your menu bar, giving you total control over your menu bar items, what's displayed, and when, with menu bar items only showing when you need them. @@ -40,9 +40,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; homepage = "https://www.macbartender.com"; changelog = "https://www.macbartender.com/Bartender${lib.versions.major finalAttrs.version}/release_notes/"; - license = with licenses; [ unfree ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ stepbrobd ]; + license = [ lib.licenses.unfree ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + maintainers = with lib.maintainers; [ stepbrobd ]; platforms = [ "aarch64-darwin" "x86_64-darwin" ]; }; }) diff --git a/pkgs/os-specific/darwin/coconutbattery/default.nix b/pkgs/os-specific/darwin/coconutbattery/default.nix index 4850b2b4c04ed..d3e67c96cfddf 100644 --- a/pkgs/os-specific/darwin/coconutbattery/default.nix +++ b/pkgs/os-specific/darwin/coconutbattery/default.nix @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; meta = with lib; { - description = "The standard for battery reading since 2005"; + description = "Standard for battery reading since 2005"; longDescription = '' With coconutBattery you are always aware of your current battery health. It shows you live information about the battery quality in your Mac, iPhone and iPad. diff --git a/pkgs/os-specific/darwin/dockutil/default.nix b/pkgs/os-specific/darwin/dockutil/default.nix index 5e4187f07280f..64a8a98443886 100644 --- a/pkgs/os-specific/darwin/dockutil/default.nix +++ b/pkgs/os-specific/darwin/dockutil/default.nix @@ -1,37 +1,99 @@ -{ lib, stdenv, fetchurl, libarchive, p7zip }: -stdenv.mkDerivation rec { - pname = "dockutil"; - version = "3.0.2"; - - src = fetchurl { - url = - "https://github.com/kcrawford/dockutil/releases/download/${version}/dockutil-${version}.pkg"; - sha256 = "175137ea747e83ed221d60b18b712b256ed31531534cde84f679487d337668fd"; - }; - - dontBuild = true; - - nativeBuildInputs = [ libarchive p7zip ]; +{ lib +, stdenv +, stdenvNoCC +, fetchFromGitHub +, fetchurl +, swift +, swiftpm +, swiftpm2nix +, swiftPackages +, darwin +, libarchive +, p7zip +# Building from source on x86_64 fails (among other things) due to: +# error: cannot load underlying module for 'Darwin' +, fromSource ? (stdenv.system != "x86_64-darwin") +}: - unpackPhase = '' - 7z x $src - bsdtar -xf Payload~ - ''; +let + generated = swiftpm2nix.helpers ./generated; - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mkdir -p $out/usr/local/bin - install -Dm755 usr/local/bin/dockutil -t $out/usr/local/bin - ln -rs $out/usr/local/bin/dockutil $out/bin/dockutil - runHook postInstall - ''; + pname = "dockutil"; + version = "3.1.3"; meta = with lib; { description = "Tool for managing dock items"; homepage = "https://github.com/kcrawford/dockutil"; license = licenses.asl20; maintainers = with maintainers; [ tboerger ]; + mainProgram = "dockutil"; platforms = platforms.darwin; }; -} + + buildFromSource = swiftPackages.stdenv.mkDerivation (finalAttrs: { + inherit pname version meta; + + src = fetchFromGitHub { + owner = "kcrawford"; + repo = "dockutil"; + rev = finalAttrs.version; + hash = "sha256-mmk4vVZhq4kt05nI/dDM1676FDWyf4wTSwY2YzqKsLU="; + }; + + postPatch = '' + # Patch sources so that they build with Swift CoreFoundation + # which differs ever so slightly from Apple's implementation. + substituteInPlace Sources/DockUtil/DockUtil.swift \ + --replace-fail "URL(filePath:" \ + "URL(fileURLWithPath:" \ + --replace-fail "path(percentEncoded: false)" \ + "path" + ''; + + nativeBuildInputs = [ swift swiftpm ]; + + buildInputs = with darwin.apple_sdk.frameworks; [ Cocoa ]; + + configurePhase = generated.configure; + + installPhase = '' + runHook preInstall + install -Dm755 .build/${stdenv.hostPlatform.darwinArch}-apple-macosx/release/dockutil -t $out/bin + runHook postInstall + ''; + }); + + installBinary = stdenvNoCC.mkDerivation (finalAttrs: { + inherit pname version; + + src = fetchurl { + url = "https://github.com/kcrawford/dockutil/releases/download/${finalAttrs.version}/dockutil-${finalAttrs.version}.pkg"; + hash = "sha256-9g24Jz/oDXxIJFiL7bU4pTh2dcORftsAENq59S0/JYI="; + }; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ libarchive p7zip ]; + + unpackPhase = '' + 7z x $src + bsdtar -xf Payload~ + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -Dm755 usr/local/bin/dockutil -t $out/bin + runHook postInstall + ''; + + meta = meta // { + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; + }); +in +if fromSource + then buildFromSource + else installBinary diff --git a/pkgs/os-specific/darwin/dockutil/generated/default.nix b/pkgs/os-specific/darwin/dockutil/generated/default.nix new file mode 100644 index 0000000000000..32ffc68e4d2c9 --- /dev/null +++ b/pkgs/os-specific/darwin/dockutil/generated/default.nix @@ -0,0 +1,7 @@ +# This file was generated by swiftpm2nix. +{ + workspaceStateFile = ./workspace-state.json; + hashes = { + "swift-argument-parser" = "1fpdgivmwdszggvx0ligs3vidv9kpp9777v649hs8w7vpcifc2ji"; + }; +} diff --git a/pkgs/os-specific/darwin/dockutil/generated/workspace-state.json b/pkgs/os-specific/darwin/dockutil/generated/workspace-state.json new file mode 100644 index 0000000000000..e24a74517af07 --- /dev/null +++ b/pkgs/os-specific/darwin/dockutil/generated/workspace-state.json @@ -0,0 +1,25 @@ +{ + "object": { + "artifacts": [], + "dependencies": [ + { + "basedOn": null, + "packageRef": { + "identity": "swift-argument-parser", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-argument-parser.git", + "name": "swift-argument-parser" + }, + "state": { + "checkoutState": { + "revision": "82905286cc3f0fa8adc4674bf49437cab65a8373", + "version": "1.1.1" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-argument-parser" + } + ] + }, + "version": 6 +} diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix index db0b1e1dcbae1..033591c1fec35 100644 --- a/pkgs/os-specific/darwin/duti/default.nix +++ b/pkgs/os-specific/darwin/duti/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A command-line tool to select default applications for document types and URL schemes on Mac OS X"; + description = "Command-line tool to select default applications for document types and URL schemes on Mac OS X"; longDescription = '' duti is a command-line utility capable of setting default applications for various document types on Mac OS X, using Apple's Uniform Type Identifiers. A diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix index a7f1f0b773d87..c7582de3352a1 100644 --- a/pkgs/os-specific/darwin/iproute2mac/default.nix +++ b/pkgs/os-specific/darwin/iproute2mac/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/brona/iproute2mac"; - description = "CLI wrapper for basic network utilites on Mac OS X inspired with iproute2 on Linux systems - ip command."; + description = "CLI wrapper for basic network utilites on Mac OS X inspired with iproute2 on Linux systems - ip command"; license = licenses.mit; maintainers = with maintainers; [ jiegec ]; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/karabiner-elements/default.nix b/pkgs/os-specific/darwin/karabiner-elements/default.nix index f42ce5b5be2fc..53847c75fccca 100644 --- a/pkgs/os-specific/darwin/karabiner-elements/default.nix +++ b/pkgs/os-specific/darwin/karabiner-elements/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { passthru.updateScript = ./updater.sh; meta = with lib; { - description = "Karabiner-Elements is a powerful utility for keyboard customization on macOS Sierra (10.12) or later."; + description = "Karabiner-Elements is a powerful utility for keyboard customization on macOS Sierra (10.12) or later"; homepage = "https://karabiner-elements.pqrs.org/"; platforms = platforms.darwin; maintainers = with maintainers; [ Enzime ]; diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix index 87e1a8bf6ae6e..9c10dc89a69d3 100644 --- a/pkgs/os-specific/darwin/khd/default.nix +++ b/pkgs/os-specific/darwin/khd/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A simple modal hotkey daemon for OSX"; + description = "Simple modal hotkey daemon for OSX"; homepage = "https://github.com/koekeishiya/khd"; downloadPage = "https://github.com/koekeishiya/khd/releases"; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/macfuse/default.nix b/pkgs/os-specific/darwin/macfuse/default.nix index c63b536f248b5..4de9600e79108 100644 --- a/pkgs/os-specific/darwin/macfuse/default.nix +++ b/pkgs/os-specific/darwin/macfuse/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "macfuse-stubs"; - version = "4.4.1"; + version = "4.8.0"; src = fetchurl { url = "https://github.com/osxfuse/osxfuse/releases/download/macfuse-${version}/macfuse-${version}.dmg"; - sha256 = "2a2d0f37ec5fcff547c5efa7d08539103a0b46bc16080c2b41a7e749f6e65c61"; + hash = "sha256-ucTzO2qdN4QkowMVvC3+4pjEVjbwMsB0xFk+bvQxwtQ="; }; nativeBuildInputs = [ cpio xar undmg libtapi ]; diff --git a/pkgs/os-specific/darwin/moltenvk/default.nix b/pkgs/os-specific/darwin/moltenvk/default.nix index 1324bdeb7f217..5e5747b1b4fbb 100644 --- a/pkgs/os-specific/darwin/moltenvk/default.nix +++ b/pkgs/os-specific/darwin/moltenvk/default.nix @@ -28,7 +28,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "MoltenVK"; - version = "1.2.8"; + version = "1.2.9"; buildInputs = [ AppKit @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "KhronosGroup"; repo = "MoltenVK"; rev = "v${finalAttrs.version}"; - hash = "sha256-nsNN2iCSjXzfarSdaNmeNbfDliUBMQMsb0rXEENWJqw="; + hash = "sha256-9k7NMw2M6IqCUQNBekzDaS6VYAOKwPmuCfJkENQ7oiI="; }; postPatch = '' @@ -198,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "A Vulkan Portability implementation built on top of Apple’s Metal API"; + description = "Vulkan Portability implementation built on top of Apple’s Metal API"; homepage = "https://github.com/KhronosGroup/MoltenVK"; changelog = "https://github.com/KhronosGroup/MoltenVK/releases"; maintainers = [ lib.maintainers.reckenrode ]; diff --git a/pkgs/os-specific/darwin/noah/default.nix b/pkgs/os-specific/darwin/noah/default.nix index ad63b796f1838..502a165c33d44 100644 --- a/pkgs/os-specific/darwin/noah/default.nix +++ b/pkgs/os-specific/darwin/noah/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Bash on Ubuntu on macOS"; homepage = "https://github.com/linux-noah/noah"; - license = [ licenses.mit licenses.gpl2 ]; + license = [ licenses.mit licenses.gpl2Only ]; maintainers = [ ]; platforms = platforms.darwin; # never built on aarch64-darwin since first introduction in nixpkgs diff --git a/pkgs/os-specific/darwin/openwith/default.nix b/pkgs/os-specific/darwin/openwith/default.nix index eb78f7a1344c4..d28ed4942821c 100644 --- a/pkgs/os-specific/darwin/openwith/default.nix +++ b/pkgs/os-specific/darwin/openwith/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, swift, AppKit, Foundation, UniformTypeIdentifiers }: +{ lib, swiftPackages, fetchFromGitHub }: let + inherit (swiftPackages) apple_sdk stdenv swift; arch = if stdenv.isAarch64 then "arm64" else "x86_64"; in stdenv.mkDerivation rec { @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ swift ]; - buildInputs = [ AppKit Foundation UniformTypeIdentifiers ]; + buildInputs = with apple_sdk.frameworks; [ AppKit Foundation UniformTypeIdentifiers ]; makeFlags = [ "openwith_${arch}" ]; @@ -32,6 +33,5 @@ stdenv.mkDerivation rec { license = licenses.unlicense; maintainers = with maintainers; [ zowoq ]; platforms = [ "aarch64-darwin" "x86_64-darwin" ]; - broken = stdenv.isx86_64; # https://hydra.nixos.org/build/219354133/nixlog/3 }; } diff --git a/pkgs/os-specific/darwin/osx-cpu-temp/default.nix b/pkgs/os-specific/darwin/osx-cpu-temp/default.nix index ea9d8399667ac..2f3154fe9ea41 100644 --- a/pkgs/os-specific/darwin/osx-cpu-temp/default.nix +++ b/pkgs/os-specific/darwin/osx-cpu-temp/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Outputs current CPU temperature for OSX."; + description = "Outputs current CPU temperature for OSX"; homepage = "https://github.com/lavoiesl/osx-cpu-temp"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ virusdave ]; platforms = platforms.darwin; }; diff --git a/pkgs/os-specific/darwin/osxsnarf/default.nix b/pkgs/os-specific/darwin/osxsnarf/default.nix index e31271ed2b97e..534c8bd5b3a60 100644 --- a/pkgs/os-specific/darwin/osxsnarf/default.nix +++ b/pkgs/os-specific/darwin/osxsnarf/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" ]; meta = with lib; { - description = "A Plan 9-inspired way to share your OS X clipboard"; + description = "Plan 9-inspired way to share your OS X clipboard"; homepage = "https://github.com/eraserhd/osxsnarf"; license = licenses.unlicense; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index b6626c4d4eade..a49f1a305ce4a 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -1,21 +1,22 @@ -{ lib -, stdenvNoCC -, fetchurl -, writeShellApplication -, curl -, jq -, common-updater-scripts -, undmg +{ + lib, + stdenvNoCC, + fetchurl, + writeShellApplication, + curl, + jq, + common-updater-scripts, + undmg, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.72.0"; + version = "1.77.1"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-L6CXWRmBfit+uWODEWt7u71shFAadPOqtNifMnSp0BU="; + hash = "sha256-+Itz6U1DHV9ZsgjzuvrfVtCJ1yiGSpVOkD28BmHibIQ="; }; dontPatch = true; @@ -38,21 +39,31 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.updateScript = lib.getExe (writeShellApplication { name = "raycast-update-script"; - runtimeInputs = [ curl jq common-updater-scripts ]; + runtimeInputs = [ + curl + jq + common-updater-scripts + ]; text = '' - set -eo pipefail url=$(curl --silent "https://releases.raycast.com/releases/latest?build=universal") version=$(echo "$url" | jq -r '.version') update-source-version raycast "$version" --file=./pkgs/os-specific/darwin/raycast/default.nix ''; }); - meta = with lib; { + meta = { description = "Control your tools with a few keystrokes"; homepage = "https://raycast.app/"; - license = with licenses; [ unfree ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ lovesegfault stepbrobd donteatoreo ]; - platforms = [ "aarch64-darwin" "x86_64-darwin" ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ + lovesegfault + stepbrobd + donteatoreo + ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; }) diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix index b4d26327bdcd4..ea3dd694962e4 100644 --- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix +++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A wrapper that provides access to the Mac OS X pasteboard service"; + description = "Wrapper that provides access to the Mac OS X pasteboard service"; license = licenses.bsd2; maintainers = with maintainers; [ lnl7 ]; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/rectangle/default.nix b/pkgs/os-specific/darwin/rectangle/default.nix index ca83bb7db4c00..1e7be272d6ab9 100644 --- a/pkgs/os-specific/darwin/rectangle/default.nix +++ b/pkgs/os-specific/darwin/rectangle/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "rectangle"; - version = "0.77"; + version = "0.80"; src = fetchurl { url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg"; - hash = "sha256-wViFngw6iwlOG7KsW+zqxjm9ZRJahscX0TYz7/7T5nw="; + hash = "sha256-CmYhMnEhn3UK82RXuT1KQhAoK/0ewcUU6h73el2Lpw8="; }; sourceRoot = "."; diff --git a/pkgs/os-specific/darwin/sigtool/default.nix b/pkgs/os-specific/darwin/sigtool/default.nix index eb323a899d19f..62474fdc78d21 100644 --- a/pkgs/os-specific/darwin/sigtool/default.nix +++ b/pkgs/os-specific/darwin/sigtool/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - description = "A tool for working with embedded signatures in Mach-O files"; + description = "Tool for working with embedded signatures in Mach-O files"; homepage = "https://github.com/thefloweringash/sigtool"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/os-specific/darwin/smimesign/default.nix index 48164d387fa98..812d6a24d2bd8 100644 --- a/pkgs/os-specific/darwin/smimesign/default.nix +++ b/pkgs/os-specific/darwin/smimesign/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "An S/MIME signing utility for macOS and Windows that is compatible with Git"; + description = "S/MIME signing utility for macOS and Windows that is compatible with Git"; homepage = "https://github.com/github/smimesign"; license = licenses.mit; platforms = platforms.darwin ++ platforms.windows; diff --git a/pkgs/os-specific/darwin/spacebar/default.nix b/pkgs/os-specific/darwin/spacebar/default.nix index 2656c10f6dc3b..051bbfc46c15d 100644 --- a/pkgs/os-specific/darwin/spacebar/default.nix +++ b/pkgs/os-specific/darwin/spacebar/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A minimal status bar for macOS"; + description = "Minimal status bar for macOS"; homepage = "https://github.com/cmacrae/spacebar"; platforms = platforms.darwin; maintainers = [ maintainers.cmacrae ]; diff --git a/pkgs/os-specific/darwin/utm/default.nix b/pkgs/os-specific/darwin/utm/default.nix index 4915b9b54d782..050a725b2cb8b 100644 --- a/pkgs/os-specific/darwin/utm/default.nix +++ b/pkgs/os-specific/darwin/utm/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "utm"; - version = "4.5.2"; + version = "4.5.3"; src = fetchurl { url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg"; - hash = "sha256-pBRmtHXnw9BoFeaCCokk5hulChdEFl9dENbL8zzXMzs="; + hash = "sha256-7hpWTe6TvnNodFt1rSRGougeZuEjvSeuVzBWFfYo53Y="; }; nativeBuildInputs = [ undmg makeWrapper ]; |