Skip to content

Commit 584bd3f

Browse files
committed
Fix krb5 dependency
Previously I depended on `krb5` for the Kerberos dependency, which seemed to work (and still builds on Nixos 24.05). However, on nixos-unstable, recent changes (perhaps commit 311277204d0) broke the build. It looks like libkrb5 is the more common dependency to use (though judging from that commit message, perhaps not the preferred dependency long-term) and works with all three nixpkg dependencies, so switch to it.
1 parent cdc25a6 commit 584bd3f

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- main
7+
- ci
78
schedule:
89
# rebuild everyday at 2:51
910
# TIP: Choose a random time here so not all repositories are build at once:

pkgs/discuss.nix

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
{ stdenv, pkgs, lib, fetchFromGitHub, autoreconfHook, debathena-aclocal, pkg-config, }:
1+
{ stdenv, pkgs, lib,
2+
fetchFromGitHub, autoreconfHook, debathena-aclocal, pkg-config,
3+
libkrb5
4+
}:
25

36
let
47
fs = lib.fileset;
@@ -25,7 +28,7 @@ in stdenv.mkDerivation {
2528

2629
buildInputs = [
2730
autoreconfHook
28-
pkgs.krb5
31+
libkrb5
2932
pkgs.e2fsprogs # ss_perror
3033
pkgs.yacc
3134
pkgs.nettools

pkgs/python-afs.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ stdenv, pkgs, lib, fetchFromGitHub, buildPythonPackage, setuptools, python3,
2-
openafs, krb5, }:
2+
openafs, libkrb5, }:
33

44
let
55
fs = lib.fileset;
@@ -20,7 +20,7 @@ in buildPythonPackage {
2020

2121
buildInputs = [
2222
openafs
23-
krb5
23+
libkrb5
2424
];
2525

2626
nativeBuildInputs = [

pkgs/remctl.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{ stdenv, pkgs, lib, fetchFromGitHub,
22
autoreconfHook, autoconf, automake, pkg-config,
3-
krb5, libevent, pcre2, systemdLibs,
3+
libkrb5, libevent, pcre2, systemdLibs,
44
python3, perl,
55
}:
66

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
autoconf
2020
automake
2121
pkg-config
22-
krb5
22+
libkrb5
2323
libevent
2424
pcre2
2525
systemdLibs

0 commit comments

Comments
 (0)