From d07407818d2f444ca3cc10e57e412109cde7f1e4 Mon Sep 17 00:00:00 2001 From: Las Safin Date: Sat, 25 Sep 2021 12:35:42 +0000 Subject: [PATCH] Pin version of yosys --- flake.lock | 20 +++++++++++++++++++- flake.nix | 9 ++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index c69ffb0b..8193dbc8 100644 --- a/flake.lock +++ b/flake.lock @@ -104,7 +104,25 @@ "nix-litex": "nix-litex", "nixpkgs": "nixpkgs", "nmigen": "nmigen", - "nmigen-soc": "nmigen-soc" + "nmigen-soc": "nmigen-soc", + "yosys": "yosys" + } + }, + "yosys": { + "flake": false, + "locked": { + "lastModified": 1617979565, + "narHash": "sha256-M8ppe+lL/pgd2sXh7bM6/sbk1099KKECeWA5mXtqE6Y=", + "owner": "YosysHQ", + "repo": "yosys", + "rev": "a58571d0fe8971cb7d3a619a31b2c21be6d75bac", + "type": "github" + }, + "original": { + "owner": "YosysHQ", + "repo": "yosys", + "rev": "a58571d0fe8971cb7d3a619a31b2c21be6d75bac", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 54ddb1a8..3bd7f9e9 100644 --- a/flake.nix +++ b/flake.nix @@ -12,10 +12,12 @@ inputs.nmigen-soc.flake = false; inputs.migen.url = "github:m-labs/migen"; inputs.migen.flake = false; + inputs.yosys.url = "github:YosysHQ/yosys?rev=a58571d0fe8971cb7d3a619a31b2c21be6d75bac"; + inputs.yosys.flake = false; inputs.nix-litex.url = "git+https://git.sr.ht/~lschuermann/nix-litex?ref=main"; inputs.nix-litex.flake = false; - outputs = { self, nixpkgs, c4m-jtag, nmigen, nmigen-soc, nix-litex, migen }: + outputs = { self, nixpkgs, c4m-jtag, nmigen, nmigen-soc, nix-litex, migen, yosys }: let getv = x: builtins.substring 0 8 x.lastModifiedDate; @@ -61,6 +63,11 @@ }); }; + yosys = prev.yosys.overrideAttrs (_: { + version = "0.9+4052"; + src = yosys; + }); + libresoc-pre-litex = final.callPackage (import ./nix/pre-litex.nix { version = getv self; }) { python3Packages = final.python37Packages; }; libresoc-ls180 = final.callPackage (import ./nix/ls180.nix { version = getv self; }) { python3Packages = final.python37Packages; }; libresoc-ecp5 = final.callPackage (import ./nix/ecp5.nix { version = getv self; }) { python3Packages = final.python37Packages; }; -- 2.30.2