From 6d4401e1b6a45455d8e7198540911152c7f40f2d Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 17 Feb 2026 09:57:47 -0600 Subject: [PATCH 1/2] openafs: migrate to by-name --- .../{servers/openafs/1.8 => by-name/op/openafs}/bosserver.patch | 0 pkgs/{servers => by-name/op}/openafs/cellservdb.nix | 0 .../openafs/1.8 => by-name/op/openafs}/cross-build.patch | 0 pkgs/{servers/openafs/1.8 => by-name/op/openafs}/module.nix | 0 .../openafs/1.8/default.nix => by-name/op/openafs/package.nix} | 2 +- pkgs/{servers/openafs/1.8 => by-name/op/openafs}/srcs.nix | 0 pkgs/{servers/openafs/1.8 => by-name/op/openafs}/tsmbac.patch | 0 pkgs/top-level/all-packages.nix | 2 -- 8 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{servers/openafs/1.8 => by-name/op/openafs}/bosserver.patch (100%) rename pkgs/{servers => by-name/op}/openafs/cellservdb.nix (100%) rename pkgs/{servers/openafs/1.8 => by-name/op/openafs}/cross-build.patch (100%) rename pkgs/{servers/openafs/1.8 => by-name/op/openafs}/module.nix (100%) rename pkgs/{servers/openafs/1.8/default.nix => by-name/op/openafs/package.nix} (98%) rename pkgs/{servers/openafs/1.8 => by-name/op/openafs}/srcs.nix (100%) rename pkgs/{servers/openafs/1.8 => by-name/op/openafs}/tsmbac.patch (100%) diff --git a/pkgs/servers/openafs/1.8/bosserver.patch b/pkgs/by-name/op/openafs/bosserver.patch similarity index 100% rename from pkgs/servers/openafs/1.8/bosserver.patch rename to pkgs/by-name/op/openafs/bosserver.patch diff --git a/pkgs/servers/openafs/cellservdb.nix b/pkgs/by-name/op/openafs/cellservdb.nix similarity index 100% rename from pkgs/servers/openafs/cellservdb.nix rename to pkgs/by-name/op/openafs/cellservdb.nix diff --git a/pkgs/servers/openafs/1.8/cross-build.patch b/pkgs/by-name/op/openafs/cross-build.patch similarity index 100% rename from pkgs/servers/openafs/1.8/cross-build.patch rename to pkgs/by-name/op/openafs/cross-build.patch diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/by-name/op/openafs/module.nix similarity index 100% rename from pkgs/servers/openafs/1.8/module.nix rename to pkgs/by-name/op/openafs/module.nix diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/by-name/op/openafs/package.nix similarity index 98% rename from pkgs/servers/openafs/1.8/default.nix rename to pkgs/by-name/op/openafs/package.nix index 76c0d2f64597..d3b1630a7773 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/by-name/op/openafs/package.nix @@ -144,7 +144,7 @@ stdenv.mkDerivation { done ''; - passthru.cellservdb = callPackage ../cellservdb.nix { }; + passthru.cellservdb = callPackage ./cellservdb.nix { }; meta = { outputsToInstall = [ diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/by-name/op/openafs/srcs.nix similarity index 100% rename from pkgs/servers/openafs/1.8/srcs.nix rename to pkgs/by-name/op/openafs/srcs.nix diff --git a/pkgs/servers/openafs/1.8/tsmbac.patch b/pkgs/by-name/op/openafs/tsmbac.patch similarity index 100% rename from pkgs/servers/openafs/1.8/tsmbac.patch rename to pkgs/by-name/op/openafs/tsmbac.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6059eb5fd80..bb3b979e0462 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8220,8 +8220,6 @@ with pkgs; nsdiff = perlPackages.nsdiff; - openafs = callPackage ../servers/openafs/1.8 { }; - openresty = callPackage ../servers/http/openresty { zlib-ng = zlib; withPerl = false; From e392ae4881324f001f8b7cb4b8cfef15d4b7591e Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 17 Feb 2026 10:59:57 -0600 Subject: [PATCH 2/2] openafs: refactor derivation --- pkgs/by-name/op/openafs/package.nix | 22 +++++++++------------- pkgs/top-level/linux-kernels.nix | 2 +- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/op/openafs/package.nix b/pkgs/by-name/op/openafs/package.nix index d3b1630a7773..287a78cbad5f 100644 --- a/pkgs/by-name/op/openafs/package.nix +++ b/pkgs/by-name/op/openafs/package.nix @@ -14,7 +14,6 @@ libkrb5, libxslt, docbook_xsl, - file, docbook_xml_dtd_43, libtool_2, withDevdoc ? false, @@ -27,10 +26,7 @@ }: with (import ./srcs.nix { inherit fetchurl; }); -let - inherit (lib) optional optionalString optionals; -in stdenv.mkDerivation { pname = "openafs"; inherit version srcs; @@ -46,18 +42,18 @@ stdenv.mkDerivation { which bison ] - ++ optionals withDevdoc [ + ++ lib.optionals withDevdoc [ doxygen dblatex ]; - buildInputs = [ libkrb5 ] ++ optional withNcurses ncurses; + buildInputs = [ libkrb5 ] ++ lib.optional withNcurses ncurses; patches = [ ./bosserver.patch ./cross-build.patch ] - ++ optional withTsm ./tsmbac.patch; + ++ lib.optional withTsm ./tsmbac.patch; outputs = [ "out" @@ -65,7 +61,7 @@ stdenv.mkDerivation { "man" "doc" ] - ++ optional withDevdoc "devdoc"; + ++ lib.optional withDevdoc "devdoc"; enableParallelBuilding = false; @@ -98,12 +94,12 @@ stdenv.mkDerivation { "--disable-kernel-module" "--disable-fuse-client" "--with-docbook-stylesheets=${docbook_xsl}/share/xml/docbook-xsl" - ${optionalString withTsm "--enable-tivoli-tsm"} - ${optionalString (!withNcurses) "--disable-gtx"} + ${lib.optionalString withTsm "--enable-tivoli-tsm"} + ${lib.optionalString (!withNcurses) "--disable-gtx"} "--disable-linux-d_splice-alias-extra-iput" ) '' - + optionalString withTsm '' + + lib.optionalString withTsm '' export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsm-client}/opt/tivoli/tsm/client/api/bin64/sample -DXBSA_TSMLIB=\\\"${tsm-client}/lib64/libApiTSM64.so\\\"" ''; @@ -114,7 +110,7 @@ stdenv.mkDerivation { make -C "''${d}" index.html done '' - + optionalString withDevdoc '' + + lib.optionalString withDevdoc '' make dox ''; @@ -129,7 +125,7 @@ stdenv.mkDerivation { rm -r $out/lib/openafs '' - + optionalString withDevdoc '' + + lib.optionalString withDevdoc '' mkdir -p $devdoc/share/devhelp/openafs/doxygen cp -r doc/{pdf,protocol} $devdoc/share/devhelp/openafs cp -r doc/doxygen/output/html $devdoc/share/devhelp/openafs/doxygen diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index dd28c3df679b..42151b2f90bf 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -493,7 +493,7 @@ in rtw89 = if lib.versionOlder kernel.version "5.16" then callPackage ../os-specific/linux/rtw89 { } else null; - openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { }; + openafs_1_8 = callPackage ../by-name/op/openafs/module.nix { }; # Current stable release; don't backport release updates! openafs = openafs_1_8;