cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Revert "lua: fix on darwin by using makeBinaryWrapper (#172749)"

Browse source 
This reverts commit 92f4c6ed82.
On aarch64-darwin this completely broke lua instead of improving it;
let's revert at least until that's resolved.
https://github.com/NixOS/nixpkgs/pull/172749#issuecomment-1133759233
This commit is contained in:
Vladimír Čunát 2022-05-22 15:45:36 +02:00
parent a7d4e415b2
commit 9f4060c552
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/interpreters/lua-5/default.nix
View file

@ -1,11 +1,10 @@
# similar to interpreters/python/default.nix # similar to interpreters/python/default.nix
{ stdenv, lib, callPackage, fetchurl, fetchpatch, makeBinaryWrapper }: { stdenv, lib, callPackage, fetchurl, fetchpatch }:
rec { rec {
lua5_4 = callPackage ./interpreter.nix { lua5_4 = callPackage ./interpreter.nix {
sourceVersion = { major = "5"; minor = "4"; patch = "3"; }; sourceVersion = { major = "5"; minor = "4"; patch = "3"; };
hash = "1yxvjvnbg4nyrdv10bq42gz6dr66pyan28lgzfygqfwy2rv24qgq"; hash = "1yxvjvnbg4nyrdv10bq42gz6dr66pyan28lgzfygqfwy2rv24qgq";
makeWrapper = makeBinaryWrapper;
patches = lib.optional stdenv.isDarwin ./5.4.darwin.patch; patches = lib.optional stdenv.isDarwin ./5.4.darwin.patch;
}; };
@ -17,7 +16,6 @@ rec {
lua5_3 = callPackage ./interpreter.nix { lua5_3 = callPackage ./interpreter.nix {
sourceVersion = { major = "5"; minor = "3"; patch = "6"; }; sourceVersion = { major = "5"; minor = "3"; patch = "6"; };
hash = "0q3d8qhd7p0b7a4mh9g7fxqksqfs6mr1nav74vq26qvkp2dxcpzw"; hash = "0q3d8qhd7p0b7a4mh9g7fxqksqfs6mr1nav74vq26qvkp2dxcpzw";
makeWrapper = makeBinaryWrapper;
patches = patches =
lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ]; lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ];
@ -31,7 +29,6 @@ rec {
lua5_2 = callPackage ./interpreter.nix { lua5_2 = callPackage ./interpreter.nix {
sourceVersion = { major = "5"; minor = "2"; patch = "4"; }; sourceVersion = { major = "5"; minor = "2"; patch = "4"; };
hash = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr"; hash = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr";
makeWrapper = makeBinaryWrapper;
patches = lib.optional stdenv.isDarwin ./5.2.darwin.patch; patches = lib.optional stdenv.isDarwin ./5.2.darwin.patch;
}; };
@ -43,7 +40,6 @@ rec {
lua5_1 = callPackage ./interpreter.nix { lua5_1 = callPackage ./interpreter.nix {
sourceVersion = { major = "5"; minor = "1"; patch = "5"; }; sourceVersion = { major = "5"; minor = "1"; patch = "5"; };
hash = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; hash = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333";
makeWrapper = makeBinaryWrapper;
patches = (lib.optional stdenv.isDarwin ./5.1.darwin.patch) patches = (lib.optional stdenv.isDarwin ./5.1.darwin.patch)
++ [ ./CVE-2014-5461.patch ]; ++ [ ./CVE-2014-5461.patch ];
}; };

1
pkgs/development/interpreters/lua-5/interpreter.nix
View file

@ -126,7 +126,6 @@ self = stdenv.mkDerivation rec {
passthru = rec { passthru = rec {
buildEnv = callPackage ./wrapper.nix { buildEnv = callPackage ./wrapper.nix {
lua = self; lua = self;
inherit makeWrapper;
inherit (luaPackages) requiredLuaModules; inherit (luaPackages) requiredLuaModules;
}; };
withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;}; withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;};

1
pkgs/tools/typesetting/sile/default.nix
View file

@ -114,6 +114,7 @@ stdenv.mkDerivation rec {
homepage = "https://sile-typesetter.org"; homepage = "https://sile-typesetter.org";
changelog = "https://github.com/sile-typesetter/sile/raw/v${version}/CHANGELOG.md"; changelog = "https://github.com/sile-typesetter/sile/raw/v${version}/CHANGELOG.md";
platforms = platforms.unix; platforms = platforms.unix;
broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/23018
maintainers = with maintainers; [ doronbehar alerque ]; maintainers = with maintainers; [ doronbehar alerque ];
license = licenses.mit; license = licenses.mit;
}; };