Skip to content

Commit 104a4fc

Browse files
committed
use python_ot from lowrisc-nix and remove overlays
1 parent 878528e commit 104a4fc

File tree

14 files changed

+243
-225
lines changed

14 files changed

+243
-225
lines changed

dependencies/edalize.nix

Lines changed: 0 additions & 20 deletions
This file was deleted.

dependencies/flake.lock

Lines changed: 0 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dependencies/flake.nix

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,18 @@
33

44
inputs = {
55
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
6-
lowrisc_fusesoc_src = {
7-
url = "github:lowRISC/fusesoc?ref=ot-0.2";
8-
flake = false;
9-
};
10-
lowrisc_edalize_src = {
11-
url = "github:lowRISC/edalize?ref=ot-0.2";
12-
flake = false;
13-
};
146
};
157

168
outputs = {
179
self,
1810
nixpkgs,
19-
lowrisc_fusesoc_src,
20-
lowrisc_edalize_src,
2111
}: let
2212
system = "x86_64-linux";
2313
pkgs = import nixpkgs {
2414
inherit system;
2515
config = {allowUnfree = true;};
2616
};
2717

28-
lowRISC_python_overrides = pfinal: pprev: {
29-
fusesoc = pprev.fusesoc.overridePythonAttrs (oldAttrs: {
30-
version = "0.3.3.dev";
31-
src = lowrisc_fusesoc_src;
32-
});
33-
edalize = pprev.edalize.overridePythonAttrs (oldAttrs: {
34-
version = "0.3.3.dev";
35-
src = lowrisc_edalize_src;
36-
});
37-
};
38-
3918
lowRISC_spike_override = final: prev: {
4019
riscv-isa-sim = prev.riscv-isa-sim.overrideAttrs (oldAttrs: rec {
4120
version = "ibex-cosim-v0.3";
@@ -103,9 +82,5 @@
10382
inherit vivado;
10483
})
10584
];
106-
overlay_python = pkgs.lib.composeManyExtensions [
107-
(import ./python-overlay.nix)
108-
lowRISC_python_overrides
109-
];
11085
};
11186
}

dependencies/fusesoc.nix

Lines changed: 0 additions & 23 deletions
This file was deleted.

dependencies/ipyxact.nix

Lines changed: 0 additions & 16 deletions
This file was deleted.

dependencies/okonomiyaki.nix

Lines changed: 0 additions & 20 deletions
This file was deleted.

dependencies/python-overlay.nix

Lines changed: 0 additions & 8 deletions
This file was deleted.

dependencies/simplesat.nix

Lines changed: 0 additions & 19 deletions
This file was deleted.

dependencies/zipfile2.nix

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)