saji/niar
1
0
Fork 0
mirror of https://git.sr.ht/~kivikakk/niar synced 2024-12-22 17:12:24 +00:00
Code Activity

flake.nix: use our amaranth fork again for now.

Browse source 
packageOverrides doesn't compose, ugggggggh.
This commit is contained in:
Asherah Connor 2024-08-29 16:54:45 +03:00
parent 4cb42dfedf
commit 282e4447a3
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
flake.nix
View file

@ -19,13 +19,14 @@
python = let python = let
packageOverrides = final: prev: { packageOverrides = final: prev: {
amaranth = prev.amaranth.overridePythonAttrs { amaranth = prev.amaranth.overridePythonAttrs {
version = "0.6.0.dev45"; version = "0.6.0.dev52";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "amaranth-lang"; owner = "kivikakk";
repo = "amaranth"; repo = "amaranth";
rev = "bc2e90913311e326d8f396e33d7a1c7f6eef6e4e"; rev = "f8ea807a9108a99ec801d1f1e4b8e63019ec82ec";
hash = "sha256-WkZl3XcTfBXoQ/ZigyW/wIGge5PlRPmpuOIcjLEoVTM="; hash = "sha256-A46CMWGvqUFTp3geFFccUM9M7iECmNndzWm2GxA8XbE";
}; };
doCheck = false; # uninit'd mem breaks lots of tests.
}; };
amaranth-boards = prev.amaranth-boards.overridePythonAttrs rec { amaranth-boards = prev.amaranth-boards.overridePythonAttrs rec {
@ -78,6 +79,8 @@
doCheck = true; doCheck = true;
nativeCheckInputs = [python.pkgs.pytestCheckHook] ++ toolchain-pkgs; nativeCheckInputs = [python.pkgs.pytestCheckHook] ++ toolchain-pkgs;
dontCheckRuntimeDeps = 1; # amaranth 0.6.0.devX doesn't match anything.
}; };
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {