Compare commits
2 Commits
7d9b2d1818
...
5237226018
Author | SHA1 | Date |
---|---|---|
Nathan McCarty | 5237226018 | |
Nathan McCarty | f7df7c43b6 |
|
@ -3,3 +3,5 @@
|
|||
*.log
|
||||
tmp/
|
||||
result
|
||||
result-doc
|
||||
target
|
||||
|
|
16
flake.nix
16
flake.nix
|
@ -24,7 +24,7 @@
|
|||
with builtins;
|
||||
let
|
||||
sources = fromJSON (readFile ./sources/sources.json);
|
||||
rustPackageNames = attrValues sources;
|
||||
rustPackageNames = attrNames sources ++ [ "cargo-release" "cargo-deny" ];
|
||||
# Build the rust packages we'll be using
|
||||
in (utils.lib.eachDefaultSystem (system: {
|
||||
packages = let
|
||||
|
@ -39,18 +39,24 @@
|
|||
rustc = rust;
|
||||
cargo = rust;
|
||||
};
|
||||
in mapAttrs (name: source:
|
||||
in (mapAttrs (name: source:
|
||||
naersk-lib.buildPackage {
|
||||
pname = source.pname;
|
||||
src = pkgs.fetchCrate source;
|
||||
}) sources;
|
||||
buildInputs = with pkgs; [ pkg-config openssl ];
|
||||
}) sources) //
|
||||
# Packages that naersk has trouble building due to https://github.com/nix-community/naersk/issues/263
|
||||
{
|
||||
cargo-release = pkgs.cargo-release;
|
||||
cargo-deny = pkgs.cargo-deny;
|
||||
};
|
||||
})) //
|
||||
# Now provide our builder functions
|
||||
{
|
||||
# Build a rust flake with a single crate
|
||||
single = { src, crateName, sharedDeps ? (system: [ ])
|
||||
, sharedNativeDeps ? (system: [ ]) }:
|
||||
utils.lib.eachDefaultsystem (system:
|
||||
utils.lib.eachDefaultSystem (system:
|
||||
let
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
|
@ -155,7 +161,7 @@
|
|||
|
||||
# Development environments
|
||||
devShell = pkgs.mkShell {
|
||||
inputsFrom = builtins.attrValues packages.${system};
|
||||
inputsFrom = builtins.attrValues packages;
|
||||
buildInputs = [ rust ] ++ devBase ++ (sharedDeps system)
|
||||
++ (sharedNativeDeps system);
|
||||
};
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
cargo-llvm-cov
|
||||
cargo-nextest
|
||||
cargo-release
|
||||
cargo-udeps
|
||||
cargo-audit
|
||||
cargo-deny
|
||||
|
|
|
@ -4,11 +4,6 @@
|
|||
"pname": "cargo-audit",
|
||||
"version": "0.17.6"
|
||||
},
|
||||
"cargo-deny": {
|
||||
"hash": "sha256-/2HClc4rzQvvbmWXOotZuC9MEPPnPZKWCOVC2AadtG4=",
|
||||
"pname": "cargo-deny",
|
||||
"version": "0.13.9"
|
||||
},
|
||||
"cargo-llvm-cov": {
|
||||
"hash": "sha256-5xHDjNFQDmi+SnhxfoCxoBdCqHpZEk/87r2sBKsT+W4=",
|
||||
"pname": "cargo-llvm-cov",
|
||||
|
@ -19,11 +14,6 @@
|
|||
"pname": "cargo-nextest",
|
||||
"version": "0.9.52"
|
||||
},
|
||||
"cargo-release": {
|
||||
"hash": "sha256-tmyIQMjKs37ZVqG/WV4Qe99Jc+bzneTmEMrvxV1Gnsc=",
|
||||
"pname": "cargo-release",
|
||||
"version": "0.24.10"
|
||||
},
|
||||
"cargo-udeps": {
|
||||
"hash": "sha256-jvEhE/fngzEzRinA4iZYJbBfcl2CGbTwQB52h5laVf8=",
|
||||
"pname": "cargo-udeps",
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
use flake
|
|
@ -0,0 +1,7 @@
|
|||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "test-crate"
|
||||
version = "0.1.0"
|
|
@ -0,0 +1,26 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
###
|
||||
## This script replicates the same steps as ci, except for cargo audit
|
||||
###
|
||||
|
||||
# Turn on the guard rails
|
||||
set -exuo pipefail
|
||||
|
||||
CRATE="test-crate"
|
||||
|
||||
## TODO use subshell magic to make a nice interface here
|
||||
|
||||
# Lint the formatting
|
||||
nix build .#lints.format.$CRATE -L
|
||||
# Audit it
|
||||
nix develop -c cargo audit
|
||||
# Run clippy
|
||||
nix build .#lints.clippy.$CRATE -L
|
||||
# Build it
|
||||
nix build .#$CRATE -L
|
||||
# Test it
|
||||
nix develop -c cargo nextest run
|
||||
nix develop -c cargo test --doc
|
||||
# Document it
|
||||
nix build .#docs.$CRATE.doc -L
|
|
@ -1,25 +0,0 @@
|
|||
{
|
||||
"nodes": {
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1683777345,
|
||||
"narHash": "sha256-V2p/A4RpEGqEZussOnHYMU6XglxBJGCODdzoyvcwig8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "635a306fc8ede2e34cb3dd0d6d0a5d49362150ed",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
"version": 7
|
||||
}
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
inputs = { rust = { url = ./..; }; };
|
||||
inputs = { rust = { url = "./.."; }; };
|
||||
description = "Simple Test Package";
|
||||
|
||||
outputs = { self, nixpkgs, rust }:
|
||||
rust.single {
|
||||
name = "test-crate";
|
||||
crateName = "test-crate";
|
||||
src = ./.;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
/// Doc comment
|
||||
pub fn thing() {}
|
Loading…
Reference in New Issue