Merge pull request #205565 from figsoda/selene
selene: 0.23.0 -> 0.23.1
This commit is contained in:
commit
87b3cba1d8
2 changed files with 24 additions and 10 deletions
|
@ -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;
|
||||
|
||||
|
|
|
@ -17965,9 +17965,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;
|
||||
|
|
Loading…
Reference in a new issue