feat: update nixpkgs
runner nix smoke / nix label and flake smoke (push) Failing after 40s

This commit is contained in:
2026-09-26 21:44:19 +00:00
parent d9b2a4e787
commit fd59158ed6
4 changed files with 16 additions and 18 deletions
Generated
+4 -4
View File
@@ -917,16 +917,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1779796641, "lastModified": 1790323409,
"narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", "narHash": "sha256-VVTPf+Hyd5ebpjBMHmrLMSBIeW6ls48Bqtosj7CNKLA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "25f538306313eae3927264466c70d7001dcea1df", "rev": "e94cb152ed51bd6e24eb4a41f1460252beb52cd2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
+1 -1
View File
@@ -12,7 +12,7 @@
}; };
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
rust-overlay = { rust-overlay = {
url = "github:oxalica/rust-overlay"; url = "github:oxalica/rust-overlay";
inputs = { inputs = {
+10 -13
View File
@@ -32,14 +32,16 @@ let
chmod +x bin/pnpm.cjs bin/pnpx.cjs chmod +x bin/pnpm.cjs bin/pnpx.cjs
''; '';
}); });
pnpmForNix = (writeShellScriptBin "pnpm" '' pnpmForNix = ((writeShellScriptBin "pnpm" ''
if [ "''${1-}" = config ] && [ "''${2-}" = set ] && [ "''${3-}" = manage-package-manager-versions ]; then if [ "''${1-}" = config ] && [ "''${2-}" = set ] && [ "''${3-}" = manage-package-manager-versions ]; then
exit 0 exit 0
fi fi
exec ${pnpm}/bin/pnpm "$@" exec ${pnpm}/bin/pnpm "$@"
'').overrideAttrs (_: { '').overrideAttrs (_: {
version = "11.9.0"; version = "11.9.0";
}); })) // {
nodejs-slim = nodejs;
};
pnpmPreInstall = '' pnpmPreInstall = ''
export NODE_OPTIONS=--dns-result-order=ipv4first export NODE_OPTIONS=--dns-result-order=ipv4first
''; '';
@@ -52,9 +54,9 @@ let
pname = "gitea-frontend"; pname = "gitea-frontend";
inherit version src; inherit version src;
pnpm = pnpmForNix; pnpm = pnpmForNix;
fetcherVersion = 3; fetcherVersion = 4;
prePnpmInstall = pnpmPreInstall; prePnpmInstall = pnpmPreInstall;
hash = "sha256-rXJmmnaA61YoN7xrmA18MBLFpRRMhWd4gwXGVd5eKpU="; hash = "sha256-rduD3GqgdUlF95HTnKe8smToyHop4RrO6QDTRzh2RCk=";
}; };
prePnpmInstall = pnpmPreInstall; prePnpmInstall = pnpmPreInstall;
@@ -88,21 +90,16 @@ buildGo126Module rec {
patches = [ ./static-root-path.patch ]; patches = [ ./static-root-path.patch ];
overrideModAttrs = _: {
postPatch = ''
substituteInPlace go.mod \
--replace-fail "go 1.26.4" "go 1.26"
'';
};
postPatch = '' postPatch = ''
substituteInPlace modules/setting/server.go --subst-var data substituteInPlace modules/setting/server.go --subst-var data
substituteInPlace go.mod \
--replace-fail "go 1.26.4" "go 1.26"
''; '';
subPackages = [ "." ]; subPackages = [ "." ];
postBuild = ''
mv "$GOPATH/bin/gitea.dev" "$GOPATH/bin/gitea"
'';
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
tags = lib.optionals sqliteSupport [ tags = lib.optionals sqliteSupport [
+1
View File
@@ -2,6 +2,7 @@ savePrefix: ''
dedupePeerDependents: false dedupePeerDependents: false
updateNotifier: false updateNotifier: false
minimumReleaseAge: 0 minimumReleaseAge: 0
trustLockfile: true
allowBuilds: allowBuilds:
'@scarf/scarf': false '@scarf/scarf': false