Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a808fe4fcdeb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b5d622a7cdf2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 21, 2020

  1. openafs_1_8: include 5.6 fixes 

    (cherry picked from commit 0279083)
    @Mic92
    Mic92 committed May 21, 2020
    Copy the full SHA
    ae901c4 View commit details

Commits on May 23, 2020

  1. Merge pull request #88553 from Mic92/openafs-backport

    @Mic92
    Mic92 authored May 23, 2020
    Copy the full SHA
    b5d622a View commit details
Showing with 19 additions and 1 deletion.
  1. +19 −1 pkgs/servers/openafs/1.8/module.nix
20 changes: 19 additions & 1 deletion pkgs/servers/openafs/1.8/module.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{ stdenv, fetchurl, which, autoconf, automake, flex, yacc
, kernel, glibc, perl, libtool_2, kerberos, fetchpatch }:

with (import ./srcs.nix { inherit fetchurl; });
with (import ./srcs.nix {
inherit fetchurl;
});

let
modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs";
@@ -16,6 +18,22 @@ in stdenv.mkDerivation {

buildInputs = [ kerberos ];

patches = [
# openafs 5.6 patches, included in the next release
(fetchpatch {
url = "https://github.com/openafs/openafs/commit/34f1689b7288688550119638ee9959e453fde414.patch";
sha256 = "0rxjqzr8c5ajlk8wrhgjc1qp1934qiriqdi0qxsnk4gj5ibbk4d5";
})
(fetchpatch {
url = "https://github.com/openafs/openafs/commit/355ea43f0d1b7feae1b3af58bc33af12838db7c3.patch";
sha256 = "1f9xn8ql6vnxglpj3dvi30sj8vkncazjab2rc13hbw48nvsvcnhm";
})
(fetchpatch {
url = "https://github.com/openafs/openafs/commit/17d38e31e6f2e237a7fb4dfb46841060296310b6.patch";
sha256 = "14dydxfm0f5fvnj0kmvgm3bgh0ajhh04i3l7l0hr9cpmwl7vrlcg";
})
];

hardeningDisable = [ "pic" ];

configureFlags = [