Skip to content

Commit 722cdea

Browse files
HU90mmarnovandermaas
authored andcommitted
nix: switched over to the new submodules flake attribute
In the latest release of Nix, one can now declare that they'd like submodules included within the flake files inputs.
1 parent 75c1dad commit 722cdea

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ jobs:
3333
run: nix fmt -- . --check --exclude ./third_party --exclude ./cheriot-rtos
3434

3535
- name: Run Lints
36-
run: nix run .?submodules=1#lint-all
36+
run: nix run .#lint-all
3737

3838
- name: Build Software
3939
run: |
40-
nix build -L .?submodules=1#sonata-exercises
41-
nix build -L .?submodules=1#sonata-examples
42-
nix build -L .?submodules=1#sonata-automotive-demo-legacy-component
43-
nix build -L .?submodules=1#sonata-heartbleed-demo-legacy-component
44-
nix build -L .?submodules=1#sonata-tests
40+
nix build -L .#sonata-exercises
41+
nix build -L .#sonata-examples
42+
nix build -L .#sonata-automotive-demo-legacy-component
43+
nix build -L .#sonata-heartbleed-demo-legacy-component
44+
nix build -L .#sonata-tests
4545
4646
- name: Run Nix Checks
47-
run: nix flake check -L .?submodules=1#
47+
run: nix flake check -L .#

flake.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
{
44
description = "Sonata software";
55
inputs = {
6+
self.submodules = true;
67
sonata-system.url = "github:lowRISC/sonata-system";
78
lowrisc-nix.follows = "sonata-system/lowrisc-nix";
89
nixpkgs.follows = "lowrisc-nix/nixpkgs";

0 commit comments

Comments
 (0)