feat(nix-patches): Switch to upstream version

2023-09-24 13:03:23 +02:00 · 2023-09-24 13:03:23 +02:00 · eb329666ce
commit eb329666ce
parent ed883a7bcc
9 changed files with 92 additions and 7831 deletions
--- a/patches/default.nix
+++ b/patches/default.nix
@ -0,0 +1,69 @@
+{
+  "nixos-23.05" = [
+    # plausible: fix admin user password seed and SMTP passwords
+    {
+      id = 241126;
+      hash = "sha256-TcGuB3k8SeA8PRb/OdZ8ESw9/7yYKPftR96boK7Hmvc=";
+    }
+
+    # fetchMixDeps: sha256 -> hash
+    {
+      id = 235733;
+      hash = "sha256-oHGZFXwOJ9ngZNJBTd93abgI+eNPsCBJPgFxt41728o=";
+      includes = [
+        "pkgs/development/beam-modules/fetch-mix-deps.nix"
+        "pkgs/servers/web-apps/plausible/default.nix"
+      ];
+    }
+
+    # python3Packages.nix-prefetch-github: 6.0.1 -> 7.0.0
+    # Only keep the files related to plausible
+    {
+      id = 243018;
+      hash = "sha256-/7jid8tKo2JbVyEmeVxt+9VRqc/2YWkUeagyrMqqb70=";
+      includes = [ "pkgs/servers/web-apps/plausible/*" ];
+    }
+
+    # plausible: 1.4.4 -> 1.5.1
+    {
+      id = 229201;
+      hash = "sha256-wJ3qQbX5Yn7PZ5gpJYAeCIkblPaaVgUGg3XJb5C8ccY=";
+    }
+
+    # plausible: 1.5.1 -> 2.0.0
+    {
+      id = 253687;
+      hash = "sha256-yXZn16+J+UhLoH6R+ir5Tk2vYer4ItFgKN2oefXSYDs=";
+    }
+
+    # dbip-country-lite: init at 2023-06
+    {
+      id = 235774;
+      hash = "sha256-M0oktrBKxezhBQh3gKHKXrWF7UjACX3PcpSzoq8HkW0=";
+    }
+
+    # kanidm: 1.1.0-alpha.12 -> 1.1.0-beta.13
+    {
+      id = 246564;
+      hash = "sha256-Q/G6w4iXthhC6JI/erOx0HBJ25aLQLtZSusAOdT6dYc=";
+    }
+
+    # Forgejo v1.19.4-0 -> v1.20.4-1
+    {
+      _type = "static";
+      path = ./forgejo.patch;
+    }
+
+    # nixos/forgejo: fork from nixos/gitea
+    {
+      id = 248310;
+      hash = "sha256-6cLMDbzYRKZrFulkS48dPznAap4bVCLsb1APaud9nV8=";
+    }
+
+    # garage: add environmentFile
+    {
+      id = 257043;
+      hash = "sha256-etzGZRFgFZra5KmL2pUQnIFBFiAudePDmNTVA4VDiBs=";
+    }
+  ];
+}
--- a/patches/forgejo.patch
+++ b/patches/forgejo.patch
@ -0,0 +1,33 @@
+diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix
+index d21097df07b..2ee652d8785 100644
+--- a/pkgs/applications/version-management/forgejo/default.nix
+++ b/pkgs/applications/version-management/forgejo/default.nix
+@@ -23,7 +23,7 @@ let
+     pname = "forgejo-frontend";
+     inherit (forgejo) src version;
+ 
+-    npmDepsHash = "sha256-dB/uBuS0kgaTwsPYnqklT450ejLHcPAqBdDs3JT8Uxg=";
+    npmDepsHash = "sha256-YZzVw+WWqTmJafqnZ5vrzb7P6V4DTMNQwW1/+wvZEM8=";
+ 
+     patches = [
+       ./package-json-npm-build-frontend.patch
+@@ -38,17 +38,17 @@ let
+ in
+ buildGoModule rec {
+   pname = "forgejo";
+-  version = "1.19.4-0";
+  version = "1.20.4-1";
+ 
+   src = fetchFromGitea {
+     domain = "codeberg.org";
+     owner = "forgejo";
+     repo = "forgejo";
+     rev = "v${version}";
+-    hash = "sha256-pTcnST8A4gADPBkNago9uwRFEmTx8vNONL/Emer4xLI=";
+    hash = "sha256-Fxlj+ckw1LSgiQDex3ZizHakIKd52U6JcdTurJj8YWg=";
+   };
+ 
+-  vendorHash = "sha256-LKxhNbSIRaP4EGWX6mE26G9CWfoFTrPRjrL4ShpRHWo=";
+  vendorHash = "sha256-dgtZjsLBwblhdge3BvdbK/mN/TeZKps9K5dJbqomtjo=";
+ 
+   subPackages = [ "." ];