flake: remove flake-utils

flake.lock

@@ -33,10 +33,6 @@
     },
     "root": {
       "inputs": {
-        "flake-utils": [
-          "rust-overlay",
-          "flake-utils"
-        ],
         "nixpkgs": [
           "rust-overlay",
           "nixpkgs"

flake.nix

@@ -3,22 +3,36 @@
 
   inputs = {
     rust-overlay.url = "github:oxalica/rust-overlay";
-    flake-utils.follows = "rust-overlay/flake-utils";
     nixpkgs.follows = "rust-overlay/nixpkgs";
   };
 
-  outputs = inputs@{self, nixpkgs, flake-utils, ...}:
-    flake-utils.lib.eachDefaultSystem (system:
+  outputs =
+    {
+      self,
+      nixpkgs,
+      rust-overlay,
+    }:
     let
-      pkgs = import nixpkgs {
+      pkgsFor =
+        system:
+        import nixpkgs {
           inherit system;
           overlays = [
-          inputs.rust-overlay.overlays.default
+            rust-overlay.overlays.default
           ];
         };
+      lib = nixpkgs.lib;
+      eachSupportedSystem = lib.genAttrs lib.systems.flakeExposed;
     in
     {
-      packages.bvg = let
+      packages = eachSupportedSystem (
+        system:
+        let
+          pkgs = pkgsFor system;
+        in
+        {
+          bvg =
+            let
               env = pkgs.bundlerEnv {
                 name = "bvg-env";
                 ruby = pkgs.ruby;
@@ -26,7 +40,8 @@
                 lockfile = bvg/Gemfile.lock;
                 gemset = bvg/gemset.nix;
               };
-      in pkgs.stdenv.mkDerivation {
+            in
+            pkgs.stdenv.mkDerivation {
               name = "bvg";
               buildInput = [ env.wrappedRuby ];
               script = bvg/bvg.rb;
@@ -35,10 +50,16 @@
                 patchShebangs $out/bin/bvg
               '';
             };
-      packages.onomap = pkgs.haskellPackages.callCabal2nix "onomap" ./onomastics-ng {};
-      packages.alarm = pkgs.writers.writeDashBin "alarm" ''
+          onomap = pkgs.haskellPackages.callCabal2nix "onomap" ./onomastics-ng { };
+          alarm = pkgs.writers.writeDashBin "alarm" ''
             set -efu
-        export PATH=${nixpkgs.lib.makeBinPath [pkgs.coreutils pkgs.bc self.packages.${system}.rusty-jeep]}
+            export PATH=${
+              nixpkgs.lib.makeBinPath [
+                pkgs.coreutils
+                pkgs.bc
+                self.packages.${system}.rusty-jeep
+              ]
+            }
             for i in `seq 8000 1000 10000`; do
             echo $i 100
             done | rusty-jeep
@@ -52,7 +73,7 @@
             echo $(echo "($(od -tu -An -N 2 /dev/urandom)%1000)+500"|bc) $(echo "($(od -tu -An -N 2 /dev/urandom)%500)+100"|bc)
             done | rusty-jeep 1
           '';
-      packages.rusty-jeep = pkgs.rustPlatform.buildRustPackage rec {
+          rusty-jeep = pkgs.rustPlatform.buildRustPackage rec {
             name = "rusty-jeep";
             version = "1.0.0";
             src = ./rusty-jeep;
@@ -65,5 +86,7 @@
               maintainers = [ maintainers.kmein ];
             };
           };
-    });
+        }
+      );
+    };
 }