M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

gluelogic: update to nixos 24.05

This commit is contained in:
Sébastien Bourdeauducq 2024-06-06 14:50:02 +08:00
parent af2287b22f
commit ba49749783
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gluelogic/fpgatools.nix
View File

@ -29,8 +29,16 @@ rec {
vivado = pkgs.buildFHSUserEnv { vivado = pkgs.buildFHSUserEnv {
name = "vivado"; name = "vivado";
targetPkgs = pkgs: ( targetPkgs = pkgs: (
with pkgs; [ with pkgs; let
ncurses5 # Apply patch from https://github.com/nix-community/nix-environments/pull/54
# to fix ncurses libtinfo.so's soname issue
ncurses' = ncurses5.overrideAttrs (old: {
configureFlags = old.configureFlags ++ [ "--with-termlib" ];
postFixup = "";
});
in [
libxcrypt-legacy
(ncurses'.override { unicodeSupport = false; })
zlib zlib
libuuid libuuid
xorg.libSM xorg.libSM
@ -40,20 +48,22 @@ rec {
xorg.libXext xorg.libXext
xorg.libXtst xorg.libXtst
xorg.libXi xorg.libXi
] ++ ( if pkgs ? libxcrypt-legacy then [ pkgs.libxcrypt-legacy ] else []) ]
); );
profile = "source ${vivadoPath}/settings64.sh"; profile = "source ${vivadoPath}/settings64.sh";
runScript = "vivado"; runScript = "vivado";
}; };
migen = pkgs.python3Packages.buildPythonPackage { migen = pkgs.python3Packages.buildPythonPackage {
pname = "migen"; pname = "migen";
version = "unstable-2021-12-16"; version = "unstable-2024-05-02";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "m-labs"; owner = "m-labs";
repo = "migen"; repo = "migen";
rev = "ac703010eaa06ac9b6e32f97c6fa98b15de22b31"; rev = "4790bb577681a8c3a8d226bc196a4e5deb39e4df";
sha256 = "sha256-qpVj/yJf4hDDc99XXpVPH4EbLC8aCmEtACn5qNc3DGI="; sha256 = "sha256-4DCHBUBfc/VA+7NW2Hr0+JP4NnKPru2uVJyZjCCk0Ws=";
}; };
format = "pyproject";
nativeBuildInputs = [ pkgs.python3Packages.setuptools ];
propagatedBuildInputs = with pkgs.python3Packages; [ colorama ]; propagatedBuildInputs = with pkgs.python3Packages; [ colorama ];
}; };
asyncserial = pkgs.python3Packages.buildPythonPackage { asyncserial = pkgs.python3Packages.buildPythonPackage {

2
hydra/artiq.json
View File

@ -147,7 +147,7 @@
"emailoverride": "", "emailoverride": "",
"keepnr": 50, "keepnr": 50,
"inputs": { "inputs": {
"nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-21.05", "emailresponsible": false }, "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-24.05", "emailresponsible": false },
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
"urukulSrc": { "type": "git", "value": "https://github.com/quartiq/urukul.git", "emailresponsible": false }, "urukulSrc": { "type": "git", "value": "https://github.com/quartiq/urukul.git", "emailresponsible": false },
"mirnySrc": { "type": "git", "value": "https://github.com/quartiq/mirny.git", "emailresponsible": false }, "mirnySrc": { "type": "git", "value": "https://github.com/quartiq/mirny.git", "emailresponsible": false },