Skip to content

Commit 18ecb38

Browse files
authored
fscryptctl: 1.0.0 -> 1.2.0 (#338344)
2 parents 107b787 + 840e9ca commit 18ecb38

File tree

2 files changed

+21
-15
lines changed

2 files changed

+21
-15
lines changed
Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
1-
{ lib, stdenv, fetchFromGitHub }:
1+
{
2+
lib,
3+
stdenv,
4+
fetchFromGitHub,
5+
pandoc,
6+
}:
27

3-
stdenv.mkDerivation rec {
8+
stdenv.mkDerivation (finalAttrs: {
49
pname = "fscryptctl";
5-
version = "1.0.0";
6-
7-
goPackagePath = "github.com/google/fscrypt";
10+
version = "1.2.0";
811

912
src = fetchFromGitHub {
1013
owner = "google";
1114
repo = "fscryptctl";
12-
rev = "v${version}";
13-
sha256 = "1hwj726mm0yhlcf6523n07h0yq1rvkv4km64h3ydpjcrcxklhw6l";
15+
rev = "v${finalAttrs.version}";
16+
hash = "sha256-5suEdSpX8alDkSnSnyiIjUmZq98eK0ZPVAtDKhOs65c=";
1417
};
1518

19+
nativeBuildInputs = [ pandoc ];
20+
21+
strictDeps = true;
22+
1623
makeFlags = [ "PREFIX=${placeholder "out"}" ];
1724

18-
meta = with lib; {
25+
meta = {
1926
description = "Small C tool for Linux filesystem encryption";
2027
mainProgram = "fscryptctl";
2128
longDescription = ''
@@ -32,10 +39,10 @@ stdenv.mkDerivation rec {
3239
As fscryptctl is intended for advanced users, you should read the kernel
3340
documentation for filesystem encryption before using fscryptctl.
3441
'';
35-
inherit (src.meta) homepage;
36-
changelog = "https://github.com/google/fscryptctl/releases/tag/v${version}";
37-
license = licenses.asl20;
38-
platforms = platforms.linux;
39-
maintainers = with maintainers; [ primeos ];
42+
inherit (finalAttrs.src.meta) homepage;
43+
changelog = "https://github.com/google/fscryptctl/blob/master/NEWS.md";
44+
license = lib.licenses.asl20;
45+
platforms = lib.platforms.linux;
46+
maintainers = with lib.maintainers; [ primeos ];
4047
};
41-
}
48+
})

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26084,7 +26084,6 @@ with pkgs;
2608426084

2608526085
evdev-proto = callPackage ../os-specific/bsd/freebsd/evdev-proto { };
2608626086

26087-
fscryptctl = callPackage ../os-specific/linux/fscryptctl { };
2608826087
# unstable until the first 1.x release
2608926088
fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { };
2609026089

0 commit comments

Comments
 (0)