Merge master into staging-next
This commit is contained in:
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
|
||||
version = "2018.09.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cseed";
|
||||
owner = "yosyshq";
|
||||
repo = "arachne-pnr";
|
||||
rev = "840bdfdeb38809f9f6af4d89dd7b22959b176fdd";
|
||||
sha256 = "1dqvjvgvsridybishv4pnigw9gypxh7r7nrqp9z9qq92v7c5rxzl";
|
||||
|
||||
@@ -14,7 +14,7 @@ let
|
||||
name = "dmd.conf";
|
||||
text = (lib.generators.toINI {} {
|
||||
"Environment" = {
|
||||
DFLAGS = ''-I$@out@/include/d2 -L-L$@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}'';
|
||||
DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}'';
|
||||
};
|
||||
});
|
||||
};
|
||||
@@ -135,15 +135,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cd ../druntime
|
||||
mkdir $out/include
|
||||
mkdir $out/include/d2
|
||||
cp -r import/* $out/include/d2
|
||||
mkdir $out/include/dmd
|
||||
cp -r import/* $out/include/dmd
|
||||
|
||||
cd ../phobos
|
||||
mkdir $out/lib
|
||||
cp generated/${osname}/release/${bits}/libphobos2.* $out/lib
|
||||
|
||||
cp -r std $out/include/d2
|
||||
cp -r etc $out/include/d2
|
||||
cp -r std $out/include/dmd
|
||||
cp -r etc $out/include/dmd
|
||||
|
||||
wrapProgram $out/bin/dmd \
|
||||
--prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \
|
||||
|
||||
@@ -37,7 +37,7 @@ assert langGo -> langCC;
|
||||
with stdenv.lib;
|
||||
with builtins;
|
||||
|
||||
let version = "8.2.0";
|
||||
let version = "8.3.0";
|
||||
|
||||
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
|
||||
|
||||
@@ -132,7 +132,7 @@ stdenv.mkDerivation ({
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
|
||||
sha256 = "10007smilswiiv2ymazr3b6x2i933c0ycxrr529zh4r6p823qv0r";
|
||||
sha256 = "0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4";
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
|
||||
@@ -27,13 +27,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nextpnr-${version}";
|
||||
version = "2019.01.08";
|
||||
version = "2019.02.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yosyshq";
|
||||
repo = "nextpnr";
|
||||
rev = "c1d15c749c2aa105ee7b38ebe1b60a27e3743e8c";
|
||||
sha256 = "082ac03s6164s7dwz1l9phshl8m1lizn45jykabrhks5jcccchbh";
|
||||
rev = "e8d3aaaf34895a073e4023192d97fc936d090990";
|
||||
sha256 = "0ijqpjnn7x16crd6cmd4nmgay320flizmjb7bbvg9hv464z3p4x7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nim-${version}";
|
||||
version = "0.19.0";
|
||||
version = "0.19.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://nim-lang.org/download/${name}.tar.xz";
|
||||
sha256 = "0biwvw1gividp5lkf0daq1wp9v6ms4xy6dkf5zj0sn9w4m3n76d1";
|
||||
sha256 = "0k59dhfsg5wnkc3nxg5a336pjd9jnfxabns63bl9n28iwdg16hgl";
|
||||
};
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
@@ -8,14 +8,14 @@ with builtins;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "yosys-${version}";
|
||||
version = "2019.01.08";
|
||||
version = "2019.02.22";
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "yosyshq";
|
||||
repo = "yosys";
|
||||
rev = "2a2e0a4722ded7628b71f436b94a06aebd57bb62";
|
||||
sha256 = "19wzh7yssk90s58l2f89m0q5bjjrjpkhvikf5zc0563wccvl712c";
|
||||
rev = "c521f4632f1c82b48a5538c832980668044e8fd9";
|
||||
sha256 = "18pg1ry5qhhx8c49n2gqwlf55sd9bfsfk3khfyh1a1vjh1qpfgdf";
|
||||
name = "yosys";
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user