summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSomeone <sergei.kozlukov@aalto.fi>2023-12-19 11:02:22 +0000
committerGitHub <noreply@github.com>2023-12-19 11:02:22 +0000
commit9d500595950c81e102e6444e2eb2f21bcaeb8823 (patch)
tree1918549711f0026536ed8977110e3d67a6fc4a73
parentMerge pull request #275194 from bobby285271/upd/cinnamon (diff)
parentrye: 0.15.2 -> 0.16.0 (diff)
downloadnixpkgs-9d500595950c81e102e6444e2eb2f21bcaeb8823.tar.gz
Merge pull request #274846 from GaetanLepage/rye
rye: 0.15.2 -> 0.16.0
-rw-r--r--pkgs/development/tools/rye/Cargo.lock8
-rw-r--r--pkgs/development/tools/rye/default.nix8
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/development/tools/rye/Cargo.lock b/pkgs/development/tools/rye/Cargo.lock
index 892612190b10..a4a5984a04de 100644
--- a/pkgs/development/tools/rye/Cargo.lock
+++ b/pkgs/development/tools/rye/Cargo.lock
@@ -463,9 +463,9 @@ dependencies = [
[[package]]
name = "curl-sys"
-version = "0.4.61+curl-8.0.1"
+version = "0.4.67+curl-8.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14d05c10f541ae6f3bc5b3d923c20001f47db7d5f0b2bc6ad16490133842db79"
+checksum = "3cc35d066510b197a0f72de863736641539957628c8a42e70e27c66849e77c34"
dependencies = [
"cc",
"libc",
@@ -473,7 +473,7 @@ dependencies = [
"openssl-sys",
"pkg-config",
"vcpkg",
- "winapi",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -1772,7 +1772,7 @@ dependencies = [
[[package]]
name = "rye"
-version = "0.15.2"
+version = "0.16.0"
dependencies = [
"age",
"anyhow",
diff --git a/pkgs/development/tools/rye/default.nix b/pkgs/development/tools/rye/default.nix
index 409d7d1723ca..5a40f695419a 100644
--- a/pkgs/development/tools/rye/default.nix
+++ b/pkgs/development/tools/rye/default.nix
@@ -5,19 +5,20 @@
, pkg-config
, openssl
, stdenv
+, CoreServices
, Libsystem
, SystemConfiguration
}:
rustPlatform.buildRustPackage rec {
pname = "rye";
- version = "0.15.2";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "mitsuhiko";
repo = "rye";
rev = "refs/tags/${version}";
- hash = "sha256-q7/obBE16aKb8BHf5ycXSgXTMLWAFwxSnJ3qV35TdL8=";
+ hash = "sha256-AIM61JEgWMDjeZVnOVamBiCXTT5LLEktwQpRtnflgcw=";
};
cargoLock = {
@@ -38,6 +39,7 @@ rustPlatform.buildRustPackage rec {
openssl
]
++ lib.optionals stdenv.isDarwin [
+ CoreServices
Libsystem
SystemConfiguration
];
@@ -56,7 +58,9 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "A tool to easily manage python dependencies and environments";
homepage = "https://github.com/mitsuhiko/rye";
+ changelog = "https://github.com/mitsuhiko/rye/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ GaetanLepage ];
+ mainProgram = "rye";
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 365d2749551a..6d1b7bf80480 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19969,7 +19969,7 @@ with pkgs;
rye = darwin.apple_sdk_11_0.callPackage ../development/tools/rye {
inherit (darwin.apple_sdk_11_0) Libsystem;
- inherit (darwin.apple_sdk_11_0.frameworks) SystemConfiguration;
+ inherit (darwin.apple_sdk_11_0.frameworks) CoreServices SystemConfiguration;
};
samurai = callPackage ../development/tools/build-managers/samurai { };