M-Labs/nix-scripts
12
0
Fork 12
Code Issues 5 Pull Requests 1 Releases Wiki Activity

refresh URLs and versions

Browse Source
This commit is contained in:
Sebastien Bourdeauducq
2026-01-03 11:57:34 +08:00
parent e35f95b2e1
commit 5991b10faa
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gluelogic/fpgatools.nix
View File

@@ -1,7 +1,7 @@
{ pkgs, isePath ? "/opt/Xilinx/14.7/ISE_DS", vivadoPath ? "/opt/Xilinx/Vivado/2022.2" }:
rec {
ise = let
makeXilinxEnv = name: pkgs.buildFHSUserEnv {
makeXilinxEnv = name: pkgs.buildFHSEnv {
inherit name;
targetPkgs = pkgs: (
with pkgs; [
@@ -26,7 +26,7 @@ rec {
};
in
pkgs.lib.attrsets.genAttrs ["xst" "ngdbuild" "cpldfit" "taengine" "hprep6"] makeXilinxEnv;
vivado = pkgs.buildFHSUserEnv {
vivado = pkgs.buildFHSEnv {
name = "vivado";
targetPkgs = pkgs: (
with pkgs; let
@@ -55,12 +55,11 @@ rec {
};
migen = pkgs.python3Packages.buildPythonPackage {
pname = "migen";
version = "unstable-2024-05-02";
src = pkgs.fetchFromGitHub {
owner = "m-labs";
repo = "migen";
rev = "4790bb577681a8c3a8d226bc196a4e5deb39e4df";
sha256 = "sha256-4DCHBUBfc/VA+7NW2Hr0+JP4NnKPru2uVJyZjCCk0Ws=";
version = "unstable-2026-01-03";
src = pkgs.fetchgit {
url = "https://git.m-labs.hk/M-Labs/migen.git";
rev = "673e0e8a66600f7e8dcd6345759630474d6b9c80";
sha256 = "sha256-nDk/+FsTuX/P9ujWf2eTJdMY2+r953+eq7LMlYNBH38=";
};
format = "pyproject";
nativeBuildInputs = [ pkgs.python3Packages.setuptools ];
@@ -76,19 +75,20 @@ rec {
sha256 = "0yzkka9jk3612v8gx748x6ziwykq5lr7zmr9wzkcls0v2yilqx9k";
};
propagatedBuildInputs = with pkgs.python3Packages; [ pyserial ];
format = "pyproject";
nativeBuildInputs = [ pkgs.python3Packages.setuptools ];
};
misoc = pkgs.python3Packages.buildPythonPackage {
pname = "misoc";
version = "unstable-2021-10-10";
src = pkgs.fetchFromGitHub {
owner = "m-labs";
repo = "misoc";
src = pkgs.fetchgit {
url = "https://git.m-labs.hk/M-Labs/misoc.git";
rev = "f5203e406520874e15ab5d070058ef642fc57fd9";
sha256 = "sha256-/2XTejqj0Bo81HaTrlTSWwInnWwsuqnq+CURXbpIrkA=";
fetchSubmodules = true;
};
# TODO: fix misoc bitrot and re-enable tests
doCheck = false;
format = "pyproject";
nativeBuildInputs = [ pkgs.python3Packages.setuptools ];
propagatedBuildInputs = with pkgs.python3Packages; [ pyserial jinja2 numpy asyncserial migen ];
};
}

2
gluelogic/mirny-legacy-almazny.diff
View File

@@ -36,7 +36,7 @@ index 1bea35a..5e93809 100644
## Building
-Needs migen and ISE.
+Needs [migen](https://github.com/m-labs/migen) and [Xilinx ISE](https://www.xilinx.com/products/design-tools/ise-design-suite.html). Assumes ISE is installed in ``/opt/Xilinx``.
+Needs [migen](https://git.m-labs.hk/M-Labs/migen) and [Xilinx ISE](https://www.xilinx.com/products/design-tools/ise-design-suite.html). Assumes ISE is installed in ``/opt/Xilinx``.
```
make