Skip to content

Commit

Permalink
Merge pull request #81 from fleetyards/ci/convco
Browse files Browse the repository at this point in the history
Add convco ci check
  • Loading branch information
kloenk authored Jul 20, 2023
2 parents 3cbcfa3 + 286f438 commit 07dd83b
Show file tree
Hide file tree
Showing 6 changed files with 849 additions and 789 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.lock linguist-generated=true -diff
nix/mix.nix linguist-generated=true -diff
2 changes: 1 addition & 1 deletion .github/workflows/nix.job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ jobs:
name: fleetyards
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
- run: nix build -L
- run: nix flake check
- run: nix flake check -L --impure
53 changes: 35 additions & 18 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
description = "ExFleetYards Fleetyards api backend";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
nixpkgs.url = "github:NixOS/nixpkgs";
devenv.url = "github:cachix/devenv";
};
inputs.devenv.inputs.nixpkgs.follows = "/nixpkgs";
Expand Down Expand Up @@ -94,13 +94,14 @@
modules = [
{
packages = with pkgs;
[ mix2nix git gnumake gcc ]
[ mix2nix git gnumake gcc convco ]
++ lib.optional pkgs.stdenv.isLinux pkgs.inotify-tools;
languages.elixir.enable = true;

enterShell = "";
pre-commit.hooks.actionlint.enable = true;
pre-commit.hooks.nixfmt.enable = true;
pre-commit.hooks.convco.enable = true;
pre-commit.hooks.mixfmt = {
enable = false; # Broken??
name = "Mix format";
Expand Down
1 change: 1 addition & 0 deletions nix/appsignal-nif.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ in stdenv.mkDerivation {
sha256 = triple.checksum;
};

buildInputs = [ stdenv.cc.cc.lib ];
nativeBuildInputs = [ ] ++ lib.optional stdenv.isLinux autoPatchelfHook;

# Work around the "unpacker appears to have produced no directories"
Expand Down
Loading

0 comments on commit 07dd83b

Please sign in to comment.