Unverified Commit 85f7e662 authored by Emily's avatar Emily Committed by GitHub
Browse files

pkgs/by-name/[ab].+: migrate to new apple sdk (#354097)

parents a0862542 31a776f3

pkgs/by-name/ag/agate/package.nix

+1 −8
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 
  nixosTests,

  fetchFromGitHub,

  rustPlatform,

  libiconv,

  darwin,

  openssl,

  pkg-config,

  nix-update-script,
@@ -26,12 +24,7 @@ rustPlatform.buildRustPackage rec { 


  nativeBuildInputs = [ pkg-config ];



  buildInputs =

    [ openssl ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      libiconv

      darwin.apple_sdk.frameworks.Security

    ];

  buildInputs = [ openssl ];



  doInstallCheck = true;

  installCheckPhase = ''

pkgs/by-name/an/anchor/package.nix

+1 −10
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
  lib,

  rustPlatform,

  fetchFromGitHub,

  stdenv,

  darwin,

}:



rustPlatform.buildRustPackage rec {
@@ -18,9 +16,7 @@ rustPlatform.buildRustPackage rec { 
    fetchSubmodules = true;

  };



  cargoPatches = [

    ./0001-update-time-rs.patch

  ];

  cargoPatches = [ ./0001-update-time-rs.patch ];



  cargoLock = {

    lockFile = ./Cargo.lock;
@@ -29,11 +25,6 @@ rustPlatform.buildRustPackage rec { 
    };

  };



  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

    darwin.apple_sdk.frameworks.Security

    darwin.apple_sdk.frameworks.SystemConfiguration

  ];



  checkFlags = [

    # the following test cases try to access network, skip them

    "--skip=tests::test_check_and_get_full_commit_when_full_commit"

pkgs/by-name/as/asfa/package.nix

+1 −4
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
  rustPlatform,

  fetchFromGitHub,

  stdenv,

  darwin,

  help2man,

  openssl,

  pkg-config,
@@ -29,9 +28,7 @@ rustPlatform.buildRustPackage { 
    "man"

  ];



  buildInputs = [

    openssl

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];

  buildInputs = [ openssl ];



  nativeBuildInputs = [

    help2man

pkgs/by-name/as/asm-lsp/package.nix

+1 −8
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 
  fetchFromGitHub,

  pkg-config,

  openssl,

  darwin,

  libiconv,

}:

let

  pname = "asm-lsp";
@@ -24,12 +22,7 @@ rustPlatform.buildRustPackage { 


  nativeBuildInputs = [ pkg-config ];



  buildInputs =

    [ openssl ]

    ++ lib.optionals stdenv.buildPlatform.isDarwin [

      darwin.apple_sdk.frameworks.SystemConfiguration

      libiconv

    ];

  buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];



  cargoHash = "sha256-AtCnYOOtViMpg+rz8miuBZg1pENBPaf9kamSPaVUyiw=";

pkgs/by-name/at/atac/package.nix

+3 −15
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 
  fetchFromGitHub,

  pkg-config,

  oniguruma,

  stdenv,

  darwin,

}:

rustPlatform.buildRustPackage rec {

  pname = "atac";
@@ -20,19 +18,9 @@ rustPlatform.buildRustPackage rec { 


  cargoHash = "sha256-sNgtqvFiwHSYMDf0379i8Yl9NrkCRVLo/ogjbHFgKBY=";



  nativeBuildInputs = [

    pkg-config

  ];

  nativeBuildInputs = [ pkg-config ];



  buildInputs =

    [

      oniguruma

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      darwin.apple_sdk.frameworks.AppKit

      darwin.apple_sdk.frameworks.Security

      darwin.apple_sdk.frameworks.SystemConfiguration

    ];

  buildInputs = [ oniguruma ];



  env = {

    RUSTONIG_SYSTEM_LIBONIG = true;