Merge pull request #210065 from figsoda/selene

selene: 0.23.1 -> 0.24.0
This commit is contained in:
figsoda 2023-01-11 13:36:23 -05:00 committed by GitHub
commit 8e0e5f43f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,7 +1,6 @@
{ lib { lib
, rustPlatform , rustPlatform
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, robloxSupport ? true , robloxSupport ? true
, pkg-config , pkg-config
, openssl , openssl
@ -11,26 +10,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "selene"; pname = "selene";
version = "0.23.1"; version = "0.24.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kampfkarren"; owner = "kampfkarren";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-gD49OzhpO059wawA+PJc8SIYQ23965LF21zqIfj62Y4="; sha256 = "sha256-tw9OLdXhqxgqROub0P/+nd4LQGNw3QDxlCyyf8ogRQM=";
}; };
cargoSha256 = "sha256-oekqM/Jvh0z6O6iJhSi7Ph5gsF5Fssr5ItKpmyozhPk="; cargoSha256 = "sha256-5/xAX8BhB81cB7x2Pe/MKCV0Fi76ZcO6XHFQxTVIuLA=";
patches = [
# fix broken test
# https://github.com/kampfkarren/selene/pull/471
(fetchpatch {
name = "fix-test-roblox-incorrect-roact-usage.patch";
url = "https://github.com/kampfkarren/selene/commit/f4abf9f3fb639b372fe4ac47449f8a1e455c28a5.patch";
sha256 = "sha256-nk7HGygXXu91cqiRZBA/sLBlaJLkNg90C2NX8Kr1WGA=";
})
];
nativeBuildInputs = lib.optionals robloxSupport [ nativeBuildInputs = lib.optionals robloxSupport [
pkg-config pkg-config
@ -38,7 +27,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optionals robloxSupport [ buildInputs = lib.optionals robloxSupport [
openssl openssl
] ++ lib.optional (robloxSupport && stdenv.isDarwin) [ ] ++ lib.optionals (robloxSupport && stdenv.isDarwin) [
darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.Security
]; ];