nix fix up! Rust now integrated into bcachefs binary

Heavily simplified to just call make with the required rust dependencies.

Signed-off-by: Daniel Hill <daniel@gluo.nz>

3 files changed, 0 insertions, 130 deletions

diff --git a/rust-src/bch_bindgen/default.nix b/rust-src/bch_bindgen/default.nix
deleted file mode 100644
index b7ad502a..00000000
--- a/rust-src/bch_bindgen/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ lib
-, stdenv
-, rustPlatform
-, llvmPackages
-, bcachefs
-, pkg-config
-, udev
-, liburcu
-, zstd
-, keyutils
-, libaio
-, lz4       # liblz4
-, libsodium
-, libuuid
-, zlib       # zlib1g
-, libscrypt
-, rustfmt
-, glibc
-, ...
-}:
-let
-  cargo = lib.trivial.importTOML ./Cargo.toml;
-in
-rustPlatform.buildRustPackage {
-  pname = cargo.package.name;
-  version = cargo.package.version;
-
-  src = builtins.path {
-    path = ./.;
-    name = "bch_bindgen";
-  };
-
-  cargoLock = { lockFile = ./Cargo.lock; };
-
-  propagatedNativeBuildInputs = [ rustPlatform.bindgenHook ];
-
-  propagatedBuildInputs = [
-    bcachefs.tools
-  ];
-
-  LIBBCACHEFS_LIB ="${bcachefs.tools}/lib";
-  LIBBCACHEFS_INCLUDE = bcachefs.tools.src;
-
-  postPatch = ''
-    cp ${./Cargo.lock} Cargo.lock
-  '';
-
-  doCheck = true;
-}
diff --git a/rust-src/default.nix b/rust-src/default.nix
deleted file mode 100644
index 7cc4b956..00000000
--- a/rust-src/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib
-, stdenv
-, glibc
-, udev
-, llvmPackages
-, rustPlatform
-, binary
-, ...
-}: rustPlatform.buildRustPackage ( let 
-  cargo = lib.trivial.importTOML ./Cargo.toml;
-in {
-  pname = "mount.bcachefs";
-  version = cargo.package.version;
-
-  src = builtins.path { path = ../.; name = "rust-src"; };
-  sourceRoot = "rust-src/mount";
-
-  cargoLock = { lockFile = ./Cargo.lock; };
-
-  nativeBuildInputs = [ binary rustPlatform.bindgenHook ];
-  buildInputs = [ binary ];
-
-  LIBBCACHEFS_LIB ="${binary}/lib";
-  LIBBCACHEFS_INCLUDE = binary.src;
-
-  doCheck = false;
-})
diff --git a/rust-src/module.nix b/rust-src/module.nix
deleted file mode 100644
index b62aa7dc..00000000
--- a/rust-src/module.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-## Mirrors: https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/modules/tasks/filesystems/bcachefs.nix
-## with changes to use flakes and import mount.bcachefs
-{ config, lib, pkgs, utils, ... }:
-
-with lib;
-
-let
-
-	bootFs = filterAttrs (n: fs: (fs.fsType == "bcachefs") && (utils.fsNeededForBoot fs)) config.fileSystems;
-	cfg = config.filesystems.bcachefs;
-in
-
-{
-	options.filesystems.bcachefs.packages.tools = lib.mkOption {
-		description = "Which package to use to link in the bcachefs tools package";
-		default = pkgs.bcachefs.tools;
-		type = lib.types.package;
-	};
-	options.filesystems.bcachefs.packages.mount = lib.mkOption {
-		description = "Which package to use to link in the bcachefs mount package";
-		default = pkgs.bcachefs.mount;
-		type = lib.types.package;
-	};
-	options.filesystems.bcachefs.packages.kernelPackages = lib.mkOption {
-		description = "Which package to use to link in the kernel package to use";
-		default = pkgs.bcachefs.kernelPackages;
-		type = lib.types.attrs;
-
-	};
-
-	config = mkIf (elem "bcachefs" config.boot.supportedFilesystems) (mkMerge [
-		{
-			system.fsPackages = [ cfg.packages.tools cfg.packages.mount ];
-
-			# use kernel package with bcachefs support until it's in mainline
-			boot.kernelPackages = cfg.packages.kernelPackages;
-		}
-
-		(mkIf ((elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) {
-			# chacha20 and poly1305 are required only for decryption attempts
-			boot.initrd.availableKernelModules = [ "sha256" "chacha20" "poly1305" ];
-			boot.initrd.kernelModules = [ "bcachefs" ];
-
-			boot.initrd.extraUtilsCommands = ''
-				copy_bin_and_libs ${cfg.packages.tools}/bin/bcachefs
-				copy_bin_and_libs ${cfg.packages.mount}/bin/mount.bcachefs
-			'';
-			boot.initrd.extraUtilsCommandsTest = ''
-				$out/bin/bcachefs version
-				$out/bin/mount.bcachefs --version
-			'';
-		})
-	]);
-}