update forgejo to 7.0.1
This commit is contained in:
parent
e87fc69f5b
commit
3ad741bab2
3 changed files with 24 additions and 25 deletions
16
flake.lock
16
flake.lock
|
@ -5,11 +5,11 @@
|
|||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1701680307,
|
||||
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -18,13 +18,13 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1704722960,
|
||||
"narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=",
|
||||
"lastModified": 1714253743,
|
||||
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d",
|
||||
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -36,7 +36,7 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
|
|
23
flake.nix
23
flake.nix
|
@ -2,7 +2,7 @@
|
|||
description = "Forgejo";
|
||||
|
||||
inputs = {
|
||||
nixpkgs-unstable = {
|
||||
nixpkgs = {
|
||||
url = "nixpkgs/nixos-unstable";
|
||||
};
|
||||
flake-utils = {
|
||||
|
@ -10,15 +10,14 @@
|
|||
};
|
||||
};
|
||||
outputs = {
|
||||
self,
|
||||
nixpkgs-unstable,
|
||||
nixpkgs,
|
||||
flake-utils,
|
||||
...
|
||||
} @ inputs:
|
||||
}:
|
||||
flake-utils.lib.eachDefaultSystem
|
||||
(
|
||||
system: let
|
||||
pkgs = import nixpkgs-unstable {
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
};
|
||||
in {
|
||||
|
@ -27,11 +26,11 @@
|
|||
pamSupport = true;
|
||||
sqliteSupport = true;
|
||||
pname = "forgejo";
|
||||
version = "1.22.0-0";
|
||||
rev = "b5757a6691d0b4d1a46bfa24fb4c9f3cfeabcefb";
|
||||
hash = "sha256-hP4RjsjFchrZO7eSs/IGcoMNpMnLnjaYbZZnxn4/X2c=";
|
||||
npmDepsHash = "sha256-fGvf6bLA9/cCKucj0oQCZC86lnvvEqqHKHnkiCc7bT0=";
|
||||
vendorHash = "sha256-EDYtyF9vQrxhdhMFnYl/Ut6syZl5ufGddXUHHKOPzfs=";
|
||||
version = "7.0.1";
|
||||
rev = "5793e8687f189a603a24a21de8a80e42e30ece08";
|
||||
hash = "sha256-HTTbIS+GBEuhYuKSI5jlhoX6hl6BsXp77h8JSQZyknI=";
|
||||
npmDepsHash = "sha256-BffoEbIzTU61bw3ECEm5eDHcav4S27MB5jQKsMprkcw=";
|
||||
vendorHash = "sha256-UcjaMi/4XYLdaJhi2j3UWqHqkpTbZBo6EwNXxdRIKLw=";
|
||||
src = pkgs.fetchFromGitea {
|
||||
inherit rev hash;
|
||||
domain = "codeberg.org";
|
||||
|
@ -68,7 +67,7 @@
|
|||
# '';
|
||||
tags = pkgs.lib.optional pamSupport "pam" ++ pkgs.lib.optionals sqliteSupport ["sqlite" "sqlite_unlock_notify"];
|
||||
in
|
||||
pkgs.buildGo121Module {
|
||||
pkgs.buildGo122Module {
|
||||
inherit pname src version vendorHash;
|
||||
|
||||
subPackages = ["."];
|
||||
|
@ -94,7 +93,7 @@
|
|||
];
|
||||
|
||||
preBuild = ''
|
||||
go run build/merge-forgejo-locales.go
|
||||
# go run build/merge-forgejo-locales.go
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
diff --git a/package.json b/package.json
|
||||
index 57dcfc2f7..c9f23dbf7 100644
|
||||
index fdea78ca2..f3b5284ed 100644
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -79,5 +79,8 @@
|
||||
"defaults",
|
||||
"not ie > 0",
|
||||
"not ie_mob > 0"
|
||||
@@ -93,5 +93,8 @@
|
||||
},
|
||||
"browserslist": [
|
||||
"defaults"
|
||||
- ]
|
||||
+ ],
|
||||
+ "scripts": {
|
||||
|
|
Loading…
Reference in a new issue