add flake/nix formatter (nixfmt)

flake now works with pyproject and flake-parts
2024-09-26 01:46:28 -05:00 · 2024-09-25 19:21:38 -05:00
15 changed files with 212 additions and 206 deletions
--- a/flake.lock
+++ b/flake.lock
@ -1,29 +1,32 @@
 {
  "nodes": {
-    "flake-utils": {
+    "flake-parts": {
      "inputs": {
-        "systems": "systems"
+        "nixpkgs-lib": [
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "lastModified": 1726153070,
+        "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
        "type": "github"
      },
      "original": {
-        "id": "flake-utils",
-        "type": "indirect"
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1723637854,
-        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
+        "lastModified": 1726937504,
+        "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
+        "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
        "type": "github"
      },
      "original": {
@ -35,24 +38,9 @@
    },
    "root": {
      "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-parts": "flake-parts",
        "nixpkgs": "nixpkgs"
      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -3,53 +3,68 @@

  inputs = {
    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-parts = {
+      url = "github:hercules-ci/flake-parts";
+      inputs.nixpkgs-lib.follows = "nixpkgs";
+    };
  };

-  outputs = inputs@{ self, nixpkgs, flake-utils, ... }:
-    let
-		python-overlay = import ./python.nix;
-      systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ];
-      forAllSystems = function:
-        nixpkgs.lib.genAttrs systems (system: function (
-          import nixpkgs {
-            inherit system;
-            config.allowUnfree = true;
-            overlays = [
-				python-overlay
+  outputs =
+    inputs@{ flake-parts, ... }:
+    flake-parts.lib.mkFlake { inherit inputs; } {
+
+      systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "aarch64-darwin"
+        "x86_64-darwin"
      ];
-          }
-        ));
-    in {
-      packages = forAllSystems (pkgs: {
-	  	niar = pkgs.python3.buildPythonPackage {
-			name = "niar";
-			version = pyproject-toml.project.version;
+
+      perSystem =
+        {
+          config,
+          self',
+          inputs',
+          pkgs,
+          system,
+          ...
+        }:
+        {
+          formatter = pkgs.nixfmt-rfc-style;
+          packages.default = pkgs.python3.pkgs.buildPythonPackage {
+            name = "groovylight";
+            version = "0.0.1";
            src = ./.;
-			pyproject = true;
+            format = "pyproject";

-			build-system = [pkgs.python3.pdm-backend];
+            build-system = [ pkgs.python3.pkgs.pdm-backend ];

-			propagatedBuildInpusts = [
-				pkgs.python3.amaranth
-				pkgs.python3.amaranth-boards
+            propagatedBuildInputs = [
+              pkgs.python3.pkgs.amaranth
+              pkgs.python3.pkgs.amaranth-boards
            ];

            doCheck = true;
-			nativeCheckInputs = [python3.pkgs.pytestCheckHook];
-		};
-      });
-      devShells = forAllSystems (pkgs: {
-        default = pkgs.mkShell {
-          packages = with pkgs; [
-            (python3.withPackages (pypkgs: with pypkgs; [ 
-              amaranth
-			  amaranth-boards
-            ]))
+            nativeCheckInputs = with pkgs; [
+              python3.pkgs.pytestCheckHook
+              yosys
+              nextpnr
+              trellis
+              openfpgaloader
+            ];
+
+          };
+          devShells.default = pkgs.mkShell {
+            packages = with pkgs; [
+              (python3.withPackages (
+                pypkgs: with pypkgs; [
+                  amaranth
+                  amaranth-boards
+                  self'.packages.default
+                ]
+              ))
              yosys
              nextpnr
-            # simulators
-            iverilog
-            verilator
              # support package
              trellis
              # loader
@ -57,6 +72,6 @@
              ecpdap # easier to poke probes.
            ];
          };
-      });
+        };
    };
 }
--- a/litex/default.nix
+++ b/litex/default.nix
@ -1,7 +1,8 @@
 # an overlay to
 let
  tag = "2023.12";
-in final: prev: {
+in
+final: prev: {
  wishbone-tool = prev.callPackage (import ./wishbone-tool.nix) { };
  pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
    (python-final: python-prev: {
@ -12,9 +13,12 @@ in final: prev: {
      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) { };
+      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)
+          { };
    })
  ];
 }
-
--- a/litex/litedram.nix
+++ b/litex/litedram.nix
@ -1,10 +1,12 @@
-tag: {
-  pkgs 
-, lib
-, buildPythonPackage 
-, migen
-, pyyaml
-}: buildPythonPackage {
+tag:
+{
+  pkgs,
+  lib,
+  buildPythonPackage,
+  migen,
+  pyyaml,
+}:
+buildPythonPackage {
  pname = "litedram";
  version = "${tag}";

--- a/litex/liteeth.nix
+++ b/litex/liteeth.nix
@ -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
--- a/litex/liteiclink.nix
+++ b/litex/liteiclink.nix
@ -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
--- a/litex/litescope.nix
+++ b/litex/litescope.nix
@ -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
--- a/litex/litespi.nix
+++ b/litex/litespi.nix
@ -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
--- a/litex/litex.nix
+++ b/litex/litex.nix
@ -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
--- a/litex/pythondata-cpu-vexriscv.nix
+++ b/litex/pythondata-cpu-vexriscv.nix
@ -1,7 +1,6 @@
-tag: {
-  pkgs 
-, buildPythonPackage 
-}: buildPythonPackage rec {
+tag:
+{ pkgs, buildPythonPackage }:
+buildPythonPackage rec {
  pname = "pythondata-cpu-vexriscv";
  version = "${tag}";

--- a/litex/pythondata-software-compiler_rt.nix
+++ b/litex/pythondata-software-compiler_rt.nix
@ -1,7 +1,6 @@
-tag: {
-  pkgs 
-, buildPythonPackage 
-}: buildPythonPackage rec {
+tag:
+{ pkgs, buildPythonPackage }:
+buildPythonPackage rec {
  pname = "pythondata-software-compiler_rt";
  version = "${tag}";

--- a/litex/pythondata-software-picolibc.nix
+++ b/litex/pythondata-software-picolibc.nix
@ -1,7 +1,6 @@
-tag: {
-  pkgs 
-, buildPythonPackage 
-}: buildPythonPackage rec {
+tag:
+{ pkgs, buildPythonPackage }:
+buildPythonPackage rec {
  pname = "pythondata-software-picolibc";
  version = "${tag}";

--- a/litex/wishbone-tool.nix
+++ b/litex/wishbone-tool.nix
@ -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=";
 }
--- a/pyproject.toml
+++ b/pyproject.toml
@ -13,6 +13,10 @@ requires-python = "==3.12.*"
 readme = "README.md"
 license = {text = "MIT"}

+[build-system]
+requires = ["pdm-backend"]
+build-backend = "pdm.backend"
+
 [tool.pdm.dev-dependencies] 
 dev = [
    "basedpyright",
Author	SHA1	Message	Date
Saji	ccdbc98cb0	add flake/nix formatter (nixfmt) Some checks failed Verilator Unit Tests / Test (push) Failing after 3m35s Details	2024-09-26 01:46:28 -05:00
Saji	79927f0cbd	flake now works with pyproject and flake-parts	2024-09-25 19:21:38 -05:00