From 055c56cfef28e3a31936b16f7e8faea0f228864f Mon Sep 17 00:00:00 2001
From: Adrian Pistol <vifino@posteo.net>
Date: Fri, 5 Jul 2024 21:53:29 +0200
Subject: [PATCH] chore: format; drop i686

---
 .github/workflows/nix.yml |  7 ++-----
 default.nix               |  3 ++-
 flake.lock                | 12 ++++++------
 flake.nix                 | 11 ++++++-----
 tests/loop.nix            |  3 ++-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 995252c..c81349b 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -13,13 +13,10 @@ jobs:
       matrix:
         # aarch64-linux and friends require emulation, which is terribly slow.
         # so slow, that the test doesn't pass.
+        # i686 got dropped somewhere around 24.05
         # TODO: set up aarch64 worker?
-        system: [x86_64, i686]
+        system: [x86_64]
         check: [loop, tcp, rdma]
-        exclude:
-          # Failed to find module 'rdma_rxe'
-          - system: i686
-            check: rdma
     name: ${{ matrix.system }} - ${{ matrix.check }}
     steps:
     - uses: actions/checkout@v4
diff --git a/default.nix b/default.nix
index 0fb3d0b..fc3885a 100644
--- a/default.nix
+++ b/default.nix
@@ -6,7 +6,8 @@
 rustPlatform.buildRustPackage {
   pname = "nvmetcfg";
   version = "0.1.0";
-  src = with lib.strings; builtins.filterSource
+  src = with lib.strings;
+    builtins.filterSource
     (path: type: builtins.any (suf: hasPrefix (toString suf) path) [./src ./Cargo.toml ./Cargo.lock])
     ./.;
 
diff --git a/flake.lock b/flake.lock
index 28b98d0..82926c1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1719838683,
-        "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=",
+        "lastModified": 1719956923,
+        "narHash": "sha256-nNJHJ9kfPdzYsCOlHOnbiiyKjZUW5sWbwx3cakg3/C4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69",
+        "rev": "706eef542dec88cc0ed25b9075d3037564b2d164",
         "type": "github"
       },
       "original": {
@@ -48,11 +48,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719886738,
-        "narHash": "sha256-6eaaoJUkr4g9J/rMC4jhj3Gv8Sa62rvlpjFe3xZaSjM=",
+        "lastModified": 1720145907,
+        "narHash": "sha256-mNO3vfM43+w4Bp+zMC8Dkf4ktLpYYRpk9tAOp4iumio=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "db12d0c6ef002f16998723b5dd619fa7b8997086",
+        "rev": "5ad2d5884b9b16319c9c5ca4e80a5b8606b083ae",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index bfa6f40..34a8657 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,9 +4,7 @@
     flake-utils.url = "github:numtide/flake-utils";
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-      };
+      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
   outputs = {
@@ -29,13 +27,16 @@
         packages = rec {
           nvmetcfg = pkgs.callPackage ./. {};
           nvmetcfg-static = pkgs.pkgsStatic.callPackage ./. {};
-          nvmetcfg-coverage = (nvmetcfg.overrideAttrs (o: { RUSTFLAGS = "-C instrument-coverage"; dontStrip = true; }));
+          nvmetcfg-coverage = nvmetcfg.overrideAttrs (o: {
+            RUSTFLAGS = "-C instrument-coverage";
+            dontStrip = true;
+          });
           default = nvmetcfg;
         };
         devShells.default = pkgs.mkShell {
           buildInputs = with pkgs; [
             (rust-bin.stable.latest.default.override {
-              extensions = [ "llvm-tools-preview" ];
+              extensions = ["llvm-tools-preview"];
             })
             cargo-bloat
             cargo-llvm-cov
diff --git a/tests/loop.nix b/tests/loop.nix
index 689077c..9f2be23 100644
--- a/tests/loop.nix
+++ b/tests/loop.nix
@@ -7,7 +7,8 @@
     ...
   }: {
     environment.systemPackages = with pkgs; [
-      self.packages.${system}.nvmetcfg-coverage nvme-cli
+      self.packages.${system}.nvmetcfg-coverage
+      nvme-cli
       llvmPackages_17.bintools
     ];
     boot.kernelModules = ["nvmet"];