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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2020-02-28 11:30:44 +01:00
parent 35f00b429b f7d07d4851
commit bb701376cf
103 changed files with 1336 additions and 724 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/dart/default.nix
+40 -30
View File
@@ -1,50 +1,59 @@
{ stdenv, fetchurl, unzip, version ? "2.0.0" }:
{ stdenv, fetchurl, unzip, version ? "2.7.1" }:
let
sources = let
base = "https://storage.googleapis.com/dart-archive/channels";
stable = "${base}/stable/release";
dev = "${base}/dev/release";
stable_version = "stable";
dev_version = "dev";
x86_64 = "x64";
i686 = "ia32";
aarch64 = "arm64";
in {
"1.16.1-x86_64-linux" = fetchurl {
url = "${stable}/${version}/sdk/dartsdk-linux-x64-release.zip";
sha256 = "01cbnc8hd2wwprmivppmzvld9ps644k16wpgqv31h1596l5p82n2";
};
"1.16.1-i686-linux" = fetchurl {
url = "${stable}/${version}/sdk/dartsdk-linux-ia32-release.zip";
sha256 = "0jfwzc3jbk4n5j9ka59s9bkb25l5g85fl1nf676mvj36swcfykx3";
};
"1.24.3-x86_64-linux" = fetchurl {
url = "${stable}/${version}/sdk/dartsdk-linux-x64-release.zip";
sha256 = "e323c97c35e6bc5d955babfe2e235a5484a82bb1e4870fa24562c8b9b800559b";
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
sha256 = "16sm02wbkj328ni0z1z4n4msi12lb8ijxzmbbfamvg766mycj8z3";
};
"1.24.3-i686-linux" = fetchurl {
url = "${stable}/${version}/sdk/dartsdk-linux-ia32-release.zip";
sha256 = "d67b8f8f9186e7d460320e6bce25ab343c014b6af4b2f61369ee83755d4da528";
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
sha256 = "0a559mfpb0zfd49zdcpld95h2g1lmcjwwsqf69hd9rw6j67qyyyn";
};
"2.0.0-x86_64-linux" = fetchurl {
url = "${stable}/${version}/sdk/dartsdk-linux-x64-release.zip";
sha256 = "4014a1e8755d2d32cc1573b731a4a53acdf6dfca3e26ee437f63fe768501d336";
"1.24.3-aarch64-linux" = fetchurl {
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
sha256 = "1p5bn04gr91chcszgmw5ng8mlzgwsrdr2v7k7ppwr1slkx97fsrh";
};
"2.0.0-i686-linux" = fetchurl {
url = "${stable}/${version}/sdk/dartsdk-linux-ia32-release.zip";
sha256 = "3164a9de70bf11ab5b20af0d51c8b3303f2dce584604dce33bea0040bdc0bbba";
"2.7.1-x86_64-linux" = fetchurl {
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
sha256 = "1zjd9hxxg1dsyzkzgqjvl933kprf8h143z5qi4mj1iczxv7zp27a";
};
"2.0.0-dev.26.0-x86_64-linux" = fetchurl {
url = "${dev}/${version}/sdk/dartsdk-linux-x64-release.zip";
sha256 = "18360489a7914d5df09b34934393e16c7627ba673c1e9ab5cfd11cd1d58fd7df";
"2.7.1-i686-linux" = fetchurl {
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
sha256 = "0cggr1jbhzahmazlhba0vw2chz9zxd98jgk6zxvxdnw5hvkx8si1";
};
"2.0.0-dev.26.0-i686-linux" = fetchurl {
url = "${dev}/${version}/sdk/dartsdk-linux-ia32-release.zip";
sha256 = "83ba8b64c76f48d8de4e0eb887e49b7960053f570d27e7ea438cc0bac789955e";
"2.7.1-aarch64-linux" = fetchurl {
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
sha256 = "0m4qlc3zy87habr61npykvpclggn5k4hadl59v2b0ymvxa4h5zfh";
};
"2.8.0-dev.10.0-x86_64-linux" = fetchurl {
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
sha256 = "17x0q94zampm99dd2sn6q1644lfwcl0ig2rdlmfzd9i4llj2ddbl";
};
"2.8.0-dev.10.0-i686-linux" = fetchurl {
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
sha256 = "0hmkg4jrffzh8x2mxn8nbf7dl7k0v2vacbmxgpsl382vw9wwj96j";
};
"2.8.0-dev.10.0-aarch64-linux" = fetchurl {
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
sha256 = "185ipcmr9h76g44kzlj5pyj99cljlap82rhd1c2larfklyj5ryvv";
};
};
in
with stdenv.lib;
stdenv.mkDerivation {
pname = "dart";
@@ -65,19 +74,20 @@ stdenv.mkDerivation {
$out/bin/dart
'';
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
libPath = makeLibraryPath [ stdenv.cc.cc ];
dontStrip = true;
meta = {
platforms = [ "i686-linux" "x86_64-linux" ];
homepage = https://www.dartlang.org/;
maintainers = with maintainers; [ grburst ];
description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps";
longDescription = ''
Dart is a class-based, single inheritance, object-oriented language
with C-style syntax. It offers compilation to JavaScript, interfaces,
mixins, abstract classes, reified generics, and optional typing.
'';
license = stdenv.lib.licenses.bsd3;
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
license = licenses.bsd3;
};
}
pkgs/development/interpreters/lua-5/build-lua-package.nix
+15 -7
View File
@@ -56,7 +56,7 @@ name ? "${attrs.pname}-${attrs.version}"
# Appended to the generated luarocks config
, extraConfig ? ""
# Inserted into the generated luarocks config in the "variables" table
, extraVariables ? ""
, extraVariables ? {}
# The two above arguments have access to builder variables -- e.g. to $out
# relative to srcRoot, path to the rockspec to use when using rocks
@@ -77,7 +77,10 @@ let
# luarocks only looks for rockspecs in the default/system tree instead of all
# configured trees)
luarocks_config = "luarocks-config.lua";
luarocks_content = ''
luarocks_content = let
extraVariablesStr = lib.concatStringsSep "\n "
(lib.mapAttrsToList (k: v: "${k}='${v}';") extraVariables);
in ''
local_cache = ""
-- To prevent collisions when creating environments, we install the rock
-- files into per-package subdirectories
@@ -105,8 +108,8 @@ let
-- Some needed machinery to handle multiple-output external dependencies,
-- as per https://github.com/luarocks/luarocks/issues/766
${lib.optionalString (lib.length depVariables > 0) ''
${lib.concatStringsSep "\n " depVariables}''}
${extraVariables}
${lib.concatStringsSep "\n " depVariables}''}
${extraVariablesStr}
}
${extraConfig}
'';
@@ -139,7 +142,7 @@ let
externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps;
in
toLuaModule ( lua.stdenv.mkDerivation (
builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps"] // {
builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariables"] // {
name = namePrefix + name;
@@ -199,8 +202,6 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps"] // {
LUAROCKS="$LUAROCKS --verbose"
fi
patchShebangs .
runHook postBuild
'';
@@ -229,6 +230,13 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps"] // {
runHook postInstall
'';
checkPhase = attrs.checkPhase or ''
runHook preCheck
$LUAROCKS test
runHook postCheck
'';
passthru = {
inherit lua; # The lua interpreter
inherit externalDeps;
pkgs/development/interpreters/rakudo/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rakudo";
version = "2020.01";
version = "2020.02";
src = fetchurl {
url = "https://github.com/rakudo/rakudo/releases/download/${version}/rakudo-${version}.tar.gz";
sha256 = "1c63ns90zy13gyj0l27k63q7dv08w4589w605nywd7pplbygq0if";
sha256 = "0yhld3ij4mfa42chkfph7lzcl5q9b613hdjmw9rv46appmxvvmrs";
};
buildInputs = [ icu zlib gmp perl ];
pkgs/development/interpreters/rakudo/moarvm.nix
+5 -5
View File
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
pname = "moarvm";
version = "2020.01.1";
version = "2020.02";
src = fetchurl {
url = "https://github.com/MoarVM/MoarVM/releases/download/${version}/MoarVM-${version}.tar.gz";
sha256 = "11rmlps6r3nqa9m2yyv9i2imahirsqmxbfay71f3gs4ql121xdnw";
};
url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz";
sha256 = "1kz97yy357lax7xdz4mnnwswn7axhp14nq0dw3n6xbcpap6m82aw";
};
buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
doCheck = false; # MoarVM does not come with its own test suite
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "VM with adaptive optimization and JIT compilation, built for Rakudo";
homepage = "https://github.com/MoarVM/MoarVM";
homepage = "https://www.moarvm.org/";
license = licenses.artistic2;
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice vrthra sgo ];
pkgs/development/interpreters/rakudo/nqp.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nqp";
version = "2020.01";
version = "2020.02";
src = fetchurl {
url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz";
sha256 = "0nwn6a9i9akw1zmywhkn631gqy8l4dvy50d6id63zir28ccrrk2c";
sha256 = "0ik3fscywxjx1qxlbjf68msz83alpckzw3myj9jmkalvy8q5v0nk";
};
buildInputs = [ perl ];
pkgs/development/interpreters/rakudo/zef.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zef";
version = "0.8.2";
version = "0.8.3";
src = fetchFromGitHub {
owner = "ugexe";
repo = "zef";
rev = "v${version}";
sha256 = "064nbl2hz55mpxdcy9zi39s2z6bad3bj73xsna966a7hzkls0a70";
sha256 = "1fscv8fbaa5l8dcwclmq3hvg3c59l4dvyjqb316mgnc5anxpzy2f";
};
buildInputs = [ rakudo makeWrapper ];