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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-02-09 09:18:17 +01:00
parent 60a479d91d 03755ed59a
commit 8847d57763
101 changed files with 2042 additions and 2433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/compilers/nextpnr/default.nix
View File

@@ -14,14 +14,14 @@ let
in
with stdenv; mkDerivation rec {
pname = "nextpnr";
version = "2019.10.13";
version = "2020.02.04";
srcs = [
(fetchFromGitHub {
owner = "YosysHQ";
repo = "nextpnr";
rev = "c365dd1cabc3a4308ab9110534918623622c246b";
sha256 = "1344pyq9xb5y1vxsnfgr488drfjsa6ls1jck0z9hwam6vg55s10r";
rev = "ca733561873cd54be047ae30a94efcd71b3f8be5";
sha256 = "176drrq6w53qbwmnksa1b22w9qz3gd1db9hy2lyv8svbcdxd9qwp";
name = "nextpnr";
})
(fetchFromGitHub {
@@ -45,10 +45,11 @@ with stdenv; mkDerivation rec {
enableParallelBuilding = true;
cmakeFlags =
[ "-DARCH=generic;ice40;ecp5"
[ "-DCURRENT_GIT_VERSION=${lib.substring 0 7 (lib.elemAt srcs 0).rev}"
"-DARCH=generic;ice40;ecp5"
"-DBUILD_TESTS=ON"
"-DICEBOX_ROOT=${icestorm}/share/icebox"
"-DTRELLIS_ROOT=${trellis}/share/trellis"
"-DTRELLIS_INSTALL_PREFIX=${trellis}"
"-DPYTRELLIS_LIBDIR=${trellis}/lib/trellis"
"-DUSE_OPENMP=ON"
# warning: high RAM usage
@@ -58,12 +59,7 @@ with stdenv; mkDerivation rec {
++ (lib.optional (enableGui && stdenv.isDarwin)
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks");
# Fix the version number. This is a bit stupid (and fragile) in practice
# but works ok. We should probably make this overrideable upstream.
patchPhase = with builtins; ''
substituteInPlace ./CMakeLists.txt \
--replace 'git log -1 --format=%h' 'echo ${substring 0 11 (elemAt srcs 0).rev}'
# use PyPy for icestorm if enabled
substituteInPlace ./ice40/family.cmake \
--replace ''\'''${PYTHON_EXECUTABLE}' '${icestorm.pythonInterp}'

4
pkgs/development/compilers/ponyc/default.nix
View File

@@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec {
pname = "ponyc";
version = "0.33.1";
version = "0.33.2";
src = fetchFromGitHub {
owner = "ponylang";
repo = pname;
rev = version;
sha256 = "0wqbnvxdzzwr9q4v9ha9r9jjymr6y8ba1rb2lkzrng4g9p6xqbxy";
sha256 = "0jcdr1r3g8sm3q9fcc87d6x98fg581n6hb90hz7r08mzn4bwvysw";
};
buildInputs = [ llvm makeWrapper which libxml2 ];

9
pkgs/development/compilers/yosys/default.nix
View File

@@ -15,14 +15,13 @@
stdenv.mkDerivation rec {
pname = "yosys";
version = "2020.02.01";
version = "2020.02.07";
src = fetchFromGitHub {
owner = "yosyshq";
owner = "YosysHQ";
repo = "yosys";
rev = "a1c840ca5d6e8b580e21ae48550570aa9665741a";
sha256 = "1vna04dh6l68nifssgs3hxqwn4k529krmm4crj94a8wwhwra52mh";
name = "yosys";
rev = "2e8d6ec0b06b4e51e222c15c8049130bc264ae57";
sha256 = "0asnqhxs5r5r2xmvsk9pbgyqgk53j1snh7c9qizcppn4csapda81";
};
enableParallelBuilding = true;