Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

flake: Remove flake-utils, misc cleanup #172

Merged
merged 3 commits into from
Sep 8, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 0 additions & 34 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
flake-utils.url = "github:numtide/flake-utils";

flake-parts = {
url = "github:hercules-ci/flake-parts";
@@ -23,7 +22,13 @@
};

outputs = inputs @ { self, flake-parts, ... }: let
supportedSystems = inputs.flake-utils.lib.defaultSystems ++ [ "riscv64-linux" ];
supportedSystems = [
"x86_64-linux"
"aarch64-linux"
"riscv64-linux"
"aarch64-darwin"
"x86_64-darwin"
];

inherit (inputs.nixpkgs) lib;

4 changes: 3 additions & 1 deletion flake/devshells.nix
Original file line number Diff line number Diff line change
@@ -35,9 +35,11 @@ in
cfg = config.attic.devshell;
in {
attic.devshell.packageSets = with pkgs; {
rust = [
rustc = [
rustc
];

rust = [
cargo-expand
cargo-outdated
cargo-edit
6 changes: 3 additions & 3 deletions flake/packages.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ self, inputs, lib, ... }:
{ self, inputs, lib, makeCranePkgs, ... }:
let
makeCranePkgs = pkgs: let
defaultMakeCranePkgs = pkgs: let
craneLib = inputs.crane.mkLib pkgs;
in pkgs.callPackage ../crane.nix { inherit craneLib; };
in
{
_module.args.makeCranePkgs = makeCranePkgs;
_module.args.makeCranePkgs = lib.mkDefault defaultMakeCranePkgs;

perSystem = { self', pkgs, cranePkgs, ... }: (lib.mkMerge [
{