Skip to content

Commit 149ce5e

Browse files
HACK: Fixing up nix deps
1 parent 14f052d commit 149ce5e

File tree

6 files changed

+1398
-1010
lines changed

6 files changed

+1398
-1010
lines changed

flake.lock

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

flake.nix

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,24 @@
55
description = "Environment for developing and simulating the ibex core.";
66

77
inputs = {
8-
nixpkgs.url = "nixpkgs/nixos-24.05";
9-
flake-utils.url = "github:numtide/flake-utils";
8+
9+
nixpkgs.follows = "lowrisc-nix/nixpkgs";
10+
flake-utils.follows = "lowrisc-nix/flake-utils";
1011

1112
poetry2nix = {
1213
url = "github:nix-community/poetry2nix";
1314
inputs.nixpkgs.follows = "nixpkgs";
1415
inputs.flake-utils.follows = "flake-utils";
1516
};
17+
1618
mkshell-minimal.url = "github:viperML/mkshell-minimal";
1719

1820
# The input 'lowrisc-nix' contains some common dependencies that can be used
1921
# by lowRISC projects. There is also an associated public binary cache.
2022
lowrisc-nix = {
23+
# Checkout from when
24+
# url = "github:lowrisc/lowrisc-nix?ref=d7e90e450bcfbed83b6b8a2458d29c0ddd7fe58d";
2125
url = "github:lowrisc/lowrisc-nix";
22-
inputs.nixpkgs.follows = "nixpkgs";
23-
inputs.flake-utils.follows = "flake-utils";
2426
};
2527

2628
psgen = {

nix/env/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
}: let
1010
poetry2nix = inputs.poetry2nix.lib.mkPoetry2Nix {inherit pkgs;};
1111
ibexPoetryOverrides = import ./poetryOverrides.nix {inherit pkgs;};
12-
lowriscPoetryOverrides = inputs.lowrisc-nix.lib.poetryOverrides {inherit pkgs;};
12+
lowriscPoetryOverrides = import ./poetryOverridesLowriscNix.nix {inherit pkgs;};
1313
in
1414
poetry2nix.mkPoetryEnv {
1515
projectDir = ./.;

0 commit comments

Comments
 (0)