tildefriends is packaged upstream + update

flake.lock

@@ -1,5 +1,23 @@
 {
   "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"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -7,11 +25,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715930644,
+        "lastModified": 1716457508,
-        "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
+        "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
+        "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05",
         "type": "github"
       },
       "original": {
@@ -22,11 +40,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1715787315,
+        "lastModified": 1716330097,
-        "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
+        "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
+        "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
         "type": "github"
       },
       "original": {
@@ -36,22 +54,39 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1715395895,
+        "narHash": "sha256-DreMqi6+qa21ffLQqhMQL2XRUkAGt3N7iVB5FhJKie4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "71bae31b7dbc335528ca7e96f479ec93462323ff",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "stable": "stable",
         "stable-home-manager": "stable-home-manager",
+        "tildefriends": "tildefriends",
         "unstable": "unstable"
       }
     },
     "stable": {
       "locked": {
-        "lastModified": 1715668745,
+        "lastModified": 1716361217,
-        "narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=",
+        "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9ddcaffecdf098822d944d4147dd8da30b4e6843",
+        "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f",
         "type": "github"
       },
       "original": {
@@ -82,13 +117,48 @@
         "type": "github"
       }
     },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "tildefriends": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1716425530,
+        "narHash": "sha256-57JLuXguDOcIdjJF3fZZoJU67wZeH7Va0oN74vN/C+w=",
+        "ref": "main",
+        "rev": "580688381e08d2b6df67f146118f9c4e38b37f78",
+        "revCount": 1634,
+        "type": "git",
+        "url": "https://dev.tildefriends.net/cory/tildefriends"
+      },
+      "original": {
+        "ref": "main",
+        "type": "git",
+        "url": "https://dev.tildefriends.net/cory/tildefriends"
+      }
+    },
     "unstable": {
       "locked": {
-        "lastModified": 1715787315,
+        "lastModified": 1716330097,
-        "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
+        "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
+        "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
         "type": "github"
       },
       "original": {

flake.nix

@@ -17,6 +17,8 @@
       inputs.nixpkgs.follows = "stable";
     };
 
+    tildefriends.url = "git+https://dev.tildefriends.net/cory/tildefriends?ref=main";
+
     # nixos-conf-editor.url = "github:snowfallorg/nixos-conf-editor";
     # nix-software-center.url = "github:snowfallorg/nix-software-center";
   };
@@ -30,6 +32,7 @@
     stable-home-manager,
     # nixos-conf-editor,
     # nix-software-center,
+    tildefriends,
     ...
   } @ inputs: let
     inherit (self) outputs;

hosts/yaseen/configuration.nix

@@ -81,7 +81,7 @@ in {
   services.flatpak.enable = true;
 
   environment.systemPackages = with pkgs; [
-    # tildefriends
+    inputs.tildefriends.packages.${system}.default
 
     osu-lazer-bin
     prismlauncher

pkgs/default.nix

@@ -6,6 +6,5 @@
   ...
 }: {
   # mkdocs-rss-plugin = pkgs.callPackage ./mkdocs-rss-plugin/default.nix {};
-  tildefriends = pkgs.callPackage ./tildefriends/default.nix {};
   vedirect-reader = pkgs.callPackage ./vedirect-reader/default.nix {};
 }

pkgs/tildefriends/default.nix

@@ -1,48 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitea,
-  gnumake,
-  openssl,
-  which,
-}:
-stdenv.mkDerivation rec {
-  pname = "tildefriends";
-  version = "0.0.18";
-
-  src = fetchFromGitea {
-    domain = "dev.tildefriends.net";
-    owner = "cory";
-    repo = "tildefriends";
-    rev = "v${version}";
-    hash = "sha256-+uthA1w8CmZfW+WOK9wYGl2fUl/k10ufOc8W+Pwa9iQ=";
-    fetchSubmodules = true;
-  };
-
-  nativeBuildInputs = [
-    gnumake
-    openssl
-    which
-  ];
-
-  buildPhase = ''
-    make -j $NIX_BUILD_CORES release
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-
-    cp -r out/release/* $out/bin
-  '';
-
-  doCheck = false;
-
-  meta = {
-    homepage = "https://tildefriends.net";
-    description = "Make apps and friends from the comfort of your web browser.";
-    mainProgram = "tildefriends";
-    license = with lib.licenses; [mit];
-    maintainers = with lib.maintainers; [tasiaiso];
-    platforms = lib.platforms.all;
-  };
-}