diff options
| author | Anders Kaseorg <andersk@mit.edu> | 2021-12-13 13:14:46 -0500 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-12-14 19:07:02 +0000 |
| commit | 348ba9ec8012279479bc5f1b584cfe5504793940 (patch) | |
| tree | 94f749730d693a487535d9f66268e5862852bed1 | |
| parent | openafs: 1.8.8 → 1.8.8.1 (diff) | |
| download | nixpkgs-origin/backport-150513-to-release-21.11.tar.gz | |
openafs: run nixpkgs-fmtorigin/backport-150513-to-release-21.11
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
(cherry picked from commit 1a3b084c63132d11eece4ea7d109723429ff2a71)
| -rw-r--r-- | pkgs/servers/openafs/1.8/default.nix | 39 | ||||
| -rw-r--r-- | pkgs/servers/openafs/1.8/module.nix | 19 | ||||
| -rw-r--r-- | pkgs/servers/openafs/1.8/srcs.nix | 6 |
3 files changed, 52 insertions, 12 deletions
diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index 918a20ce5a32..e84cac380ab3 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -1,7 +1,23 @@ -{ lib, stdenv, buildPackages, fetchurl, which, autoconf, automake, flex -, bison , glibc, perl, libkrb5, libxslt, docbook_xsl, file -, docbook_xml_dtd_43, libtool_2 -, withDevdoc ? false, doxygen, dblatex # Extra developer documentation +{ lib +, stdenv +, buildPackages +, fetchurl +, which +, autoconf +, automake +, flex +, bison +, glibc +, perl +, libkrb5 +, libxslt +, docbook_xsl +, file +, docbook_xml_dtd_43 +, libtool_2 +, withDevdoc ? false +, doxygen +, dblatex # Extra developer documentation , ncurses # Extra ncurses utilities. Needed for debugging and monitoring. , tsmbac ? null # Tivoli Storage Manager Backup Client from IBM }: @@ -10,13 +26,22 @@ with (import ./srcs.nix { inherit fetchurl; }); let inherit (lib) optional optionalString optionals; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "openafs"; inherit version srcs; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl - which bison ] ++ optionals withDevdoc [ doxygen dblatex ]; + nativeBuildInputs = [ + autoconf + automake + flex + libxslt + libtool_2 + perl + which + bison + ] ++ optionals withDevdoc [ doxygen dblatex ]; buildInputs = [ libkrb5 ncurses ]; diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 4f1404b62820..f8b2d222af17 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchurl, which, autoconf, automake, flex, bison -, kernel, glibc, perl, libtool_2, libkrb5 }: +{ lib +, stdenv +, fetchurl +, which +, autoconf +, automake +, flex +, bison +, kernel +, glibc +, perl +, libtool_2 +, libkrb5 +}: with (import ./srcs.nix { inherit fetchurl; @@ -9,7 +21,8 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs"; kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/servers/openafs/1.8/srcs.nix index 75194ed61ada..b8ea522fe4fe 100644 --- a/pkgs/servers/openafs/1.8/srcs.nix +++ b/pkgs/servers/openafs/1.8/srcs.nix @@ -6,9 +6,11 @@ rec { sha256 = "sha256-58S+1wdbzWQC4/DC1bnb52rS7jxf1d3DlzozVsoj70Q="; }; - srcs = [ src + srcs = [ + src (fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; sha256 = "sha256-y17O3C4WS+o7SMayydbxw2v96R0GikxiqciF30j+jms="; - })]; + }) + ]; } |