Skip to content

Commit

Permalink
feat: switch to main treefmt-nix and nixfmt-rfc-style (#3015)
Browse files Browse the repository at this point in the history
  • Loading branch information
o-az authored Sep 25, 2024
2 parents 754fb14 + ad81457 commit c2f673a
Show file tree
Hide file tree
Showing 101 changed files with 5,406 additions and 3,749 deletions.
8 changes: 8 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,11 @@
31561995a391dfb9de39ae0143cac7d6b680f1ab
# format solidity files with forge
64f5487ff2eaa61aed1dc8921d7fb58b7b9add4f

# switch to nixfmt-rfc-style, enable statix, deadnix, and shellcheck
75267a1eb446025fe84024617ae5619344687446
ddb429b458aa8bece799109da5c0921832d1b363
c9ee5b0c2b8caa90b2dbe2dd42f89afcf5e45c0c
5d892445d9e215589249fc0210d75491bb6b9d85
636820c253581035e4d1aa3f595965221c8570b4
a77587825b8a63a767c5d6761c98f1a612fc979a
1 change: 0 additions & 1 deletion .mdformat.toml

This file was deleted.

23 changes: 18 additions & 5 deletions app/app.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
{ ... }: {
perSystem = { pkgs, unstablePkgs, lib, ensureAtRepositoryRoot, ... }:
_: {
perSystem =
{
pkgs,
unstablePkgs,
lib,
ensureAtRepositoryRoot,
...
}:
let
pkgsDeps = with pkgs; [ pkg-config python3 ];
nodeDeps = with unstablePkgs; [ nodePackages_latest.nodejs nodePackages_latest."patch-package" ];
pkgsDeps = with pkgs; [
pkg-config
python3
];
nodeDeps = with unstablePkgs; [
nodePackages_latest.nodejs
nodePackages_latest."patch-package"
];
combinedDeps = pkgsDeps ++ nodeDeps;
packageJSON = lib.importJSON ./package.json;
in
Expand All @@ -14,7 +27,7 @@
sourceRoot = "app";
npmFlags = [ "--enable-pre-post-scripts" ];
pname = packageJSON.name;
version = packageJSON.version;
inherit (packageJSON) version;
nativeBuildInputs = combinedDeps;
buildInputs = combinedDeps;
installPhase = ''
Expand Down
Loading

0 comments on commit c2f673a

Please sign in to comment.