Merge pull request #336271 from GaetanLepage/rye

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

pkgs/by-name/ry/rye/package.nix

@@ -1,27 +1,32 @@
-{ 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,17 +41,22 @@ rustPlatform.buildRustPackage rec {
     OPENSSL_NO_VENDOR = 1;
   };
 
-  nativeBuildInputs = [ installShellFiles pkg-config ];
-
-  buildInputs = [
-    openssl
-  ]
-  ++ lib.optionals stdenv.isDarwin [
-    CoreServices
-    Libsystem
-    SystemConfiguration
+  nativeBuildInputs = [
+    installShellFiles
+    pkg-config
   ];
 
+  buildInputs =
+    [ openssl ]
+    ++ lib.optionals stdenv.isDarwin (
+      with darwin.apple_sdk;
+      [
+        frameworks.CoreServices
+        frameworks.SystemConfiguration
+        Libsystem
+      ]
+    );
+
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd rye \
       --bash <($out/bin/rye self completion -s bash) \

pkgs/top-level/all-packages.nix

@@ -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 { };