From fd59158ed6d35621e404a38cd75bf9dfd88e969d Mon Sep 17 00:00:00 2001 From: yukkop Date: Sat, 26 Sep 2026 21:44:19 +0000 Subject: [PATCH] feat: update nixpkgs --- flake.lock | 8 ++++---- flake.nix | 2 +- package/gitea/default.nix | 23 ++++++++++------------- package/gitea/source/pnpm-workspace.yaml | 1 + 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 159393ff..350c4dd1 100644 --- a/flake.lock +++ b/flake.lock @@ -917,16 +917,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1779796641, - "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", + "lastModified": 1790323409, + "narHash": "sha256-VVTPf+Hyd5ebpjBMHmrLMSBIeW6ls48Bqtosj7CNKLA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25f538306313eae3927264466c70d7001dcea1df", + "rev": "e94cb152ed51bd6e24eb4a41f1460252beb52cd2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 80cc4eab..e4a3ce44 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ }; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; rust-overlay = { url = "github:oxalica/rust-overlay"; inputs = { diff --git a/package/gitea/default.nix b/package/gitea/default.nix index b485dec7..11a50e79 100644 --- a/package/gitea/default.nix +++ b/package/gitea/default.nix @@ -32,14 +32,16 @@ let 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 exit 0 fi exec ${pnpm}/bin/pnpm "$@" '').overrideAttrs (_: { version = "11.9.0"; - }); + })) // { + nodejs-slim = nodejs; + }; pnpmPreInstall = '' export NODE_OPTIONS=--dns-result-order=ipv4first ''; @@ -52,9 +54,9 @@ let pname = "gitea-frontend"; inherit version src; pnpm = pnpmForNix; - fetcherVersion = 3; + fetcherVersion = 4; prePnpmInstall = pnpmPreInstall; - hash = "sha256-rXJmmnaA61YoN7xrmA18MBLFpRRMhWd4gwXGVd5eKpU="; + hash = "sha256-rduD3GqgdUlF95HTnKe8smToyHop4RrO6QDTRzh2RCk="; }; prePnpmInstall = pnpmPreInstall; @@ -88,21 +90,16 @@ buildGo126Module rec { patches = [ ./static-root-path.patch ]; - overrideModAttrs = _: { - postPatch = '' - substituteInPlace go.mod \ - --replace-fail "go 1.26.4" "go 1.26" - ''; - }; - postPatch = '' substituteInPlace modules/setting/server.go --subst-var data - substituteInPlace go.mod \ - --replace-fail "go 1.26.4" "go 1.26" ''; subPackages = [ "." ]; + postBuild = '' + mv "$GOPATH/bin/gitea.dev" "$GOPATH/bin/gitea" + ''; + nativeBuildInputs = [ makeWrapper ]; tags = lib.optionals sqliteSupport [ diff --git a/package/gitea/source/pnpm-workspace.yaml b/package/gitea/source/pnpm-workspace.yaml index 8f1c4938..3123d159 100644 --- a/package/gitea/source/pnpm-workspace.yaml +++ b/package/gitea/source/pnpm-workspace.yaml @@ -2,6 +2,7 @@ savePrefix: '' dedupePeerDependents: false updateNotifier: false minimumReleaseAge: 0 +trustLockfile: true allowBuilds: '@scarf/scarf': false