From ac758caff10e98790d5f9df298d0172099268077 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 12 Feb 2020 19:49:26 +0100 Subject: [PATCH] fscrypt-experimental: 0.2.5 -> 0.2.6 (#79853) Changelog: https://github.com/google/fscrypt/releases/tag/v0.2.6 --- pkgs/os-specific/linux/fscrypt/default.nix | 32 ++++++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index 92594ea99de4..bb04efaf1ca2 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -1,22 +1,42 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pam }: +{ stdenv, buildGoModule, fetchFromGitHub, gnum4, pam, fscrypt-experimental }: # Don't use this for anything important yet! -buildGoPackage rec { +buildGoModule rec { pname = "fscrypt"; - version = "0.2.5"; - - goPackagePath = "github.com/google/fscrypt"; + version = "0.2.6"; src = fetchFromGitHub { owner = "google"; repo = "fscrypt"; rev = "v${version}"; - sha256 = "1jf6363kc9id3ar93znlcglx3llgv01ccp3nlbamm98rm9dps4qk"; + sha256 = "15pwhz4267kwhkv532k6wgjqfzawawdrrk6vnl017ys5s9ln51a8"; }; + postPatch = '' + substituteInPlace Makefile \ + --replace 'TAG_VERSION := $(shell git describe --tags)' "" \ + --replace '$(shell date)' '$(shell date --date="@0")' \ + --replace "/usr/local" "$out" + ''; + + modSha256 = "110b647q6ljsg5gwlciqv4cddxmk332nahcrpidrpsiqs2yjv1md"; + + nativeBuildInputs = [ gnum4 ]; buildInputs = [ pam ]; + buildPhase = '' + make + ''; + + installPhase = '' + make install + ''; + + preFixup = '' + remove-references-to -t ${fscrypt-experimental.go} $out/lib/security/pam_fscrypt.so + ''; + meta = with stdenv.lib; { description = "A high-level tool for the management of Linux filesystem encryption";