Skip to content

Commit 062b5b6

Browse files
Merge pull request #335441 from emilylange/nixos-forgejo-pam
forgejo,forgejo-lts: remove PAM support
2 parents 9b0dea9 + aab0392 commit 062b5b6

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
325325

326326
# Forgejo
327327
nixos/modules/services/misc/forgejo.nix @adamcstephens @bendlas @emilylange
328-
pkgs/by-name/fo/forgejo/package.nix @adamcstephens @bendlas @emilylange
328+
pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @emilylange
329329

330330
# Dotnet
331331
/pkgs/build-support/dotnet @corngood

nixos/doc/manual/release-notes/rl-2411.section.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,8 @@
180180
`services.forgejo.secrets` is a small wrapper over systemd's `LoadCredential=`. It has the same structure (sections/keys) as
181181
`services.forgejo.settings` but takes file paths that will be read before service startup instead of some plaintext value.
182182

183+
- `forgejo` and `forgejo-lts` no longer support the opt-in feature [PAM (Pluggable Authentication Module)](https://forgejo.org/docs/latest/user/authentication/#pam-pluggable-authentication-module).
184+
183185
- `services.ddclient.use` has been deprecated: `ddclient` now supports separate IPv4 and IPv6 configuration. Use `services.ddclient.usev4` and `services.ddclient.usev6` instead.
184186

185187
- `teleport` has been upgraded from major version 15 to major version 16.

pkgs/by-name/fo/forgejo/generic.nix

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
, nix-update-script
1818
, nixosTests
1919
, openssh
20-
, pam
21-
, pamSupport ? true
2220
, sqliteSupport ? true
2321
, xorg
2422
, runCommand
@@ -68,8 +66,6 @@ buildGoModule rec {
6866
makeWrapper
6967
];
7068

71-
buildInputs = lib.optional pamSupport pam;
72-
7369
nativeCheckInputs = [
7470
git
7571
openssh
@@ -83,8 +79,7 @@ buildGoModule rec {
8379
substituteInPlace modules/setting/server.go --subst-var data
8480
'';
8581

86-
tags = lib.optional pamSupport "pam"
87-
++ lib.optionals sqliteSupport [ "sqlite" "sqlite_unlock_notify" ];
82+
tags = lib.optionals sqliteSupport [ "sqlite" "sqlite_unlock_notify" ];
8883

8984
ldflags = [
9085
"-s"
@@ -115,7 +110,6 @@ buildGoModule rec {
115110
skippedTests = [
116111
"Test_SSHParsePublicKey/dsa-1024/SSHKeygen" # dsa-1024 is deprecated in openssh and requires opting-in at compile time
117112
"Test_calcFingerprint/dsa-1024/SSHKeygen" # dsa-1024 is deprecated in openssh and requires opting-in at compile time
118-
"TestPamAuth" # we don't have PAM set up in the build sandbox
119113
"TestPassword" # requires network: api.pwnedpasswords.com
120114
"TestCaptcha" # requires network: hcaptcha.com
121115
"TestDNSUpdate" # requires network: release.forgejo.org

0 commit comments

Comments
 (0)