update forgejo to 7.0.1

This commit is contained in:
Jeffrey C. Ollie 2024-04-28 12:47:30 -05:00
parent e87fc69f5b
commit 3ad741bab2
Signed by: jeff
GPG key ID: 6F86035A6D97044E
3 changed files with 24 additions and 25 deletions

View file

@ -5,11 +5,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1710146030,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,13 +18,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1704722960, "lastModified": 1714253743,
"narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -36,7 +36,7 @@
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs": "nixpkgs"
} }
}, },
"systems": { "systems": {

View file

@ -2,7 +2,7 @@
description = "Forgejo"; description = "Forgejo";
inputs = { inputs = {
nixpkgs-unstable = { nixpkgs = {
url = "nixpkgs/nixos-unstable"; url = "nixpkgs/nixos-unstable";
}; };
flake-utils = { flake-utils = {
@ -10,15 +10,14 @@
}; };
}; };
outputs = { outputs = {
self, nixpkgs,
nixpkgs-unstable,
flake-utils, flake-utils,
... ...
} @ inputs: }:
flake-utils.lib.eachDefaultSystem flake-utils.lib.eachDefaultSystem
( (
system: let system: let
pkgs = import nixpkgs-unstable { pkgs = import nixpkgs {
inherit system; inherit system;
}; };
in { in {
@ -27,11 +26,11 @@
pamSupport = true; pamSupport = true;
sqliteSupport = true; sqliteSupport = true;
pname = "forgejo"; pname = "forgejo";
version = "1.22.0-0"; version = "7.0.1";
rev = "b5757a6691d0b4d1a46bfa24fb4c9f3cfeabcefb"; rev = "5793e8687f189a603a24a21de8a80e42e30ece08";
hash = "sha256-hP4RjsjFchrZO7eSs/IGcoMNpMnLnjaYbZZnxn4/X2c="; hash = "sha256-HTTbIS+GBEuhYuKSI5jlhoX6hl6BsXp77h8JSQZyknI=";
npmDepsHash = "sha256-fGvf6bLA9/cCKucj0oQCZC86lnvvEqqHKHnkiCc7bT0="; npmDepsHash = "sha256-BffoEbIzTU61bw3ECEm5eDHcav4S27MB5jQKsMprkcw=";
vendorHash = "sha256-EDYtyF9vQrxhdhMFnYl/Ut6syZl5ufGddXUHHKOPzfs="; vendorHash = "sha256-UcjaMi/4XYLdaJhi2j3UWqHqkpTbZBo6EwNXxdRIKLw=";
src = pkgs.fetchFromGitea { src = pkgs.fetchFromGitea {
inherit rev hash; inherit rev hash;
domain = "codeberg.org"; domain = "codeberg.org";
@ -68,7 +67,7 @@
# ''; # '';
tags = pkgs.lib.optional pamSupport "pam" ++ pkgs.lib.optionals sqliteSupport ["sqlite" "sqlite_unlock_notify"]; tags = pkgs.lib.optional pamSupport "pam" ++ pkgs.lib.optionals sqliteSupport ["sqlite" "sqlite_unlock_notify"];
in in
pkgs.buildGo121Module { pkgs.buildGo122Module {
inherit pname src version vendorHash; inherit pname src version vendorHash;
subPackages = ["."]; subPackages = ["."];
@ -94,7 +93,7 @@
]; ];
preBuild = '' preBuild = ''
go run build/merge-forgejo-locales.go # go run build/merge-forgejo-locales.go
''; '';
postInstall = '' postInstall = ''

View file

@ -1,11 +1,11 @@
diff --git a/package.json b/package.json diff --git a/package.json b/package.json
index 57dcfc2f7..c9f23dbf7 100644 index fdea78ca2..f3b5284ed 100644
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -79,5 +79,8 @@ @@ -93,5 +93,8 @@
"defaults", },
"not ie > 0", "browserslist": [
"not ie_mob > 0" "defaults"
- ] - ]
+ ], + ],
+ "scripts": { + "scripts": {