From 18415799b7fe9aeb2731b98eabba525f0da91e8c Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Tue, 31 May 2022 17:47:28 -0700
Subject: [PATCH] remove gitea unstable: we're running a compatible version in
 nixos-22.05 now

gitea registration flow tested: it still redirects registration emails to my own email
---
 flake.lock | 16 ----------------
 flake.nix  |  7 +------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/flake.lock b/flake.lock
index a38d6f92..44af221d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -67,21 +67,6 @@
         "type": "github"
       }
     },
-    "pkgs-gitea": {
-      "locked": {
-        "lastModified": 1651726670,
-        "narHash": "sha256-dSGdzB49SEvdOJvrQWfQYkAefewXraHIV08Vz6iDXWQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c777cdf5c564015d5f63b09cc93bef4178b19b01",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "rev": "c777cdf5c564015d5f63b09cc93bef4178b19b01",
-        "type": "indirect"
-      }
-    },
     "pkgs-mobile": {
       "locked": {
         "lastModified": 1653060744,
@@ -118,7 +103,6 @@
         "mobile-nixos": "mobile-nixos",
         "nixpkgs": "nixpkgs",
         "nurpkgs": "nurpkgs",
-        "pkgs-gitea": "pkgs-gitea",
         "pkgs-mobile": "pkgs-mobile",
         "pkgs-unstable": "pkgs-unstable"
       }
diff --git a/flake.nix b/flake.nix
index b21cd6a4..e31b8a3a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,6 @@
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-22.05";
     pkgs-unstable.url = "nixpkgs/nixos-unstable";
-    pkgs-gitea.url = "nixpkgs/c777cdf5c564015d5f63b09cc93bef4178b19b01";
     # pkgs-telegram.url = "nixpkgs/33775ec9a2173a08e46edf9f46c9febadbf743e8";# 2022/04/18; telegram 3.7.3. fails: nix log /nix/store/y5kv47hnv55qknb6cnmpcyraicay79fx-telegram-desktop-3.7.3.drv: g++: fatal error: cannot execute '/nix/store/njk5sbd21305bhr7gwibxbbvgbx5lxvn-gcc-9.3.0/libexec/gcc/aarch64-unknown-linux-gnu/9.3.0/cc1plus': execv: No such file or directory
     pkgs-mobile.url = "nixpkgs/dfd82985c273aac6eced03625f454b334daae2e8";    # WORKS: 2022/05/20; mobile-nixos follows this same commit.
     mobile-nixos = {
@@ -22,7 +21,7 @@
     nurpkgs.url = "github:nix-community/NUR";
   };
 
-  outputs = { self, nixpkgs, pkgs-unstable, pkgs-gitea, pkgs-mobile, mobile-nixos, home-manager, nurpkgs }: {
+  outputs = { self, nixpkgs, pkgs-unstable, pkgs-mobile, mobile-nixos, home-manager, nurpkgs }: {
     machines.uninsane = self.decl-bootable-machine { name = "uninsane"; system = "aarch64-linux"; };
     machines.desko = self.decl-bootable-machine { name = "desko"; system = "x86_64-linux"; };
     machines.lappy = self.decl-bootable-machine { name = "lappy"; system = "x86_64-linux"; };
@@ -95,10 +94,6 @@
           electrum = pkgs-unstable.legacyPackages.${system}.electrum;
 
           #### TEMPORARY NIXOS-UNSTABLE PACKAGES
-          # gitea: 1.16.5 contains a fix which makes manual user approval *actually* work.
-          # https://github.com/go-gitea/gitea/pull/19119
-          # safe to remove after 1.16.5 (or 1.16.7 if we need db compat?)
-          gitea = pkgs-gitea.legacyPackages.${system}.gitea;
 
           # nixos-21.11 whalebird uses an insecure electron version.
           # TODO: remove this on next nixos release.