nix: drop nix-overlay; enable structuredAttrs & cleanup
Some checks are pending
Rust / Test on aarch64-unknown-linux-gnu (push) Waiting to run
Rust / Test on armv7-unknown-linux-gnueabihf (push) Waiting to run
Rust / Test on i686-unknown-linux-gnu (push) Waiting to run
Rust / Test on loongarch64-unknown-linux-gnu (push) Waiting to run
Rust / Test on powerpc-unknown-linux-gnu (push) Waiting to run
Rust / Test on powerpc64-unknown-linux-gnu (push) Waiting to run
Rust / Test on powerpc64le-unknown-linux-gnu (push) Waiting to run
Rust / Test on riscv64gc-unknown-linux-gnu (push) Waiting to run
Rust / Test on s390x-unknown-linux-gnu (push) Waiting to run
Rust / Test on sparc64-unknown-linux-gnu (push) Waiting to run
Rust / Test on mips-unknown-linux-gnu (push) Waiting to run
Rust / Test on mips64-unknown-linux-gnuabi64 (push) Waiting to run
Rust / Test on riscv32gc-unknown-linux-gnu (push) Waiting to run
Rust / Test on x86_64-unknown-linux-gnu (push) Waiting to run

Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I8dc2910c36075bef0e1c00459d83e5ea6a6a6964
This commit is contained in:
raf 2026-06-15 15:45:13 +03:00
commit b43d88c749
Signed by: NotAShelf
GPG key ID: 29D95B64378DB4BF
3 changed files with 12 additions and 25 deletions

View file

@ -1,20 +1,15 @@
{
lib,
makeRustPlatform,
rust-bin,
rustPlatform,
llvm,
}: let
pname = "microfetch";
toml = (lib.importTOML ../Cargo.toml).workspace.package;
inherit (toml) version;
toolchain = rust-bin.stable.latest;
rustWithToolchain = makeRustPlatform {
cargo = toolchain.minimal;
rustc = toolchain.minimal;
};
in
rustWithToolchain.buildRustPackage.override {inherit (llvm) stdenv;} {
rustPlatform.buildRustPackage.override {inherit (llvm) stdenv;} (finalAttrs: {
__structuredAttrs = true;
inherit pname version;
src = let
fs = lib.fileset;
@ -32,16 +27,18 @@ in
];
};
cargoLock.lockFile = ../Cargo.lock;
cargoLock.lockFile = "${finalAttrs.src}/Cargo.lock";
enableParallelBuilding = true;
buildNoDefaultFeatures = true;
doCheck = false;
strictDeps = true;
meta = {
description = "Microscopic fetch script in Rust, for NixOS systems";
homepage = "https://github.com/NotAShelf/microfetch";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.linux;
maintainers = [lib.maintainers.NotAShelf];
mainProgram = "microfetch";
};
}
})

View file

@ -4,11 +4,10 @@
rustc,
mold,
clang,
rust-analyzer-unwrapped,
rust-analyzer,
rustfmt,
clippy,
taplo,
rustPlatform,
gnuplot,
}:
mkShell {
@ -20,13 +19,11 @@ mkShell {
mold
clang
rust-analyzer-unwrapped
rust-analyzer
(rustfmt.override {asNightly = true;})
clippy
taplo
gnuplot # for Criterion.rs plots
];
env.RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
}