Skip to content

Commit f40ab7a

Browse files
TristanCacquerayblackheaven
authored andcommitted
Move the flake at the root of the repository
This change simplifies the nix usage so that we can run: nix run github:haskell/security-advisories
1 parent 9a6667a commit f40ab7a

File tree

6 files changed

+3
-9
lines changed

6 files changed

+3
-9
lines changed
File renamed without changes.

.github/workflows/nix.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,12 @@ jobs:
3333
- uses: DeterminateSystems/magic-nix-cache-action@main
3434
- name: Check Nix flake inputs
3535
uses: DeterminateSystems/flake-checker-action@v4
36-
with:
37-
flake-lock-path: ./code/hsec-tools/flake.lock
3836
- name: Build executable
3937
run: nix -L build
40-
working-directory: ./code/hsec-tools
4138
- name: Bild docker image
4239
run: nix build -L '.#packages.x86_64-linux.hsec-tools-image'
43-
working-directory: ./code/hsec-tools
4440
- run: mkdir -p ~/.local/dockerImages
45-
- run: cp code/hsec-tools/result ~/.local/dockerImages/hsec-tools
41+
- run: cp result ~/.local/dockerImages/hsec-tools
4642
- id: code-hash
4743
name: Compute code directory hash
4844
run: |

code/hsec-tools/shell.nix

Lines changed: 0 additions & 3 deletions
This file was deleted.
File renamed without changes.

code/hsec-tools/flake.nix renamed to flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
pkgs.haskellPackages.developPackage {
1717
inherit returnShellEnv;
1818
name = "hsec-tools";
19-
root = ./.;
19+
root = ./code/hsec-tools;
2020
withHoogle = false;
2121
overrides = self: super: with pkgs.haskell.lib; {
2222
Cabal-syntax = super.Cabal-syntax_3_8_1_0;

shell.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
(builtins.getFlake ("git+file://" + toString ./.)).devShell.${builtins.currentSystem}

0 commit comments

Comments
 (0)