From 906e75054f129d9f46ba4391e46f5a89d24d9a4a Mon Sep 17 00:00:00 2001 From: Rutherther Date: Thu, 28 Dec 2023 15:37:23 +0100 Subject: [PATCH] chore: use python from nixpkgs instead of poetry --- .gitignore | 20 ++++++++ flake.lock | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 71 +++++++++++++++++++++++++++ 3 files changed, 232 insertions(+) create mode 100644 .gitignore create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..1d546704562ed643cf7488a7068e04fce4392d53 --- /dev/null +++ b/.gitignore @@ -0,0 +1,20 @@ +.DS_Store +.idea +*.log +tmp/ + +work/ +out/ +sim/ +.direnv/ + +__pycache__/ +vunit_out/ + +synth_1/ +utils_1/ +impl_1/ + +stopwatch.runs/ +stopwatch.hw/ +stopwatch.cache/ diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000000000000000000000000000000000000..51bc09ad5eb4de3c0b92d1cd6ce0b2eb16100432 --- /dev/null +++ b/flake.lock @@ -0,0 +1,141 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1698974481, + "narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "4bb5e752616262457bc7ca5882192a564c0472d2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1700856099, + "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils", + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_2", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1700890240, + "narHash": "sha256-AKbWnuDzDuXaYSXHXSj0Sa1DSmUm1KaFNJhf2MEhoS0=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "674fc0ef18bb62f3aea7684e09f20046a3cdfedf", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs", + "poetry2nix": "poetry2nix" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "id": "systems", + "type": "indirect" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1699786194, + "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000000000000000000000000000000000000..4a171b41aefe103bf07cab65375435eab52da21c --- /dev/null +++ b/flake.nix @@ -0,0 +1,71 @@ +{ + description = "NSV stopwatch"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + poetry2nix = { + url = "github:nix-community/poetry2nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = { self, poetry2nix, nixpkgs }: + let + system = "x86_64-linux"; + pkgs = import nixpkgs { + system = "${system}"; + }; + inherit (poetry2nix.lib.mkPoetry2Nix { + inherit pkgs; + }) mkPoetryPackages defaultPoetryOverrides; + + python-env = pkgs.python311.withPackages(ps: [ + (ps.buildPythonPackage rec { + pname = "vunit-hdl"; + version = "4.7.0"; + src = pkgs.fetchFromGitHub { + owner = "VUnit"; + repo = "vunit"; + rev = "v4.7.0"; + hash = "sha256-xhCPPnUXUdLg5kElbyJKW0tJOZMUoM1bV2siOsoz3Zs="; + }; + + doCheck = false; + + nativeBuildInputs = [ + ps.setuptoolsBuildHook + ps.setuptools + ps.pythonImportsCheckHook + + pkgs.ghdl # VHDL simulator needed for build/testing + ps.pytest + ]; + + buildInputs = [ + ps.colorama + ]; + }) + ]); + vhdl-toolchain = pkgs.symlinkJoin { + name = "vhdl-toolchain"; + meta.mainProgram = "nvc"; + paths = [ + pkgs.ghdl + pkgs.nvc + ]; + }; + in { + packages.${system}.default = vhdl-toolchain; + + devShells.${system}.default = pkgs.mkShell { + packages = [ + vhdl-toolchain + pkgs.vhdl-ls + pkgs.gtkwave + python-env + ]; + + VUNIT_SIMULATOR = "nvc"; + }; + }; +}