mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 19:21:04 +00:00
Code Issues Wiki Activity

Merge pull request #335862 from LudovicoPiero/lsd/bump

Browse source 
lsd: 1.1.2 -> 1.1.3
This commit is contained in:
Sandro 2024-08-24 00:12:47 +02:00 committed by GitHub
parent f0dd9fe872 77e7f01746
commit baa811b797
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 24 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
pkgs/tools/misc/lsd/default.nix → pkgs/by-name/ls/lsd/package.nix
View file

@ -1,38 +1,33 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, rustPlatform
, installShellFiles
, darwin
, pandoc
, testers
, lsd
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
installShellFiles,
darwin,
pandoc,
testers,
lsd,
}:
rustPlatform.buildRustPackage rec {
pname = "lsd";
version = "1.1.2";
version = "1.1.3";
src = fetchFromGitHub {
owner = "lsd-rs";
repo = "lsd";
rev = "v${version}";
hash = "sha256-ZMaI0Q/xmYJHWvU4Tha+XVV55zKLukrqkROfBzu/JsQ=";
hash = "sha256-4vf68Rga2Z+PYIdfzzmDtfjCQVbr8RWiVG29c/UDVsQ=";
};
cargoPatches = [
# fix cargo lock file
(fetchpatch {
url = "https://github.com/lsd-rs/lsd/pull/1021/commits/7593fd7ea0985e273c82b6e80e66a801772024de.patch";
hash = "sha256-ykKLVSM6FbL4Jt5Zk7LuPKcYw/wrpiwU8vhuGz8Pbi0=";
})
cargoHash = "sha256-R+mOpZQLY6VFfxhCSk2MZmoCRGT49knBH9k4C6Z6KuQ=";
nativeBuildInputs = [
installShellFiles
pandoc
];
cargoHash = "sha256-TDHHY5F4lVrKd7r0QfrfUV2xzT6HMA/PtOIStMryaBA=";
nativeBuildInputs = [ installShellFiles pandoc ];
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
postInstall = ''
@ -48,15 +43,16 @@ rustPlatform.buildRustPackage rec {
# Found argument '--test-threads' which wasn't expected, or isn't valid in this context
doCheck = false;
passthru.tests.version = testers.testVersion {
package = lsd;
};
passthru.tests.version = testers.testVersion { package = lsd; };
meta = with lib; {
meta = {
homepage = "https://github.com/lsd-rs/lsd";
description = "Next gen ls command";
license = licenses.asl20;
maintainers = with maintainers; [ zowoq SuperSandro2000 ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
zowoq
SuperSandro2000
];
mainProgram = "lsd";
};
}

2
pkgs/top-level/all-packages.nix
View file

@ -9476,8 +9476,6 @@ with pkgs;
lpcnetfreedv = callPackage ../development/libraries/lpcnetfreedv { };
lsd = callPackage ../tools/misc/lsd { };
lsdvd = callPackage ../tools/cd-dvd/lsdvd { };
lsyncd = callPackage ../applications/networking/sync/lsyncd {