Unverified Commit 99268a06 authored by Masum Reza's avatar Masum Reza Committed by GitHub
Browse files

cosmic-packages: move to new cargo fetcher (#356539)

parents b3f2aa7e 9fd5a8d0

pkgs/build-support/rust/fetch-cargo-vendor-util.py

+8 −10
Original line number Diff line number Diff line
@@ -118,18 +118,16 @@ def create_vendor_staging(lockfile_path: Path, out_dir: Path) -> None: 
    out_dir.mkdir(exist_ok=True)

    shutil.copy(lockfile_path, out_dir / "Cargo.lock")



    # create a pool with at most 10 concurrent jobs

    with mp.Pool(min(10, mp.cpu_count())) as pool:



    # fetch git trees sequentially, since fetching concurrently leads to flaky behaviour

    if len(git_packages) != 0:

        (out_dir / "git").mkdir()

            # run download jobs in parallel

            git_args_gen = ((url, git_sha_rev, out_dir) for git_sha_rev, url in git_sha_rev_to_url.items())

            pool.starmap(download_git_tree, git_args_gen)

        for git_sha_rev, url in git_sha_rev_to_url.items():

            download_git_tree(url, git_sha_rev, out_dir)



    # run tarball download jobs in parallel, with at most 5 concurrent download jobs

    with mp.Pool(min(5, mp.cpu_count())) as pool:

        if len(registry_packages) != 0:

            (out_dir / "tarballs").mkdir()

            # run download jobs in parallel

            tarball_args_gen = ((pkg, out_dir) for pkg in registry_packages)

            pool.starmap(download_tarball, tarball_args_gen)

pkgs/by-name/co/cosmic-applibrary/Cargo.lock

deleted100644 → 0
+0 −5678

File deleted.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/co/cosmic-applibrary/package.nix

+2 −17
Original line number Diff line number Diff line
@@ -19,23 +19,8 @@ rustPlatform.buildRustPackage rec { 
    hash = "sha256-fZxDRktiHHmj7X3e5VyJJMO081auOpSMSsBnJdhhtR8=";

  };



  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "accesskit-0.12.2" = "sha256-ksaYMGT/oug7isQY8/1WD97XDUsX2ShBdabUzxWffYw=";

      "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";

      "cosmic-config-0.1.0" = "sha256-ETNVJ4y7EraAlU9XEZGNNPdyWt1WIURr1dSH6hQ0Pos=";

      "cosmic-client-toolkit-0.1.0" = "sha256-vj7Wm1uJ5ULvGNEwKznNhujCZQiuntsWMyKQbIVaO/Q=";

      "cosmic-settings-daemon-0.1.0" = "sha256-z/dvRyc3Zc1fAQh2HKk6NI6QSDpNqarqslwszjU+0nc=";

      "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg=";

      "smithay-client-toolkit-0.18.0" = "sha256-2WbDKlSGiyVmi7blNBr2Aih9FfF2dq/bny57hoA4BrE=";

      "softbuffer-0.4.1" = "sha256-CACVCnyFgefkpDlll6IeaPWB8a3gbF6BW8MnlkytV8o=";

      "switcheroo-control-0.1.0" = "sha256-ztZ5HD1hEOvsUSn94ZbbJ6SY9Jbsm8iGHR70GuAnEaQ=";

      "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI=";

      "cosmic-text-0.11.1" = "sha256-lyBl0VAzcKBqLeCPrA28VW6O0MWXazJg1b11YuBR65U=";

      "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4=";

    };

  };

  useFetchCargoVendor = true;

  cargoHash = "sha256-WCS1jCfnanILXGLq96+FI0gM1o4FIJQtSgZg86fe86E=";



  nativeBuildInputs = [

    just

pkgs/by-name/co/cosmic-bg/Cargo.lock

deleted100644 → 0
+0 −2108

File deleted.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/co/cosmic-bg/package.nix

+2 −9
Original line number Diff line number Diff line
@@ -20,15 +20,8 @@ rustPlatform.buildRustPackage rec { 
    hash = "sha256-lAFAZBo5FnXgJV3MrZhaYmBxqtH1E7+Huj53ho/hPik=";

  };



  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";

      "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk=";

      "cosmic-config-0.1.0" = "sha256-mdRRfXLyDBYQIPmbuXgXGoOKUlyw6CiSmOUBz1b3vJY=";

      "smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34=";

    };

  };

  useFetchCargoVendor = true;

  cargoHash = "sha256-up3yNsKxTC9YrRuTPsGlCHTp9S/woDXPc5HcYcEY9Xc=";



  postPatch = ''

    substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"