From 337bd8c31c26c152b1cb88b10cf4b600ef158a99 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Fri, 30 Aug 2024 09:18:44 +0200
Subject: [PATCH 1/3] fscryptctl: 1.0.0 -> 1.2.0

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 pkgs/os-specific/linux/fscryptctl/default.nix | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/fscryptctl/default.nix b/pkgs/os-specific/linux/fscryptctl/default.nix
index 4b38913b7122..053be640d45b 100644
--- a/pkgs/os-specific/linux/fscryptctl/default.nix
+++ b/pkgs/os-specific/linux/fscryptctl/default.nix
@@ -1,21 +1,28 @@
-{ lib, stdenv, fetchFromGitHub }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pandoc,
+}:
 
 stdenv.mkDerivation rec {
   pname = "fscryptctl";
-  version = "1.0.0";
-
-  goPackagePath = "github.com/google/fscrypt";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "fscryptctl";
     rev = "v${version}";
-    sha256 = "1hwj726mm0yhlcf6523n07h0yq1rvkv4km64h3ydpjcrcxklhw6l";
+    hash = "sha256-5suEdSpX8alDkSnSnyiIjUmZq98eK0ZPVAtDKhOs65c=";
   };
 
+  nativeBuildInputs = [ pandoc ];
+
+  strictDeps = true;
+
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
-  meta = with lib; {
+  meta = {
     description = "Small C tool for Linux filesystem encryption";
     mainProgram = "fscryptctl";
     longDescription = ''
@@ -33,9 +40,9 @@ stdenv.mkDerivation rec {
       documentation for filesystem encryption before using fscryptctl.
     '';
     inherit (src.meta) homepage;
-    changelog = "https://github.com/google/fscryptctl/releases/tag/v${version}";
-    license = licenses.asl20;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ primeos ];
+    changelog = "https://github.com/google/fscryptctl/blob/master/NEWS.md";
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ primeos ];
   };
 }

From 4e49df05ed42a11de3fb0313d466ebb32cea09cf Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Fri, 30 Aug 2024 09:19:47 +0200
Subject: [PATCH 2/3] fscryptctl: move to by-name

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 .../fscryptctl/default.nix => by-name/fs/fscryptctl/package.nix} | 0
 pkgs/top-level/all-packages.nix                                  | 1 -
 2 files changed, 1 deletion(-)
 rename pkgs/{os-specific/linux/fscryptctl/default.nix => by-name/fs/fscryptctl/package.nix} (100%)

diff --git a/pkgs/os-specific/linux/fscryptctl/default.nix b/pkgs/by-name/fs/fscryptctl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/fscryptctl/default.nix
rename to pkgs/by-name/fs/fscryptctl/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4be7ec3ca2cd..9fa187fa9b29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26203,7 +26203,6 @@ with pkgs;
 
   evdev-proto = callPackage ../os-specific/bsd/freebsd/evdev-proto { };
 
-  fscryptctl = callPackage ../os-specific/linux/fscryptctl { };
   # unstable until the first 1.x release
   fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { };
 

From 840e9ca127fe6f6ef70a30d98772ea9603049175 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Mon, 16 Sep 2024 13:03:44 +0200
Subject: [PATCH 3/3] fscryptctl: replace rec with finalAttrs

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 pkgs/by-name/fs/fscryptctl/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fs/fscryptctl/package.nix b/pkgs/by-name/fs/fscryptctl/package.nix
index 053be640d45b..b4ff999b3702 100644
--- a/pkgs/by-name/fs/fscryptctl/package.nix
+++ b/pkgs/by-name/fs/fscryptctl/package.nix
@@ -5,14 +5,14 @@
   pandoc,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "fscryptctl";
   version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "fscryptctl";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-5suEdSpX8alDkSnSnyiIjUmZq98eK0ZPVAtDKhOs65c=";
   };
 
@@ -39,10 +39,10 @@ stdenv.mkDerivation rec {
       As fscryptctl is intended for advanced users, you should read the kernel
       documentation for filesystem encryption before using fscryptctl.
     '';
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     changelog = "https://github.com/google/fscryptctl/blob/master/NEWS.md";
     license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ primeos ];
   };
-}
+})