From 6bec159f6076cd59936068ffa0c91ffceb2dd6cd Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Sat, 22 Feb 2025 12:14:49 +0100
Subject: [PATCH] flake: drop flake-utils as a dependency

Replace flake-utils with a few lines of pure nix code, since flake-utils
is not really useful here.
---
 flake.lock | 34 ----------------------------------
 flake.nix  | 20 +++++++++++---------
 2 files changed, 11 insertions(+), 43 deletions(-)

diff --git a/flake.lock b/flake.lock
index 081079dfa..a3ab63ef7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,23 +1,5 @@
 {
   "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1725036679,
@@ -36,24 +18,8 @@
     },
     "root": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 41a92917b..040bc2473 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,17 +1,19 @@
 {
   description = "YaCy -- distributed search engine";
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-  inputs.flake-utils.url = "github:numtide/flake-utils";
 
-  outputs = { self, nixpkgs, flake-utils }:
-    flake-utils.lib.eachDefaultSystem (system: let
-      pkgs = nixpkgs.legacyPackages.${system};
-    in {
-      devShells.default = pkgs.mkShell {
-        packages = [
-            pkgs.ant
-            pkgs.temurin-bin-11
+  outputs = inputs: let
+    systems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
+    forEachSystem = inputs.nixpkgs.lib.genAttrs systems;
+    pkgsForEach = inputs.nixpkgs.legacyPackages;
+  in {
+    devShells = forEachSystem (system: {
+      default = pkgsForEach.${system}.mkShell {
+        packages = with pkgsForEach.${system}; [
+          pkgs.ant
+          pkgs.temurin-bin-11
         ];
       };
     });
+  };
 }