Unverified Commit 29ba5b9a authored by Emily's avatar Emily Committed by GitHub
Browse files

xcodes: 1.5.0 -> 1.6.0, move to `by name`, `with lib;` cleanup, RFC format (#354932)

parents d420f2c9 eee079f7

pkgs/development/tools/xcodes/generated/default.nix→pkgs/by-name/xc/xcodes/generated/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
{

  workspaceStateFile = ./workspace-state.json;

  hashes = {

    "big-num" = "0wj45pmiafhbj5ch7b4s41ldycps0hcj29d0z6fanhiy7ljlhk35";

    "data" = "1jf2y9dbg1qvxkkabdkihdnr1kmznq79h18j65a7iw1hljdp8hyg";

    "Foundation" = "0hcpc15v38l32qc2sh4gqj909b1f90knln9yz3mfiyf6xi7iy6q7";

    "KeychainAccess" = "0m57pq1vn5qarmlx5x4kfv0yzjylafl3ipih5p60zyfsx6k5b55l";
@@ -10,6 +11,8 @@ 
    "PromiseKit" = "19pkhk505pz03hqmv8h1lgm83iw5jha6j1v06fyzz0xar2ywv6vg";

    "Rainbow" = "0iv31azny668vpsjgmldgkgn9cp8i5h9rlc6w5bs8q63nwq19wb0";

    "swift-argument-parser" = "19b4pkcx4xf0iwg0nbr7wvkkbwl6h8sch848gid6l98728glmcw9";

    "swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313";

    "swift-srp" = "0nsinkgf050z1wkzmaxaf5qkvplsgyqwps9xi9zkbcg6y7143xy1";

    "SwiftSoup" = "14klizw8jhmxhxays1b1yh4bp0nbb3l4l1pj6sdnf0iqs0wladv8";

    "Version" = "0s5bwr1li6dnsnalfyraq1kzhqmmn9qwp1mld4msrn3q5vvjmql9";

    "Yams" = "11abhcfkmqm3cmh7vp7rqzvxd1zj02j2866a2pp6v9m89456xb76";

pkgs/development/tools/xcodes/generated/workspace-state.json→pkgs/by-name/xc/xcodes/generated/workspace-state.json

+51 −0
Original line number Diff line number Diff line
@@ -2,6 +2,23 @@ 
  "object": {

    "artifacts": [],

    "dependencies": [

      {

        "basedOn": null,

        "packageRef": {

          "identity": "big-num",

          "kind": "remoteSourceControl",

          "location": "https://github.com/adam-fowler/big-num",

          "name": "big-num"

        },

        "state": {

          "checkoutState": {

            "revision": "5c5511ad06aeb2b97d0868f7394e14a624bfb1c7",

            "version": "2.0.2"

          },

          "name": "sourceControlCheckout"

        },

        "subpath": "big-num"

      },

      {

        "basedOn": null,

        "packageRef": {
@@ -137,6 +154,40 @@ 
        },

        "subpath": "swift-argument-parser"

      },

      {

        "basedOn": null,

        "packageRef": {

          "identity": "swift-crypto",

          "kind": "remoteSourceControl",

          "location": "https://github.com/apple/swift-crypto",

          "name": "swift-crypto"

        },

        "state": {

          "checkoutState": {

            "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5",

            "version": "1.1.7"

          },

          "name": "sourceControlCheckout"

        },

        "subpath": "swift-crypto"

      },

      {

        "basedOn": null,

        "packageRef": {

          "identity": "swift-srp",

          "kind": "remoteSourceControl",

          "location": "https://github.com/xcodesOrg/swift-srp",

          "name": "swift-srp"

        },

        "state": {

          "checkoutState": {

            "branch": "main",

            "revision": "543aa0122a0257b992f6c7d62d18a26e3dffb8fe"

          },

          "name": "sourceControlCheckout"

        },

        "subpath": "swift-srp"

      },

      {

        "basedOn": null,

        "packageRef": {

pkgs/development/tools/xcodes/default.nix→pkgs/by-name/xc/xcodes/package.nix

+23 −23
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, swift

, swiftpm

, swiftpm2nix

, makeWrapper

, CryptoKit

, LocalAuthentication

, libcompression

, aria2

{

  lib,

  fetchFromGitHub,

  swiftPackages,

  swift,

  swiftpm,

  swiftpm2nix,

  makeWrapper,

  aria2,

}:

let

  generated = swiftpm2nix.helpers ./generated;

  stdenv = swiftPackages.stdenv;

in

stdenv.mkDerivation (finalAttrs: {

  pname = "xcodes";

  version = "1.5.0";

  version = "1.6.0";



  src = fetchFromGitHub {

    owner = "XcodesOrg";

    repo = "xcodes";

    rev = finalAttrs.version;

    hash = "sha256-vksfvrx0TqtjcOHn38Ey3P6jIFYF4CbD3SVICVFINSU=";

    hash = "sha256-TwPfASRU98rifyA/mINFfoY0MbbwmAh8JneVpJa38CA=";

  };



  nativeBuildInputs = [ swift swiftpm makeWrapper ];



  buildInputs = [

    CryptoKit

    LocalAuthentication

    libcompression

  nativeBuildInputs = [

    swift

    swiftpm

    makeWrapper

  ];



  configurePhase = generated.configure;
@@ -45,16 +42,19 @@ stdenv.mkDerivation (finalAttrs: { 
    runHook postInstall

  '';



  meta = with lib; {

  meta = {

    changelog = "https://github.com/XcodesOrg/xcodes/releases/tag/${finalAttrs.version}";

    description = "Command-line tool to install and switch between multiple versions of Xcode";

    homepage = "https://github.com/XcodesOrg/xcodes";

    license = with licenses; [

    license = with lib.licenses; [

      mit

      # unxip

      lgpl3Only

    ];

    maintainers = with maintainers; [ _0x120581f emilytrau ];

    platforms = platforms.darwin;

    maintainers = with lib.maintainers; [

      _0x120581f

      emilytrau

    ];

    platforms = lib.platforms.darwin;

  };

})

pkgs/top-level/all-packages.nix

+0 −5
Original line number Diff line number Diff line
@@ -2024,11 +2024,6 @@ with pkgs; 














  xcodeenv = callPackage ../development/mobile/xcodeenv { };



























  xcodes = swiftPackages.callPackage ../development/tools/xcodes {













    inherit (swiftPackages.apple_sdk.frameworks) CryptoKit LocalAuthentication;













    inherit (swiftPackages.apple_sdk) libcompression;













  };



























  gomobile = callPackage ../development/mobile/gomobile { };





























  titaniumenv = callPackage ../development/mobile/titaniumenv { };