Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Touch up the Nix flake #18

Merged
merged 9 commits into from
Oct 23, 2024
Merged

Touch up the Nix flake #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1a295b9
Organize Nix code a bit
jwillikers Oct 21, 2024
e2d577d
Remove unnecessary runtime inputs
jwillikers Oct 23, 2024
fe9217e
Use rec keyword to reduce verbosity
jwillikers Oct 23, 2024
9b18bd2
Generate the apps, devShells, and packages from each of the boards
jwillikers Oct 23, 2024
4c13f8a
Add defaultBoard variable
jwillikers Oct 23, 2024
483c373
Use simple and consistent names for apps
jwillikers Oct 23, 2024
64b56be
Simplify a bit
jwillikers Oct 23, 2024
c86e0dc
Update GitHub Actions
jwillikers Oct 23, 2024
921a175
Update justfile targets
jwillikers Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-attiny85.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- uses: DeterminateSystems/nix-installer-action@v14
- uses: DeterminateSystems/magic-nix-cache-action@v8
- name: Build
run: nix build '.#pwm-fan-controller-attiny85'
run: nix build '.#attiny85'
- name: Upload firmware
uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-pico.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- uses: DeterminateSystems/nix-installer-action@v14
- uses: DeterminateSystems/magic-nix-cache-action@v8
- name: Build
run: nix build '.#pwm-fan-controller-pico'
run: nix build '.#pico'
- name: Generate UF2
run: nix develop '.#pico' --command elf2uf2-rs result/bin/pwm-fan-controller-pico pwm-fan-controller-pico
- name: Upload firmware
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-qt-py-ch32v203.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- uses: DeterminateSystems/nix-installer-action@v14
- uses: DeterminateSystems/magic-nix-cache-action@v8
- name: Build
run: nix build '.#pwm-fan-controller-qt-py-ch32v203'
run: nix build '.#qt-py-ch32v203'
- name: Upload firmware
uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ alias p := package
alias pack := package

package board="attiny85":
^nix build ".#pwm-fan-controller-{{ board }}"
^nix build ".#{{ board }}"

alias u := update
alias up := update
Expand Down
2 changes: 1 addition & 1 deletion boards/attiny85/.justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ run profile="dev": (build profile)
# alias pack := package

# package:
# ^nix build ".#pwm-fan-controller-attiny85"
# ^nix build ".#attiny85"

alias u := update
alias up := update
Expand Down
2 changes: 1 addition & 1 deletion boards/pico/.justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ alias p := package
alias pack := package

package:
^nix build ".#pwm-fan-controller-pico"
^nix build ".#pico"

uf2 profile="dev":
#!/usr/bin/env nu
Expand Down
2 changes: 1 addition & 1 deletion boards/qt-py-ch32v203/.justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ alias p := package
alias pack := package

package:
^nix build ".#pwm-fan-controller-qt-py-ch32v203"
^nix build ".#qt-py-ch32v203"

alias u := update
alias up := package
Expand Down
Loading
Loading