From f5e2b0daaf791cd671d8b77e3d579c780ded5410 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 10 Dec 2022 17:18:20 -0500 Subject: [PATCH] selene: 0.23.0 -> 0.23.1 Diff: https://github.com/kampfkarren/selene/compare/0.23.0...0.23.1 Changelog: https://github.com/kampfkarren/selene/blob/0.23.1/CHANGELOG.md --- pkgs/development/tools/selene/default.nix | 30 +++++++++++++++++------ pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/selene/default.nix b/pkgs/development/tools/selene/default.nix index ec780ccef057..5ca33613c96d 100644 --- a/pkgs/development/tools/selene/default.nix +++ b/pkgs/development/tools/selene/default.nix @@ -1,30 +1,46 @@ { lib , rustPlatform , fetchFromGitHub +, fetchpatch , robloxSupport ? true , pkg-config , openssl , stdenv -, Security +, darwin }: rustPlatform.buildRustPackage rec { pname = "selene"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "kampfkarren"; repo = pname; rev = version; - sha256 = "sha256-z1jefnWtaV97kq7CpfKsnFOgLHXDBonsmZTfUKJ4VIM="; + sha256 = "sha256-gD49OzhpO059wawA+PJc8SIYQ23965LF21zqIfj62Y4="; }; - cargoSha256 = "sha256-TjkileWGB7ocBJPGh2Bm1ucigwL4j/uXgIOAonPHjbA="; + cargoSha256 = "sha256-oekqM/Jvh0z6O6iJhSi7Ph5gsF5Fssr5ItKpmyozhPk="; - nativeBuildInputs = lib.optional robloxSupport pkg-config; + 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="; + }) + ]; - buildInputs = lib.optional robloxSupport openssl - ++ lib.optional (robloxSupport && stdenv.isDarwin) Security; + nativeBuildInputs = lib.optionals robloxSupport [ + pkg-config + ]; + + buildInputs = lib.optionals robloxSupport [ + openssl + ] ++ lib.optional (robloxSupport && stdenv.isDarwin) [ + darwin.apple_sdk.frameworks.Security + ]; buildNoDefaultFeatures = !robloxSupport; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a13a4a8fa98..c3a7d69d1209 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17963,9 +17963,7 @@ with pkgs; segger-ozone = callPackage ../development/tools/misc/segger-ozone { }; - selene = callPackage ../development/tools/selene { - inherit (darwin.apple_sdk.frameworks) Security; - }; + selene = callPackage ../development/tools/selene { }; shadowenv = callPackage ../tools/misc/shadowenv { inherit (darwin.apple_sdk.frameworks) Security;