ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-12 23:48:25 +03:00
Code Issues Projects Releases Wiki Activity

Merge #287755: Remove rebuild-avoiding conditionals in resholve musl fixes

Browse Source 
...into staging
This commit is contained in:
Vladimír Čunát 2024-02-17 10:56:37 +01:00
commit 7e61d8d50f
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/misc/resholve/oildev.nix
View File

@ -120,7 +120,6 @@ rec {
rm cpp/stdlib.h # keep modules from finding the wrong stdlib?
# work around hard parse failure documented in oilshell/oil#1468
substituteInPlace osh/cmd_parse.py --replace 'elif self.c_id == Id.Op_LParen' 'elif False'
'' + lib.optionalString (!stdenv.hostPlatform.isGnu && !stdenv.hostPlatform.isDarwin) ''
# disable fragile libc tests
substituteInPlace build/py.sh --replace "py-ext-test pyext/libc_test.py" "#py-ext-test pyext/libc_test.py"
'';

3
pkgs/tools/security/yara/default.nix
View File

@ -25,8 +25,7 @@ stdenv.mkDerivation rec {
hash = "sha256-axHFy7YwLhhww+lh+ORyW6YG+T385msysIHK5SMyhMk=";
};
# FIXME: make unconditional on staging
patches = lib.optionals (!stdenv.hostPlatform.isGnu && !stdenv.hostPlatform.isDarwin) [
patches = [
(fetchpatch {
name = "musl.patch";
url = "https://github.com/VirusTotal/yara/commit/515ed861cf30e154b14a69ffd46c347fb81df72f.patch";