Unverified Commit ae84fdb5 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #336271 from GaetanLepage/rye 

rye: 0.38.0 -> 0.39.0 + move to pkgs/by-name + format
parents ce88c3a8 b2ec32e8

pkgs/development/tools/rye/Cargo.lock→pkgs/by-name/ry/rye/Cargo.lock

+284 −232

File changed and moved.

Preview size limit exceeded, changes collapsed.

pkgs/development/tools/rye/default.nix→pkgs/by-name/ry/rye/package.nix

+34 −24
Original line number Diff line number Diff line 
{ lib

, rustPlatform

, fetchFromGitHub

, installShellFiles

, pkg-config

, openssl

, stdenv

, CoreServices

, Libsystem

, SystemConfiguration

, nix-update-script

, testers

, rye

{

  lib,

  rustPlatform,

  fetchFromGitHub,



  # nativeBuildInputs

  installShellFiles,

  pkg-config,



  # buildInputs

  openssl,

  stdenv,

  darwin,



  # passthru

  nix-update-script,

  testers,

  rye,

}:



rustPlatform.buildRustPackage rec {

  pname = "rye";

  version = "0.38.0";

  version = "0.39.0";



  src = fetchFromGitHub {

    owner = "mitsuhiko";

    repo = "rye";

    rev = "refs/tags/${version}";

    hash = "sha256-mTVpNyFEovaOdOBTcASSRejKfSs50cqpDuStDAkcdkQ=";

    hash = "sha256-qDXD5vNoIppe1EWKxr1tssgAelEKoMdZ/y7Dq979PwI=";

  };



  cargoLock = {
@@ -36,16 +41,21 @@ rustPlatform.buildRustPackage rec { 
    OPENSSL_NO_VENDOR = 1;

  };



  nativeBuildInputs = [ installShellFiles pkg-config ];

  nativeBuildInputs = [

    installShellFiles

    pkg-config

  ];



  buildInputs = [

    openssl

  ]

  ++ lib.optionals stdenv.isDarwin [

    CoreServices

  buildInputs =

    [ openssl ]

    ++ lib.optionals stdenv.isDarwin (

      with darwin.apple_sdk;

      [

        frameworks.CoreServices

        frameworks.SystemConfiguration

        Libsystem

    SystemConfiguration

  ];

      ]

    );



  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

    installShellCompletion --cmd rye \

pkgs/top-level/all-packages.nix

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














  rufo = callPackage ../development/tools/rufo { };



























  rye = darwin.apple_sdk_11_0.callPackage ../development/tools/rye {













    inherit (darwin.apple_sdk_11_0) Libsystem;













    inherit (darwin.apple_sdk_11_0.frameworks) CoreServices SystemConfiguration;













  };



























  samurai = callPackage ../development/tools/build-managers/samurai { };





























  muon = callPackage ../development/tools/build-managers/muon { };