From 7085a16a13c4ecc3f0b69169644d10134cdb42ac Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 3 Jul 2023 21:11:58 -0400
Subject: [PATCH] dysk: rename from lfs, 2.6.0 -> 2.6.1

Diff: https://github.com/Canop/dysk/compare/v2.6.0...v2.6.1

Changelog: https://github.com/Canop/dysk/blob/v2.6.1/CHANGELOG.md
---
 pkgs/tools/filesystems/{lfs => dysk}/default.nix | 15 ++++++++-------
 pkgs/top-level/aliases.nix                       |  1 +
 pkgs/top-level/all-packages.nix                  |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)
 rename pkgs/tools/filesystems/{lfs => dysk}/default.nix (50%)

diff --git a/pkgs/tools/filesystems/lfs/default.nix b/pkgs/tools/filesystems/dysk/default.nix
similarity index 50%
rename from pkgs/tools/filesystems/lfs/default.nix
rename to pkgs/tools/filesystems/dysk/default.nix
index 5ffbe07b3755..346ee7411213 100644
--- a/pkgs/tools/filesystems/lfs/default.nix
+++ b/pkgs/tools/filesystems/dysk/default.nix
@@ -1,24 +1,25 @@
 { lib
-, fetchFromGitHub
 , rustPlatform
+, fetchFromGitHub
 }:
 
 rustPlatform.buildRustPackage rec {
-  pname = "lfs";
-  version = "2.6.0";
+  pname = "dysk";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "Canop";
-    repo = pname;
+    repo = "dysk";
     rev = "v${version}";
-    sha256 = "sha256-+BkHE4vl1oYNR5SX2y7Goly7OwGDXRoZex6YL7Xv2QI=";
+    hash = "sha256-rSnj38U4Rt5Wh+3A610tTeT2Q1BVGvpMa7rpDf4YzTI=";
   };
 
-  cargoSha256 = "sha256-njrjuLHDmcubw8lLPpS9K5la0gRIKq4OrP+MXs1Ro/o=";
+  cargoHash = "sha256-or1vLbtA2tPnGJ3tYWrmaXmPCIutojBlIWMLRNpxpY4=";
 
   meta = with lib; {
     description = "Get information on your mounted disks";
-    homepage = "https://github.com/Canop/lfs";
+    homepage = "https://github.com/Canop/dysk";
+    changelog = "https://github.com/Canop/dysk/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ koral ];
   };
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8e12893e27e0..2fb6b6771d50 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -841,6 +841,7 @@ mapAliases ({
   lastfmsubmitd = throw "lastfmsubmitd was removed from nixpkgs as the project is abandoned"; # Added 2022-01-01
   latinmodern-math = lmmath;
   letsencrypt = throw "'letsencrypt' has been renamed to/replaced by 'certbot'"; # Converted to throw 2022-02-22
+  lfs = dysk; # Added 2023-07-03
   libGL_driver = throw "'libGL_driver' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-02-22
   libaudit = throw "'libaudit' has been renamed to/replaced by 'audit'"; # Converted to throw 2022-02-22
   libayatana-indicator-gtk2 = throw "'libayatana-indicator-gtk2' has been removed from nixpkgs, as gtk2 is deprecated"; # Added 2022-10-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c79afe4956b..e0f551cb3489 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1595,6 +1595,8 @@ with pkgs;
 
   dwarfs = callPackage ../tools/filesystems/dwarfs { };
 
+  dysk = callPackage ../tools/filesystems/dysk { };
+
   etlegacy = callPackage ../games/etlegacy { lua = lua5_4; };
 
   fscan = callPackage ../tools/security/fscan { };
@@ -9453,8 +9455,6 @@ with pkgs;
     ffmpeg = ffmpeg-full;
   };
 
-  lfs = callPackage ../tools/filesystems/lfs { };
-
   linuxwave = callPackage ../tools/audio/linuxwave { };
 
   littlefs-fuse = callPackage ../tools/filesystems/littlefs-fuse { };