noa/png-subs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: noa:1abc3fba2f8d8fb01e5cc31f7cbbf474507fd84d
Branches Tags
noa:main
..
compare: noa:20affba4e49fefb0256a3b6a1faf73e20266555a
Branches Tags
noa:main

No commits in common. "1abc3fba2f8d8fb01e5cc31f7cbbf474507fd84d" and "20affba4e49fefb0256a3b6a1faf73e20266555a" have entirely different histories.
1abc3fba2f ... 20affba4e4

2 changed files with 29 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,3 +1,2 @@
/target /target
/.direnv /.direnv
/result

84
flake.nix
View file

@ -20,18 +20,8 @@
}; };
}; };
outputs = outputs = { self, nixpkgs, crane, fenix, flake-utils, advisory-db, ... }:
{ flake-utils.lib.eachDefaultSystem (system:
self,
nixpkgs,
crane,
fenix,
flake-utils,
advisory-db,
...
}:
flake-utils.lib.eachDefaultSystem (
system:
let let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
@ -47,8 +37,7 @@
buildInputs = [ buildInputs = [
# Add additional build inputs here # Add additional build inputs here
] ] ++ lib.optionals pkgs.stdenv.isDarwin [
++ lib.optionals pkgs.stdenv.isDarwin [
# Additional darwin specific inputs can be set here # Additional darwin specific inputs can be set here
pkgs.libiconv pkgs.libiconv
]; ];
@ -57,13 +46,12 @@
# MY_CUSTOM_VAR = "some value"; # MY_CUSTOM_VAR = "some value";
}; };
craneLibLLvmTools = craneLib.overrideToolchain ( craneLibLLvmTools = craneLib.overrideToolchain
fenix.packages.${system}.complete.withComponents [ (fenix.packages.${system}.complete.withComponents [
"cargo" "cargo"
"llvm-tools" "llvm-tools"
"rustc" "rustc"
] ]);
);
# Build *just* the cargo dependencies, so we can reuse # Build *just* the cargo dependencies, so we can reuse
# all of that work (e.g. via cachix) when running in CI # all of that work (e.g. via cachix) when running in CI
@ -71,12 +59,9 @@
# Build the actual crate itself, reusing the dependency # Build the actual crate itself, reusing the dependency
# artifacts from above. # artifacts from above.
my-crate = craneLib.buildPackage ( my-crate = craneLib.buildPackage (commonArgs // {
commonArgs inherit cargoArtifacts;
// { });
inherit cargoArtifacts;
}
);
in in
{ {
checks = { checks = {
@ -89,20 +74,14 @@
# Note that this is done as a separate derivation so that # Note that this is done as a separate derivation so that
# we can block the CI if there are issues here, but not # we can block the CI if there are issues here, but not
# prevent downstream consumers from building our crate by itself. # prevent downstream consumers from building our crate by itself.
my-crate-clippy = craneLib.cargoClippy ( my-crate-clippy = craneLib.cargoClippy (commonArgs // {
commonArgs inherit cargoArtifacts;
// { cargoClippyExtraArgs = "--all-targets -- --deny warnings";
inherit cargoArtifacts; });
cargoClippyExtraArgs = "--all-targets -- --deny warnings";
}
);
my-crate-doc = craneLib.cargoDoc ( my-crate-doc = craneLib.cargoDoc (commonArgs // {
commonArgs inherit cargoArtifacts;
// { });
inherit cargoArtifacts;
}
);
# Check formatting # Check formatting
my-crate-fmt = craneLib.cargoFmt { my-crate-fmt = craneLib.cargoFmt {
@ -128,26 +107,19 @@
# Run tests with cargo-nextest # Run tests with cargo-nextest
# Consider setting `doCheck = false` on `my-crate` if you do not want # Consider setting `doCheck = false` on `my-crate` if you do not want
# the tests to run twice # the tests to run twice
my-crate-nextest = craneLib.cargoNextest ( my-crate-nextest = craneLib.cargoNextest (commonArgs // {
commonArgs inherit cargoArtifacts;
// { partitions = 1;
inherit cargoArtifacts; partitionType = "count";
partitions = 1; });
partitionType = "count";
}
);
}; };
packages = { packages = {
default = my-crate; default = my-crate;
} } // lib.optionalAttrs (!pkgs.stdenv.isDarwin) {
// lib.optionalAttrs (!pkgs.stdenv.isDarwin) { my-crate-llvm-coverage = craneLibLLvmTools.cargoLlvmCov (commonArgs // {
my-crate-llvm-coverage = craneLibLLvmTools.cargoLlvmCov ( inherit cargoArtifacts;
commonArgs });
// {
inherit cargoArtifacts;
}
);
}; };
apps.default = flake-utils.lib.mkApp { apps.default = flake-utils.lib.mkApp {
@ -163,8 +135,10 @@
# Extra inputs can be added here; cargo and rustc are provided by default. # Extra inputs can be added here; cargo and rustc are provided by default.
packages = [ packages = [
# pkgs.ripgrep
pkgs.wgo
pkgs.cargo-flamegraph
]; ];
}; };
} });
);
} }