cleanup alias, flake

cbindgen.toml

@@ -38,8 +38,6 @@ include = []
 exclude = ["BitVec"]
 
 [export.rename]
-"SPCommand" = "Command"
-"DisplayBitVec" = "BitVec"
 
 [enum]
 rename_variants = "QualifiedScreamingSnakeCase"

devShells.nix

@@ -5,33 +5,41 @@
   ...
 }:
 let
-  defaultAdditionalPkgs = with pkgs; [
-    rustfmt
-    clippy
-    cargo-expand
-    cargo-tarpaulin
+  common = {
+    RUST_BACKTRACE = 1;
+    RUST_LOG = "all";
+    packages = with pkgs; [
       gdb
       nix-output-monitor
     ];
-in
-(builtins.mapAttrs (
-  packageName: package:
-  pkgs.mkShell {
-    inputsFrom = [ package ];
-    packages = defaultAdditionalPkgs;
-    RUST_BACKTRACE = 1;
-    RUST_LOG = "all";
-  }
-) selfPkgs)
-// {
-  default = pkgs.mkShell {
+  };
+in rec {
+  nightly = pkgs.mkShell ( common // {
+    inputsFrom = [
+      selfPkgs.servicepoint-binding-c-nightly-release
+    ];
+    packages = with pkgs; [
+        cargo-expand
+        cargo-tarpaulin
+        nix-output-monitor
+        gcc
+        gnumake
+        rustfmt
+        xe
+        libgcc
+        libunwind
+        pkgsStatic.gcc
+        pkgsStatic.libgcc
+        pkgsStatic.musl
+        rust-cbindgen
+      ];
+  });
+  stable = pkgs.mkShell (common // {
     inputsFrom = [
       selfPkgs.servicepoint-binding-c
       selfPkgs.announce
     ];
-    packages =
-      defaultAdditionalPkgs
-      ++ (with pkgs; [
+    packages = with pkgs; [
         (pkgs.symlinkJoin {
           name = "rust-toolchain";
           paths = with pkgs; [
@@ -45,6 +53,8 @@ in
             cargo-tarpaulin
           ];
         })
+        cargo-expand
+        cargo-tarpaulin
         gcc
         gnumake
         xe
@@ -53,8 +63,9 @@ in
         pkgsStatic.gcc
         pkgsStatic.libgcc
         pkgsStatic.musl
-      ]);
+      ];
 
     RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}";
-  };
+  });
+  default = stable;
 }

packages.nix

@@ -16,7 +16,6 @@ let
       cargoBuildFlags ? [ ],
       nativeBuildInputs ? [],
       stdlib ? false,
-
     }:
     rustPlatform.buildRustPackage (finalAttrs: {
       inherit version buildType cargoBuildFlags stdlib;