Skip to content

Commit 2336aad

Browse files
committed
Bump flake's Nix version and fix some build errors
- discuss: `yacc` got renamed to / merged into `bison` apparently - python-afs: - upstream actually has a Python 3 port, so just use that - `nose` is apparently old and deprecated; it looks like this build doesn't run the python-afs tests anyway, so no further changes are needed
1 parent ab6fde4 commit 2336aad

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkgs/discuss.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
3030
autoreconfHook
3131
libkrb5
3232
pkgs.e2fsprogs # ss_perror
33-
pkgs.yacc
33+
pkgs.bison
3434
pkgs.nettools
3535
pkg-config # needed by debathena-aclocal
3636
debathena-aclocal

pkgs/python-afs.nix

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ in buildPythonPackage {
88
version = "0.2.2";
99

1010
src = fetchFromGitHub {
11-
owner = "dehnert";
11+
owner = "macathena";
1212
repo = "python-afs";
13-
rev = "2a12421d4b94fbfecf6ea3cec459848a651f6be1"; # nix branch
14-
hash = "sha256-5tiABlKD3Vbb+fSrxVcZmqqi0ArBEwbJDhslk/r/QGs=";
13+
rev = "300a92404859ed99a8d9db066b9526c363760e21"; # py3 branch
14+
hash = "sha256-pm3UCNqUKSzlfOk4jTenrg6PH8SMRgrRQE4uABXvXD0=";
1515
};
1616

1717
build-system = [
@@ -25,7 +25,6 @@ in buildPythonPackage {
2525

2626
nativeBuildInputs = [
2727
python3.pkgs.cython
28-
python3.pkgs.nose
2928
];
3029

3130
pythonImportsCheck = [

0 commit comments

Comments
 (0)