Compare commits

..

No commits in common. "master" and "134-m-labs-intl" have entirely different histories.

2 changed files with 2 additions and 2 deletions

View File

@ -1,4 +1,4 @@
{ pkgs, isePath ? "/opt/Xilinx/14.7/ISE_DS", vivadoPath ? "/opt/Xilinx/Vivado/2022.2" }: { pkgs, isePath ? "/opt/Xilinx/14.7/ISE_DS", vivadoPath ? "/opt/Xilinx/Vivado/2021.2" }:
rec { rec {
ise = let ise = let
makeXilinxEnv = name: pkgs.buildFHSUserEnv { makeXilinxEnv = name: pkgs.buildFHSUserEnv {

View File

@ -8,7 +8,7 @@ in
web-intl = pkgs.runCommand "web-intl" {} web-intl = pkgs.runCommand "web-intl" {}
'' ''
cd ${web-src} cd ${web-src}
DOMAINNAME=m-labs.hk ${pkgs.zola}/bin/zola build -o $out DOMAINNAME=m-labs-intl.com ${pkgs.zola}/bin/zola build -o $out
''; '';
sphinxcontrib-platformpicker = pkgs.python3Packages.buildPythonPackage rec { sphinxcontrib-platformpicker = pkgs.python3Packages.buildPythonPackage rec {
pname = "sphinxcontrib-platformpicker"; pname = "sphinxcontrib-platformpicker";