From eedba92bf4b039e2253d9efeb48ce456ab0eab23 Mon Sep 17 00:00:00 2001 From: Jack Leightcap Date: Thu, 28 Mar 2024 11:49:14 -0400 Subject: [PATCH] libresoc/soc: import flake from upstream Signed-off-by: Jack Leightcap --- flake.lock | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++--- flake.nix | 9 +++- 2 files changed, 154 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 68d6c7de..cc45d3eb 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "c4m-jtag": { + "flake": false, + "locked": { + "lastModified": 1619101523, + "narHash": "sha256-y1OY8URcE1lnu5L7IDFcJ8zT8sqlrfMP9VPNmVvACGk=", + "ref": "master", + "rev": "c2bf4810f9f91ced7fcda777b92b86ab353da288", + "revCount": 146, + "type": "git", + "url": "https://git.libre-soc.org/git/c4m-jtag.git" + }, + "original": { + "type": "git", + "url": "https://git.libre-soc.org/git/c4m-jtag.git" + } + }, "flake-utils": { "inputs": { "systems": [ @@ -20,18 +36,75 @@ "type": "github" } }, + "libre-soc": { + "inputs": { + "c4m-jtag": "c4m-jtag", + "migen": "migen", + "nix-litex": "nix-litex", + "nixpkgs": "nixpkgs", + "nmigen": "nmigen", + "nmigen-soc": "nmigen-soc", + "yosys": "yosys" + }, + "locked": { + "lastModified": 1699193920, + "narHash": "sha256-yJshQYf8V0CB2vPCmWLlnxXMhi/sPXiLKzOn6cqgmxw=", + "ref": "refs/heads/master", + "rev": "2a66fe18cd77dd5533c65930d1b241cf6faac455", + "revCount": 5784, + "type": "git", + "url": "https://git.libre-soc.org/git/soc.git" + }, + "original": { + "type": "git", + "url": "https://git.libre-soc.org/git/soc.git" + } + }, + "migen": { + "flake": false, + "locked": { + "lastModified": 1631614362, + "narHash": "sha256-BgYf4e7O/rbS5P1ZpDlcgCEUh2h2vK3FyHADdzyaMg0=", + "owner": "m-labs", + "repo": "migen", + "rev": "7bc4eb1387b39159a74c1dbd1b820728e0bfbbaa", + "type": "github" + }, + "original": { + "owner": "m-labs", + "repo": "migen", + "type": "github" + } + }, + "nix-litex": { + "flake": false, + "locked": { + "lastModified": 1632150297, + "narHash": "sha256-ghlAJBZxLVkQB+9tXEOBOF1FfdT5Pn4292khF4iKCNA=", + "ref": "main", + "rev": "5ab6984eb1efad0c91d808c9b7b79e00e50ccc05", + "revCount": 31, + "type": "git", + "url": "https://git.sr.ht/~lschuermann/nix-litex" + }, + "original": { + "ref": "main", + "type": "git", + "url": "https://git.sr.ht/~lschuermann/nix-litex" + } + }, "nixpkgs": { "locked": { - "lastModified": 1699034771, - "narHash": "sha256-S0iAvl1oETS6cVFP7aVNodY9eMnbaTtuypi0XiGXiLg=", - "owner": "NixOS", + "lastModified": 1631723418, + "narHash": "sha256-Sbey1S81fXUKcEHVCMwlXMju/IoCQxMwP1PPkVYpGrc=", + "owner": "L-as", "repo": "nixpkgs", - "rev": "27ead4fec31f241baed776d046b1dcac431a5919", + "rev": "8bfc1026477692b933df6eeec27bd494cac3e436", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "L-as", + "ref": "libresoc", "repo": "nixpkgs", "type": "github" } @@ -52,10 +125,59 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1699034771, + "narHash": "sha256-S0iAvl1oETS6cVFP7aVNodY9eMnbaTtuypi0XiGXiLg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "27ead4fec31f241baed776d046b1dcac431a5919", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nmigen": { + "flake": false, + "locked": { + "lastModified": 1618220900, + "narHash": "sha256-Ol2SMZLUTikZWDLmK7F5lZuKBfGO71WmisATPNMTpHQ=", + "ref": "master", + "rev": "d824795c2c7cb43dcbc8ed8fac6d309d77284913", + "revCount": 1056, + "type": "git", + "url": "https://git.libre-soc.org/git/nmigen.git" + }, + "original": { + "type": "git", + "url": "https://git.libre-soc.org/git/nmigen.git" + } + }, + "nmigen-soc": { + "flake": false, + "locked": { + "lastModified": 1601572554, + "narHash": "sha256-v9SH+KuIPydXCr363RUsMg9/tabuu+GjKPJOKq2Jze0=", + "ref": "master", + "rev": "692017c7eaf21ff37302790c4422db6bd08667be", + "revCount": 48, + "type": "git", + "url": "https://git.libre-soc.org/git/nmigen-soc.git" + }, + "original": { + "type": "git", + "url": "https://git.libre-soc.org/git/nmigen-soc.git" + } + }, "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", + "libre-soc": "libre-soc", + "nixpkgs": "nixpkgs_2", "sops-nix": "sops-nix", "systems": "systems", "treefmt-nix": "treefmt-nix" @@ -116,6 +238,23 @@ "repo": "treefmt-nix", "type": "github" } + }, + "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" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 31d98cf4..f17a7daa 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,7 @@ inputs.treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; inputs.sops-nix.url = "github:Mic92/sops-nix"; inputs.sops-nix.inputs.nixpkgs.follows = "nixpkgs"; + inputs.libre-soc.url = "git+https://git.libre-soc.org/git/soc.git"; outputs = { self, @@ -19,6 +20,7 @@ flake-utils, treefmt-nix, sops-nix, + libre-soc, ... }: with builtins; let @@ -52,7 +54,12 @@ inherit (pkgs) lib; inherit callPackage; }; - result = (import ./pkgs/by-name args) // (import ./pkgs args); + result = + (import ./pkgs/by-name args) + // (import ./pkgs args) + // { + soc = libre-soc.packages.${pkgs.system}.soc; + }; in result;