add flake/nix formatter (nixfmt)
Some checks failed
Verilator Unit Tests / Test (push) Failing after 3m35s

This commit is contained in:
Saji 2024-09-26 01:45:57 -05:00
parent 79927f0cbd
commit ccdbc98cb0
13 changed files with 191 additions and 199 deletions

View file

@ -9,41 +9,35 @@
};
};
outputs = inputs@{flake-parts, ... }:
outputs =
inputs@{ flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; } {
# flake = let
# in {
# };
# devShells."x86_64-linux".default = pkgs.mkShell {
# packages = with pkgs; [
# (python3.withPackages (pypkgs: with pypkgs; [
# amaranth
# amaranth-boards
# ]))
# yosys
# nextpnr
# # simulators
# iverilog
# verilator
# # support package
# trellis
# # loader
# openfpgaloader
# ecpdap # easier to poke probes.
# ];
# };
# };
systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ];
systems = [
"x86_64-linux"
"aarch64-linux"
"aarch64-darwin"
"x86_64-darwin"
];
perSystem = {config, self', inputs', pkgs, system, ...}: {
perSystem =
{
config,
self',
inputs',
pkgs,
system,
...
}:
{
formatter = pkgs.nixfmt-rfc-style;
packages.default = pkgs.python3.pkgs.buildPythonPackage {
name = "groovylight";
version = "0.0.1";
src = ./.;
format = "pyproject";
build-system = [pkgs.python3.pkgs.pdm-backend];
build-system = [ pkgs.python3.pkgs.pdm-backend ];
propagatedBuildInputs = [
pkgs.python3.pkgs.amaranth
@ -62,16 +56,15 @@
};
devShells.default = pkgs.mkShell {
packages = with pkgs; [
(python3.withPackages (pypkgs: with pypkgs; [
(python3.withPackages (
pypkgs: with pypkgs; [
amaranth
amaranth-boards
]))
self'.packages.default
]
))
yosys
nextpnr
# simulators
iverilog
verilator
# support package
trellis
# loader

View file

@ -1,20 +1,24 @@
# an overlay to
let
tag = "2023.12";
in final: prev: {
wishbone-tool = prev.callPackage(import ./wishbone-tool.nix) { };
in
final: prev: {
wishbone-tool = prev.callPackage (import ./wishbone-tool.nix) { };
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
(python-final: python-prev: {
litex = python-final.callPackage(import ./litex.nix tag) { };
litedram = python-final.callPackage(import ./litedram.nix tag) { };
liteeth = python-final.callPackage(import ./liteeth.nix tag) { };
litescope = python-final.callPackage(import ./litescope.nix tag) { };
litespi = python-final.callPackage(import ./litespi.nix tag) { };
liteiclink = python-final.callPackage(import ./liteiclink.nix tag) { };
pythondata-cpu-vexriscv = python-final.callPackage(import ./pythondata-cpu-vexriscv.nix tag) { };
pythondata-software-compiler_rt = python-final.callPackage(import ./pythondata-software-compiler_rt.nix tag) { };
pythondata-software-picolibc = python-final.callPackage(import ./pythondata-software-picolibc.nix tag) { };
litex = python-final.callPackage (import ./litex.nix tag) { };
litedram = python-final.callPackage (import ./litedram.nix tag) { };
liteeth = python-final.callPackage (import ./liteeth.nix tag) { };
litescope = python-final.callPackage (import ./litescope.nix tag) { };
litespi = python-final.callPackage (import ./litespi.nix tag) { };
liteiclink = python-final.callPackage (import ./liteiclink.nix tag) { };
pythondata-cpu-vexriscv = python-final.callPackage (import ./pythondata-cpu-vexriscv.nix tag) { };
pythondata-software-compiler_rt =
python-final.callPackage (import ./pythondata-software-compiler_rt.nix tag)
{ };
pythondata-software-picolibc =
python-final.callPackage (import ./pythondata-software-picolibc.nix tag)
{ };
})
];
}

View file

@ -1,10 +1,12 @@
tag: {
pkgs
, lib
, buildPythonPackage
, migen
, pyyaml
}: buildPythonPackage {
tag:
{
pkgs,
lib,
buildPythonPackage,
migen,
pyyaml,
}:
buildPythonPackage {
pname = "litedram";
version = "${tag}";

View file

@ -1,12 +1,14 @@
tag: {
pkgs
, lib
, buildPythonPackage
, migen
, setuptools
, litex
, pyyaml
}: buildPythonPackage {
tag:
{
pkgs,
lib,
buildPythonPackage,
migen,
setuptools,
litex,
pyyaml,
}:
buildPythonPackage {
pname = "liteeth";
version = "${tag}";
@ -17,17 +19,11 @@ tag: {
hash = "sha256-DUNwDzcFLVmL5F/ZWmok7T7jO7ixC9IuDr1WUarnAqk=";
};
buildInputs = [
litex
];
buildInputs = [ litex ];
propagatedBuildInputs = [
migen
];
propagatedBuildInputs = [ migen ];
nativeCheckInputs = [
pyyaml
];
nativeCheckInputs = [ pyyaml ];
checkPhase = ''
python -m unittest test

View file

@ -1,8 +1,10 @@
tag: {
pkgs
, buildPythonPackage
, litex
}: buildPythonPackage {
tag:
{
pkgs,
buildPythonPackage,
litex,
}:
buildPythonPackage {
pname = "liteiclink";
version = "${tag}";
@ -13,9 +15,7 @@ tag: {
hash = "sha256-5Hp5vFqmfkXo1q60FvOkToTy952svirChIPIvkam04M=";
};
buildInputs = [
litex
];
buildInputs = [ litex ];
checkPhase = ''
python -m unittest test

View file

@ -1,11 +1,13 @@
tag: {
pkgs
, lib
, buildPythonPackage
, migen
, setuptools
, litex
}: buildPythonPackage {
tag:
{
pkgs,
lib,
buildPythonPackage,
migen,
setuptools,
litex,
}:
buildPythonPackage {
pname = "litescope";
version = "${tag}";
@ -16,9 +18,7 @@ tag: {
hash = "sha256-OWC+XwB+BzlCQkPKJCbQ0W4T6JbsInldrn9jYYjWypM=";
};
buildInputs = [
litex
];
buildInputs = [ litex ];
checkPhase = ''
python -m unittest test

View file

@ -1,11 +1,13 @@
tag: {
pkgs
, lib
, buildPythonPackage
, migen
, setuptools
, litex
}: buildPythonPackage {
tag:
{
pkgs,
lib,
buildPythonPackage,
migen,
setuptools,
litex,
}:
buildPythonPackage {
pname = "litespi";
version = "${tag}";
@ -16,16 +18,11 @@ tag: {
hash = "sha256-XYeWokF1IGtZWRK+6jhRSN91MOV5vyh5aO08sbtFBxw=";
};
buildInputs = [
litex
];
buildInputs = [ litex ];
propagatedBuildInputs = [
migen
];
propagatedBuildInputs = [ migen ];
nativeCheckInputs = [
];
nativeCheckInputs = [ ];
checkPhase = ''
python -m unittest test

View file

@ -1,13 +1,15 @@
tag: {
pkgs
, lib
, buildPythonPackage
, pyserial
, migen
, requests
, packaging
, pexpect
}: buildPythonPackage {
tag:
{
pkgs,
lib,
buildPythonPackage,
pyserial,
migen,
requests,
packaging,
pexpect,
}:
buildPythonPackage {
pname = "litex";
version = "${tag}";
@ -18,9 +20,7 @@ tag: {
hash = "sha256-OcwqYLQ7ec2vTewdIJqP/aTCJ4yI43OIOkTMD/hIKO0=";
};
buildInputs = [
migen
];
buildInputs = [ migen ];
propagatedBuildInputs = [
requests

View file

@ -1,7 +1,6 @@
tag: {
pkgs
, buildPythonPackage
}: buildPythonPackage rec {
tag:
{ pkgs, buildPythonPackage }:
buildPythonPackage rec {
pname = "pythondata-cpu-vexriscv";
version = "${tag}";

View file

@ -1,7 +1,6 @@
tag: {
pkgs
, buildPythonPackage
}: buildPythonPackage rec {
tag:
{ pkgs, buildPythonPackage }:
buildPythonPackage rec {
pname = "pythondata-software-compiler_rt";
version = "${tag}";

View file

@ -1,7 +1,6 @@
tag: {
pkgs
, buildPythonPackage
}: buildPythonPackage rec {
tag:
{ pkgs, buildPythonPackage }:
buildPythonPackage rec {
pname = "pythondata-software-picolibc";
version = "${tag}";

View file

@ -1,4 +1,8 @@
{ lib, fetchFromGitHub, rustPlatform }:
{
lib,
fetchFromGitHub,
rustPlatform,
}:
rustPlatform.buildRustPackage rec {
pname = "wishbone-tool";
@ -12,6 +16,5 @@ rustPlatform.buildRustPackage rec {
};
sourceRoot = "${src.name}/wishbone-tool";
cargoHash = "sha256-kWvtZEXtb5bZ7/hd8jsr41UGSDOuDU4tyKWAL0kDoIg=";
}

View file

@ -22,7 +22,7 @@ final: prev: {
rev = "19b97324ecf9111c5d16377af79f82aad761c476";
hash = "sha256-0uvn91i/yuIY75lL5Oxvozdw7Q2Uw83JWo7srgEYEpI=";
};
build-system = [pyprev.pdm-backend];
build-system = [ pyprev.pdm-backend ];
dontCheckRuntimeDeps = 1;
};
};