From 64a81ca78d03816ddcbbdc8a7b6186c975c6653a Mon Sep 17 00:00:00 2001
From: Danilo Reyes <CaptainJawZ@protonmail.com>
Date: Tue, 23 Sep 2025 23:55:16 -0600
Subject: [PATCH] cleanup

---
 flake.lock               | 73 +++++++++++++++++++++++++++++++++++++---
 flake.nix                |  6 ++--
 pkgs/resilio/package.nix | 61 ---------------------------------
 3 files changed, 71 insertions(+), 69 deletions(-)
 delete mode 100644 pkgs/resilio/package.nix

diff --git a/flake.lock b/flake.lock
index ff10a06..72cb5c3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,12 +1,30 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1753345091,
-        "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=",
+        "lastModified": 1758589230,
+        "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9",
+        "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0",
         "type": "github"
       },
       "original": {
@@ -16,9 +34,56 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1743576891,
+        "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "44a69ed688786e98a101f02b712c313f1ade37ab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "sudoku-solver": "sudoku-solver"
+      }
+    },
+    "sudoku-solver": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "path": "./src/sudoku-hs",
+        "type": "path"
+      },
+      "original": {
+        "path": "./src/sudoku-hs",
+        "type": "path"
+      },
+      "parent": []
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 3f4571b..b800caa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "Nix flake for the activity logging script";
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
-    # sudoku-solver.url = "path:./src/sudoku-hs";
+    sudoku-solver.url = "path:./src/sudoku-hs";
   };
   outputs =
     { nixpkgs, ... }@inputs:
@@ -48,10 +48,8 @@
           citra = pkgs.callPackage ./pkgs/citra/default.nix { branch = "nightly"; };
           torzu = pkgs.callPackage ./pkgs/torzu/package.nix { };
           pano = pkgs.callPackage ./pkgs/pano/default.nix { };
-          mealie = pkgs.callPackage ./pkgs/mealie/package.nix { };
           vdhcoapp = pkgs.callPackage ./pkgs/vdhcoapp/default.nix { };
-          resilio = pkgs.callPackage ./pkgs/resilio/package.nix { };
-          # sudoku-solver = inputs.sudoku-solver.packages.${system}.default;
+          sudoku-solver = inputs.sudoku-solver.packages.${system}.default;
         }
         // generatePackages {
           dir = "pkgs";
diff --git a/pkgs/resilio/package.nix b/pkgs/resilio/package.nix
deleted file mode 100644
index fc179d5..0000000
--- a/pkgs/resilio/package.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  autoPatchelfHook,
-  libxcrypt-legacy,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "resilio-sync";
-  version = "2.8.1.1390";
-
-  src =
-    {
-      x86_64-linux = fetchurl {
-        url = "https://download-cdn.resilio.com/${version}/linux/x64/0/resilio-sync_x64.tar.gz";
-        sha256 = "sha256-XrfE2frDxOS32MzO7gpJEsMd0WY+b7TS0h/H94M7Py4=";
-      };
-
-      i686-linux = fetchurl {
-        url = "https://download-cdn.resilio.com/${version}/linux/i386/0/resilio-sync_i386.tar.gz";
-        sha256 = "sha256-tWwb9DHLlXeyimzyo/yxVKqlkP3jlAxT2Yzs6h2bIgs=";
-      };
-
-      aarch64-linux = fetchurl {
-        url = "https://download-cdn.resilio.com/${version}/linux/arm64/0/resilio-sync_arm64.tar.gz";
-        sha256 = "sha256-b859DqxTfnBMMeiwXlGKTQ+Mpmr2Rpg24l/GNkxSWbA=";
-      };
-    }
-    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-
-  dontStrip = true; # Don't strip, otherwise patching the rpaths breaks
-  sourceRoot = ".";
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-  ];
-
-  buildInputs = [
-    stdenv.cc.libc
-    libxcrypt-legacy
-  ];
-
-  installPhase = ''
-    install -D rslsync "$out/bin/rslsync"
-  '';
-
-  meta = with lib; {
-    description = "Automatically sync files via secure, distributed technology";
-    homepage = "https://www.resilio.com/";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfreeRedistributable;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
-      domenkozar
-      thoughtpolice
-      cwoac
-    ];
-    mainProgram = "rslsync";
-  };
-}