Update flood fork

2025-12-06 06:36:19 +00:00 · 2025-02-02 18:04:14 +00:00
parent 9c5664e498
commit b7ae711216
2 changed files with 47 additions and 77 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1738063137,
-        "narHash": "sha256-lPuk+JaqFx7DFWAhf+PYcY4NF2Ebr5YRGLO/3299hHI=",
+        "lastModified": 1738444048,
+        "narHash": "sha256-hUTRRFO6z02zvHQBS6U5Om7iHUwU8AWYTDbBtISE+Vk=",
        "owner": "aylur",
        "repo": "astal",
-        "rev": "cb1578a7917339a9df9fa87773a739a0249501e2",
+        "rev": "32348e7c5b2246c6ddc82499cfb08244313ead44",
        "type": "github"
      },
      "original": {
@@ -92,11 +92,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1736143030,
-        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
+        "lastModified": 1738453229,
+        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
+        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
        "type": "github"
      },
      "original": {
@@ -147,11 +147,11 @@
    "flood": {
      "flake": false,
      "locked": {
-        "lastModified": 1730892065,
-        "narHash": "sha256-z8PKXKx3eWinq9Lx2mDjn163dWsmizYJLIqI5tEpdik=",
+        "lastModified": 1738516486,
+        "narHash": "sha256-B1hAmv1sRxqHM9EBO7Wij54Q8xK8Cpasb7DDSovI3qM=",
        "owner": "zoriya",
        "repo": "flood",
-        "rev": "6571624b7200556bc5637c4e08d361500c1aa6a4",
+        "rev": "875ae36d17300c630c2370f132eb385a048fc1e1",
        "type": "github"
      },
      "original": {
@@ -172,11 +172,11 @@
        "zig": "zig"
      },
      "locked": {
-        "lastModified": 1738200112,
-        "narHash": "sha256-50nXRIzIZmzKjM/zC+QRs0wNiOtSAtcwoql3supPBkI=",
+        "lastModified": 1738275804,
+        "narHash": "sha256-n9cSCLlWjc8Bc5QyZYLo5+c6MfTZjgDpUGx/FGxBiY8=",
        "owner": "mitchellh",
        "repo": "ghostty",
-        "rev": "04d36361b1a19a3b78b9cbcea5a233ccd56fb4e8",
+        "rev": "c5508e7d1922842ecd3160ea73b97da1282168b3",
        "type": "github"
      },
      "original": {
@@ -239,11 +239,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1736917206,
-        "narHash": "sha256-JTBWmyGf8K1Rwb+gviHIUzRJk/sITtT+72HXFkTZUjo=",
+        "lastModified": 1738237977,
+        "narHash": "sha256-oJN/yvRL7G0WlR/hTkQIjFbPkzCV+sFnNB/38Tb9RL4=",
        "owner": "hercules-ci",
        "repo": "hercules-ci-effects",
-        "rev": "afd0a42e8c61ebb56899315ee4084a8b2e4ff425",
+        "rev": "6d1b6d5d59758b4f5f05745f774fc13cdc59da43",
        "type": "github"
      },
      "original": {
@@ -259,11 +259,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1738228963,
-        "narHash": "sha256-Ee5hVHM7AWxaq7XJN6xiZztTZX8csdXernjqaTW5r9I=",
+        "lastModified": 1738448366,
+        "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "d963ed335b890a70ed53eecf14cdb21528eda9b8",
+        "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93",
        "type": "github"
      },
      "original": {
@@ -317,11 +317,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1738195516,
-        "narHash": "sha256-rV+xDnqsQDwr5M/PVl3GF7Z6vCt35OTVlWkR2NctynM=",
+        "lastModified": 1738479528,
+        "narHash": "sha256-VmO/CQEQjIpfYot//PHDQuUm68r27zNuBiuANi6c5E4=",
        "owner": "nix-community",
        "repo": "neovim-nightly-overlay",
-        "rev": "656af7726c8349a4e8e0569d0cce1b0a2e238a9f",
+        "rev": "1b82dbcbbcba812ad19f5c0601d1731731bf4ebe",
        "type": "github"
      },
      "original": {
@@ -333,11 +333,11 @@
    "neovim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1738181003,
-        "narHash": "sha256-NaxOXIwtbUlaX6+meTkXZ6N/Xr+fZv+/9dDWl/3AGqg=",
+        "lastModified": 1738450845,
+        "narHash": "sha256-yK2ZOtTTT6BjNi98PZi0NpEbidY12JMjgkqqggjoyD8=",
        "owner": "neovim",
        "repo": "neovim",
-        "rev": "35c5e231078365033524b0aa2166118a1b2ef600",
+        "rev": "0985e784d8dce58748343207e176bf61303b7d68",
        "type": "github"
      },
      "original": {
@@ -353,11 +353,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1738033138,
-        "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=",
+        "lastModified": 1738277753,
+        "narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=",
        "owner": "LnL7",
        "repo": "nix-darwin",
-        "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120",
+        "rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9",
        "type": "github"
      },
      "original": {
@@ -373,11 +373,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737861961,
-        "narHash": "sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf+TpE=",
+        "lastModified": 1738466368,
+        "narHash": "sha256-PZhUjtvQZOH3PO0EYdTpQvcqkgkq1NkP2A6w9SPHYsk=",
        "owner": "nix-community",
        "repo": "nix-index-database",
-        "rev": "79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523",
+        "rev": "46a8f5fc9552b776bfc5c5c96ea3bede33f68f52",
        "type": "github"
      },
      "original": {
@@ -388,11 +388,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1737751639,
-        "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=",
+        "lastModified": 1738471961,
+        "narHash": "sha256-cgXDFrplNGs7bCVzXhRofjD8oJYqqXGcmUzXjHmip6Y=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4",
+        "rev": "537286c3c59b40311e5418a180b38034661d2536",
        "type": "github"
      },
      "original": {
@@ -425,11 +425,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1738142207,
-        "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
+        "lastModified": 1738410390,
+        "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
+        "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
        "type": "github"
      },
      "original": {
@@ -533,11 +533,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1738209935,
-        "narHash": "sha256-y3TKxQp4p/yagvrhyhK4I9fXCGwu9QgK7sIlI3c8eSI=",
+        "lastModified": 1738469108,
+        "narHash": "sha256-AS4akOUGZP2ELHQKj1IiXuuzU9bpK20ks4dGaCrwOEk=",
        "owner": "youwen5",
        "repo": "zen-browser-flake",
-        "rev": "98abc33525b543318a6aaa1c40f93149793e1451",
+        "rev": "f95fa7b1560b0f2ed8989e6f12f2c7e7e7ee9433",
        "type": "github"
      },
      "original": {
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -20,46 +20,16 @@
      --add-flags "--ozone-platform=wayland"'';
 in {
  # Use my fork of flood to enable smart scripts.
-  flood = self.stdenv.mkDerivation (finalAttrs: {
-    pname = "flood";
-    version = "4.8.4-dirty";
-
+  flood = super.flood.overrideAttrs rec {
    src = flood;
-
-    nativeBuildInputs = with self.pkgs; [
-      nodejs
-      pnpm.configHook
-      super.makeWrapper
-    ];
-
-    pnpmDeps = self.pkgs.pnpm.fetchDeps {
-      inherit (finalAttrs) pname version src;
-      hash = "sha256-as/ZVgR+yf9tkz+HG1U66oKGvpTGMW23dQ9M7QHnV4U=";
+    npmDeps = pnpmDeps;
+    pnpmDeps = super.pnpm_9.fetchDeps {
+      pname = "flood";
+      version = "4.9.4-dirty";
+      src = flood;
+      hash = "sha256-E2VxRcOMLvvCQb9gCAGcBTsly571zh/HWM6Q1Zd2eVw=";
    };
-
-    buildPhase = ''
-      runHook preBuild
-      pnpm build
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      runHook preInstall
-      mkdir -p $out/{lib,bin}
-      cp -r {dist,node_modules} $out/lib
-      makeWrapper ${self.pkgs.nodejs}/bin/node $out/bin/flood --add-flags $out/lib/dist/index.js
-      runHook postInstall
-    '';
-
-    dontStrip = true;
-
-    meta = with self.lib; {
-      description = "A modern web UI for various torrent clients with a Node.js backend and React frontend";
-      homepage = "https://flood.js.org";
-      license = licenses.gpl3Only;
-      maintainers = with maintainers; [winter];
  };
-  });

  river = super.river.overrideAttrs {
    src = river-src;