public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2021-03-04 22:16:45 +01:00
parent 9f7ce23482 a992d68671
commit 6d1958ad2d
325 changed files with 4167 additions and 1748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/interpreters/erlang/R21.nix
View File

@@ -1,10 +1,6 @@
{ mkDerivation }:
mkDerivation {
version = "21.3.8.3";
sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw";
prePatch = ''
substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}"
'';
version = "21.3.8.21";
sha256 = "sha256-zQCs2hOA66jxAaxl/B42EKCejAktIav2rpVQCNyKCh4=";
}

9
pkgs/development/interpreters/erlang/R22.nix
View File

@@ -3,11 +3,6 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
version = "22.3";
sha256 = "0srbyncgnr1kp0rrviq14ia3h795b3gk0iws5ishv6rphcq1rs27";
prePatch = ''
substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}"
substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' ""
'';
version = "22.3.4.16";
sha256 = "sha256-V0RwEPfjnHtEzShNh6Q49yGC5fbt2mNR4xy6f6iWvck=";
}

9
pkgs/development/interpreters/erlang/R23.nix
View File

@@ -3,11 +3,6 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
version = "23.1.4";
sha256 = "16ssxmrgjgvzg06aa1l4wz9rrdjfy39k22amgabxwb5if1g8bg8z";
prePatch = ''
substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}"
substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' ""
'';
version = "23.2.6";
sha256 = "sha256-G930sNbr8h5ryI/IE+J6OKhR5ij68ZhGo1YIEjSOwGU=";
}

10
pkgs/development/interpreters/erlang/generic-builder.nix
View File

@@ -57,20 +57,13 @@ in stdenv.mkDerivation ({
++ optionals odbcSupport odbcPackages
++ optionals javacSupport javacPackages
++ optional withSystemd systemd
++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ Carbon Cocoa ]);
++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ AGL Carbon Cocoa WebKit ]);
debugInfo = enableDebugInfo;
# On some machines, parallel build reliably crashes on `GEN asn1ct_eval_ext.erl` step
enableParallelBuilding = parallelBuild;
# Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
prePatch = ''
substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
${prePatch}
'';
postPatch = ''
patchShebangs make
@@ -132,6 +125,7 @@ in stdenv.mkDerivation ({
// optionalAttrs (preUnpack != "") { inherit preUnpack; }
// optionalAttrs (postUnpack != "") { inherit postUnpack; }
// optionalAttrs (patches != []) { inherit patches; }
// optionalAttrs (prePatch != "") { inherit prePatch; }
// optionalAttrs (patchPhase != "") { inherit patchPhase; }
// optionalAttrs (configurePhase != "") { inherit configurePhase; }
// optionalAttrs (preConfigure != "") { inherit preConfigure; }

26
pkgs/development/interpreters/lua-5/filesystem.nix
View File

@@ -1,26 +0,0 @@
{ stdenv, fetchurl, lua5 }:
stdenv.mkDerivation {
version = "1.6.2";
pname = "lua-filesystem";
isLibrary = true;
src = fetchurl {
url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz";
sha256 = "1n8qdwa20ypbrny99vhkmx8q04zd2jjycdb5196xdhgvqzk10abz";
};
buildInputs = [ lua5 ];
preBuild = ''
makeFlagsArray=(
PREFIX=$out
LUA_LIBDIR="$out/lib/lua/${lua5.luaversion}"
LUA_INC="-I${lua5}/include");
'';
meta = {
homepage = "https://github.com/keplerproject/luafilesystem";
hydraPlatforms = lib.platforms.linux;
maintainers = [ ];
};
}

25
pkgs/development/interpreters/lua-5/sockets.nix
View File

@@ -1,25 +0,0 @@
{ stdenv, fetchurl, lua5 }:
stdenv.mkDerivation rec {
pname = "lua-sockets";
version = "2.0.2";
src = fetchurl {
url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz";
sha256 = "19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag";
};
luaver = lua5.luaversion;
patchPhase = ''
sed -e "s,^INSTALL_TOP_SHARE.*,INSTALL_TOP_SHARE=$out/share/lua/${lua5.luaversion}," \
-e "s,^INSTALL_TOP_LIB.*,INSTALL_TOP_LIB=$out/lib/lua/${lua5.luaversion}," \
-i config
'';
buildInputs = [ lua5 ];
meta = {
homepage = "http://w3.impa.br/~diego/software/luasocket/";
hydraPlatforms = lib.platforms.linux;
maintainers = [ ];
};
}