diff --git a/flake.lock b/flake.lock index dbda3ea..788c403 100644 --- a/flake.lock +++ b/flake.lock @@ -21,17 +21,14 @@ "lowrisc-nix": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "pyproject-build-systems": "pyproject-build-systems", - "pyproject-nix": "pyproject-nix", - "uv2nix": "uv2nix" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1751885167, - "narHash": "sha256-TtEMkxsSWyYSbqo4ZnXo1UEs1KQLyoyMvtFTRnQV1gA=", + "lastModified": 1760457119, + "narHash": "sha256-jbAOK8dLYJSnNzw4CVyJyIsC/lF+wbafcm2OAcYA1Yc=", "owner": "lowRISC", "repo": "lowrisc-nix", - "rev": "c35c0810b974643d81eb4af2b6e926c9d6773e38", + "rev": "4a535a458743de4bff0ecf31d18883c78533a6e8", "type": "github" }, "original": { @@ -42,11 +39,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750400657, - "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", + "lastModified": 1759994382, + "narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", + "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7", "type": "github" }, "original": { @@ -58,50 +55,21 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751274312, - "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", + "lastModified": 1761468971, + "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "pyproject-build-systems": { - "inputs": { - "nixpkgs": [ - "lowrisc-nix", - "nixpkgs" - ], - "pyproject-nix": [ - "lowrisc-nix", - "pyproject-nix" - ], - "uv2nix": [ - "lowrisc-nix", - "uv2nix" - ] - }, - "locked": { - "lastModified": 1749519371, - "narHash": "sha256-UJONN7mA2stweZCoRcry2aa1XTTBL0AfUOY84Lmqhos=", - "owner": "pyproject-nix", - "repo": "build-system-pkgs", - "rev": "7c06967eca687f3482624250428cc12f43c92523", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "build-system-pkgs", - "type": "github" - } - }, - "pyproject-build-systems_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -114,11 +82,11 @@ ] }, "locked": { - "lastModified": 1752574539, - "narHash": "sha256-Dl/TGWnrsmmyFVApbpoVosAwOjocJRP2VAoOVbYK+KA=", + "lastModified": 1759113590, + "narHash": "sha256-fgxP2RCN4cg0jYiMYoETYc7TZ2JjgyvJa2y9l8oSUFE=", "owner": "pyproject-nix", "repo": "build-system-pkgs", - "rev": "dfa1792728c7a3c34e22491e9fa272ed24e53012", + "rev": "dbfc0483b5952c6b86e36f8b3afeb9dde30ea4b5", "type": "github" }, "original": { @@ -128,38 +96,17 @@ } }, "pyproject-nix": { - "inputs": { - "nixpkgs": [ - "lowrisc-nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750499893, - "narHash": "sha256-ThKBd8XSvITAh2JqU7enOp8AfKeQgf9u7zYC41cnBE4=", - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "rev": "e824458bd917b44bf4c38795dea2650336b2f55d", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "type": "github" - } - }, - "pyproject-nix_2": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1752762157, - "narHash": "sha256-xF39K+Sd5+Sv2YqarHEwFpzCC3sKz83M7/tCg99/8Uk=", + "lastModified": 1760402624, + "narHash": "sha256-jF6UKLs2uGc2rtved8Vrt58oTWjTQoAssuYs/0578Z4=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "fa35449a527d07cf3c7856687d18a999dd0dd241", + "rev": "84c4ea102127c77058ea1ed7be7300261fafc7d2", "type": "github" }, "original": { @@ -172,9 +119,9 @@ "inputs": { "lowrisc-nix": "lowrisc-nix", "nixpkgs": "nixpkgs_2", - "pyproject-build-systems": "pyproject-build-systems_2", - "pyproject-nix": "pyproject-nix_2", - "uv2nix": "uv2nix_2" + "pyproject-build-systems": "pyproject-build-systems", + "pyproject-nix": "pyproject-nix", + "uv2nix": "uv2nix" } }, "systems": { @@ -193,31 +140,6 @@ } }, "uv2nix": { - "inputs": { - "nixpkgs": [ - "lowrisc-nix", - "nixpkgs" - ], - "pyproject-nix": [ - "lowrisc-nix", - "pyproject-nix" - ] - }, - "locked": { - "lastModified": 1749778965, - "narHash": "sha256-MDq5YPXq3VO7aGrIIz9IMexJcdRiLCcDK4Bk3Kev7Sw=", - "owner": "pyproject-nix", - "repo": "uv2nix", - "rev": "22ddf88e3a06551b769f0a585601d89180c69a38", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "uv2nix", - "type": "github" - } - }, - "uv2nix_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -227,11 +149,11 @@ ] }, "locked": { - "lastModified": 1752805696, - "narHash": "sha256-GpqeCI2n6sSdIEY/vG9qbQOoN+4/ZcSEhnFeLXG/hxs=", + "lastModified": 1761527626, + "narHash": "sha256-neDfvbpFlzUQfH9C+hVRUX0/RXUbJBidw4pFcdMYhZA=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "8c77cd2cb5a9693e26fb8579f6a25565d99e400d", + "rev": "46a8e8bbb2d9e34b686329ac16e4a8861394f03a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d71251b..0e1635a 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ description = "Python env for rdl2ot"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; uv2nix = { url = "github:pyproject-nix/uv2nix"; inputs.pyproject-nix.follows = "pyproject-nix"; diff --git a/rdl2ot/pyproject.toml b/rdl2ot/pyproject.toml index 63cab65..41e5538 100644 --- a/rdl2ot/pyproject.toml +++ b/rdl2ot/pyproject.toml @@ -4,13 +4,13 @@ [project] name = "rdl2ot" -version = "0.2.0" +version = "0.3.0" description = "An extension of PeakRDL to generate OpenTitan RTL." requires-python = ">=3.10" keywords = ["SystemRDL", "OpenTitan", "Codegen"] readme = "README.md" dependencies = [ - "click>=8.2.1", + "click>=8.3.0", "jinja2>=3.1.6", "systemrdl-compiler>=1.29", ]