lol

Merge pull request #192097 from Luflosi/update/nextpnr

authored by

Sandro and committed by
GitHub
59281580 f4d294ee

+8 -11
+2 -2
pkgs/development/compilers/nextpnr/default.nix
··· 14 in 15 stdenv.mkDerivation rec { 16 pname = "nextpnr"; 17 - version = "0.3"; 18 19 srcs = [ 20 (fetchFromGitHub { 21 owner = "YosysHQ"; 22 repo = "nextpnr"; 23 rev = "${pname}-${version}"; 24 - hash = "sha256-q4h1TNAn66fJou8abNFowRbGXZTBfz5x+H5Q/psMvIw="; 25 name = "nextpnr"; 26 }) 27 (fetchFromGitHub {
··· 14 in 15 stdenv.mkDerivation rec { 16 pname = "nextpnr"; 17 + version = "0.4"; 18 19 srcs = [ 20 (fetchFromGitHub { 21 owner = "YosysHQ"; 22 repo = "nextpnr"; 23 rev = "${pname}-${version}"; 24 + hash = "sha256-gnNUFSV+/SzCuP43KyUUgVNdAzjOM7lOLNJT72L8lTY="; 25 name = "nextpnr"; 26 }) 27 (fetchFromGitHub {
+6 -9
pkgs/development/embedded/fpga/trellis/default.nix
··· 1 { lib, stdenv, fetchFromGitHub, python3, boost, cmake }: 2 3 let 4 - rev = "2f06397673bbca3da11928d538b8ab7d01c944c6"; 5 # git describe --tags 6 - realVersion = "1.0-534-g${builtins.substring 0 7 rev}"; 7 in stdenv.mkDerivation rec { 8 pname = "trellis"; 9 - version = "2021-12-14"; 10 11 srcs = [ 12 (fetchFromGitHub { 13 owner = "YosysHQ"; 14 repo = "prjtrellis"; 15 inherit rev; 16 - hash = "sha256-m5CalAIbzY2bhOvpBbPBeLZeDp+itk1HlRsSmtiddaA="; 17 name = "trellis"; 18 }) 19 20 (fetchFromGitHub { 21 owner = "YosysHQ"; 22 repo = "prjtrellis-db"; 23 - # note: the upstream submodule points to revision 0ee729d20eaf, 24 - # but that's just the tip of the branch that was merged into master. 25 - # fdf4bf275a is the merge commit itself 26 - rev = "fdf4bf275a7402654bc643db537173e2fbc86103"; 27 - sha256 = "eDq2wU2pnfK9bOkEVZ07NQPv02Dc6iB+p5GTtVBiyQA="; 28 name = "trellis-database"; 29 }) 30 ];
··· 1 { lib, stdenv, fetchFromGitHub, python3, boost, cmake }: 2 3 let 4 + rev = "488f4e71073062de314c55a037ede7cf03a3324c"; 5 # git describe --tags 6 + realVersion = "1.2.1-14-g${builtins.substring 0 7 rev}"; 7 in stdenv.mkDerivation rec { 8 pname = "trellis"; 9 + version = "unstable-2022-09-14"; 10 11 srcs = [ 12 (fetchFromGitHub { 13 owner = "YosysHQ"; 14 repo = "prjtrellis"; 15 inherit rev; 16 + hash = "sha256-Blbu+0rlM/3izbF0XCvkNpSAND0IclWEwK7anzyrpvw="; 17 name = "trellis"; 18 }) 19 20 (fetchFromGitHub { 21 owner = "YosysHQ"; 22 repo = "prjtrellis-db"; 23 + rev = "35d900a94ff0db152679a67bf6e4fbf40ebc34aa"; 24 + hash = "sha256-r6viR8y9ZjURGNbsa0/YY8lzy9kGzjuu408ntxwpqm0="; 25 name = "trellis-database"; 26 }) 27 ];