Merge pull request #241377 from figsoda/dysk

dysk: rename from lfs, 2.6.0 -> 2.6.1
This commit is contained in:
Weijia Wang 2023-07-05 00:09:40 +03:00 committed by GitHub
commit 564e44aee9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 27 deletions

View file

@ -0,0 +1,26 @@
{ lib
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "dysk";
version = "2.6.1";
src = fetchFromGitHub {
owner = "Canop";
repo = "dysk";
rev = "v${version}";
hash = "sha256-rSnj38U4Rt5Wh+3A610tTeT2Q1BVGvpMa7rpDf4YzTI=";
};
cargoHash = "sha256-or1vLbtA2tPnGJ3tYWrmaXmPCIutojBlIWMLRNpxpY4=";
meta = with lib; {
description = "Get information on your mounted disks";
homepage = "https://github.com/Canop/dysk";
changelog = "https://github.com/Canop/dysk/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ figsoda koral ];
};
}

View file

@ -1,25 +0,0 @@
{ lib
, fetchFromGitHub
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "lfs";
version = "2.6.0";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+BkHE4vl1oYNR5SX2y7Goly7OwGDXRoZex6YL7Xv2QI=";
};
cargoSha256 = "sha256-njrjuLHDmcubw8lLPpS9K5la0gRIKq4OrP+MXs1Ro/o=";
meta = with lib; {
description = "Get information on your mounted disks";
homepage = "https://github.com/Canop/lfs";
license = licenses.mit;
maintainers = with maintainers; [ koral ];
};
}

View file

@ -843,6 +843,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

View file

@ -1599,6 +1599,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 { };
@ -9462,8 +9464,6 @@ with pkgs;
ffmpeg = ffmpeg-full;
};
lfs = callPackage ../tools/filesystems/lfs { };
linuxwave = callPackage ../tools/audio/linuxwave { };
littlefs-fuse = callPackage ../tools/filesystems/littlefs-fuse { };