b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #192097 from Luflosi/update/nextpnr

Browse source
This commit is contained in:
Sandro 2022-09-27 22:01:06 +02:00 committed by GitHub
parent f4d294eede 7bcf01fd98
commit 592815804a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/compilers/nextpnr/default.nix
View file

@ -14,14 +14,14 @@ let
in
stdenv.mkDerivation rec {
pname = "nextpnr";
version = "0.3";
version = "0.4";
srcs = [
(fetchFromGitHub {
owner = "YosysHQ";
repo = "nextpnr";
rev = "${pname}-${version}";
hash = "sha256-q4h1TNAn66fJou8abNFowRbGXZTBfz5x+H5Q/psMvIw=";
hash = "sha256-gnNUFSV+/SzCuP43KyUUgVNdAzjOM7lOLNJT72L8lTY=";
name = "nextpnr";
})
(fetchFromGitHub {

15
pkgs/development/embedded/fpga/trellis/default.nix
View file

@ -1,30 +1,27 @@
{ lib, stdenv, fetchFromGitHub, python3, boost, cmake }:
let
rev = "2f06397673bbca3da11928d538b8ab7d01c944c6";
rev = "488f4e71073062de314c55a037ede7cf03a3324c";
# git describe --tags
realVersion = "1.0-534-g${builtins.substring 0 7 rev}";
realVersion = "1.2.1-14-g${builtins.substring 0 7 rev}";
in stdenv.mkDerivation rec {
pname = "trellis";
version = "2021-12-14";
version = "unstable-2022-09-14";
srcs = [
(fetchFromGitHub {
owner = "YosysHQ";
repo = "prjtrellis";
inherit rev;
hash = "sha256-m5CalAIbzY2bhOvpBbPBeLZeDp+itk1HlRsSmtiddaA=";
hash = "sha256-Blbu+0rlM/3izbF0XCvkNpSAND0IclWEwK7anzyrpvw=";
name = "trellis";
})
(fetchFromGitHub {
owner = "YosysHQ";
repo = "prjtrellis-db";
# note: the upstream submodule points to revision 0ee729d20eaf,
# but that's just the tip of the branch that was merged into master.
# fdf4bf275a is the merge commit itself
rev = "fdf4bf275a7402654bc643db537173e2fbc86103";
sha256 = "eDq2wU2pnfK9bOkEVZ07NQPv02Dc6iB+p5GTtVBiyQA=";
rev = "35d900a94ff0db152679a67bf6e4fbf40ebc34aa";
hash = "sha256-r6viR8y9ZjURGNbsa0/YY8lzy9kGzjuu408ntxwpqm0=";
name = "trellis-database";
})
];