Merge branch 'master' into rename-z77z-into-maggesi

This commit is contained in:
Marco Maggesi
2019-10-13 18:06:23 +02:00
committed by GitHub
852 changed files with 29211 additions and 15602 deletions
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.raskin ];
broken = true;
};
}
+3 -2
View File
@@ -4,7 +4,8 @@ callPackage ./default.nix {
version = "2.0.5";
isStable = true;
sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
extraMeta = {
platforms = lib.filter (p: p != "aarch64-linux") lib.meta.platforms;
extraMeta = { # this isn't precise but it at least stops the useless Hydra build
platforms = with lib; filter (p: p != "aarch64-linux")
(platforms.linux ++ platforms.darwin);
};
}
@@ -62,12 +62,12 @@ stdenv.mkDerivation rec {
interpreter = "${self}/bin/lua";
};
meta = with stdenv.lib; extraMeta // {
meta = with stdenv.lib; {
description = "High-performance JIT compiler for Lua 5.1";
homepage = http://luajit.org;
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ thoughtpolice smironov vcunat andir ];
};
} // extraMeta;
}
@@ -55,5 +55,6 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ proglodyte ];
platforms = platforms.linux;
license = licenses.asl20;
broken = true;
};
}
@@ -104,9 +104,9 @@ in {
major = "3";
minor = "8";
patch = "0";
suffix = "b3";
suffix = "rc1";
};
sha256 = "03wq85pkpr9j56k3zg6whahc5park1pzshbakl7y50lzrkpq2ynd";
sha256 = "08d8j3dsv6yz5zxkqvsa71scxjjzdwarfk6hsjfhaw2xrxndyi5f";
inherit (darwin) CF configd;
inherit passthruFun;
};
@@ -27,9 +27,9 @@ setuptoolsShellHook() {
if test -e setup.py; then
tmp_path=$(mktemp -d)
export PATH="$tmp_path/bin:$PATH"
export PYTHONPATH="@pythonSitePackages@:$PYTHONPATH"
export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH"
mkdir -p "$tmp_path/@pythonSitePackages@"
eval "@pythonInterpreter@ -m pip -e . --prefix $tmp_path >&2"
eval "@pythonInterpreter@ -m pip install -e . --prefix $tmp_path >&2"
fi
runHook postShellHook