Unverified Commit 13506e9f authored by Dmitry Kalinkin's avatar Dmitry Kalinkin Committed by GitHub
Browse files

Merge pull request #150513 from andersk/openafs 

openafs: 1.8.8 → 1.8.8.1
parents fc58c376 1a3b084c

pkgs/servers/openafs/1.8/default.nix

+32 −7
Original line number Diff line number Diff line 
{ 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 ];

pkgs/servers/openafs/1.8/module.nix

+16 −20
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, which, autoconf, automake, flex, bison

, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }:

{ 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;
@@ -18,23 +31,6 @@ in stdenv.mkDerivation { 


  buildInputs = [ libkrb5 ];



  patches = [

    # LINUX 5.14: explicitly set set_page_dirty to default

    ((fetchpatch {

      url = "https://gerrit.openafs.org/changes/14830/revisions/20b8a37950b3718b85a4a3d21b23469a5176eb6a/patch";

      sha256 = "1mkfwq0pbwvfjspsy2lxhi0f09hljgc6xyn3y97sai0dyivn05jp";

    }).overrideAttrs (o: {

      postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch;

    }))

    # Linux 5.15: Convert osi_Msg macro to a function

    ((fetchpatch {

      url = "https://gerrit.openafs.org/changes/14831/revisions/6cfa9046229d90c0625687e3fddb7877f21fbcff/patch";

      sha256 = "18rip9a1krxf47fizf3f12ddq55apzb2w3wjj5qs7n3sh2nwks7g";

    }).overrideAttrs (o: {

      postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch;

    }))

  ];



  hardeningDisable = [ "pic" ];



  configureFlags = [

pkgs/servers/openafs/1.8/srcs.nix

+7 −5
Original line number Diff line number Diff line 
{ fetchurl }:

rec {

  version = "1.8.8";

  version = "1.8.8.1";

  src = fetchurl {

    url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";

    sha256 = "sha256-2qjvhqdyf6z83jvJemrRQxKcHCXuNfM0cIDsfp0oTaA=";

    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-3cxODH1KvOTxrGB+acEudxGCX1iBPjZcTfjpfraOm+U=";

    })];

      sha256 = "sha256-y17O3C4WS+o7SMayydbxw2v96R0GikxiqciF30j+jms=";

    })

  ];

}