Skip to content

Commit 582f41a

Browse files
committed
Improve CI with fmt and clippy
1 parent 3262f65 commit 582f41a

File tree

2 files changed

+27
-3
lines changed

2 files changed

+27
-3
lines changed

flake.nix

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,33 @@
1212
naersk-lib = naersk.lib.x86_64-linux;
1313
blueprint-compiler = packages.x86_64-linux.blueprint-compiler;
1414
};
15+
checks.x86_64-linux.default = stdenv.mkDerivation {
16+
name = "geopard-checks";
17+
src = ./.;
18+
cargoDeps = packages.x86_64-linux.geopard.cargoDeps;
19+
configurePhase = ''
20+
# These are replaced during the real build by meson
21+
sed \
22+
-e 's/str =.*;/str = "";/g' \
23+
-e 's/i32 =.*;/i32 = 0;/g' \
24+
src/build_config.rs.in \
25+
> src/build_config.rs
26+
'';
27+
checkPhase = ''
28+
cargo fmt --check;
29+
cargo clippy -- -D warnings
30+
'';
31+
doCheck = true;
32+
installPhase = ''echo "" > $out'';
33+
nativeBuildInputs = with nixpkgs.legacyPackages.x86_64-linux; [openssl pkg-config glib gtk4 libadwaita clippy];
34+
buildInputs = with nixpkgs.legacyPackages.x86_64-linux; [
35+
clippy
36+
rustPlatform.rust.cargo
37+
rustPlatform.rust.rustc
38+
rustPlatform.cargoSetupHook
39+
rustfmt
40+
];
41+
};
1542
packages.x86_64-linux.build-flatpak = callPackage ./nix/build-flatpak.nix { };
1643
packages.x86_64-linux.default = packages.x86_64-linux.geopard;
1744
};

nix/geopard.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ stdenv.mkDerivation rec {
5555
rustPlatform.rust.cargo
5656
rustPlatform.cargoSetupHook
5757
rustPlatform.rust.rustc
58-
rustfmt
59-
clippy
6058
];
6159

6260
buildInputs = [
@@ -69,7 +67,6 @@ stdenv.mkDerivation rec {
6967
libadwaita
7068
openssl
7169
];
72-
doCheck = true;
7370
meta = with lib; {
7471
homepage = "https://github.com/ranfdev/Geopard";
7572
description = "Colorful, adaptive gemini browser";

0 commit comments

Comments
 (0)