summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfigsoda <figsoda@pm.me>2022-11-25 14:40:25 -0500
committerGitHub <noreply@github.com>2022-11-25 14:40:25 -0500
commite57d19c73d5a7521b268e1c7a5fe9cca5a3559e1 (patch)
tree7396fcc693f30bd6252dfc12ad0d43cd990257d2
parentpython310Packages.imap-tools: 0.57.0 -> 1.0.0 (diff)
parentcomma: add marsam to maintainers (diff)
downloadnixpkgs-e57d19c73d5a7521b268e1c7a5fe9cca5a3559e1.tar.gz
Merge pull request #202878 from NixOS/backport-202569-to-release-22.11
[Backport release-22.11] comma: 1.3.0 -> 1.4.0
-rw-r--r--pkgs/tools/package-management/comma/default.nix18
1 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/tools/package-management/comma/default.nix b/pkgs/tools/package-management/comma/default.nix
index 35fd4ff2b989..d46db680c88f 100644
--- a/pkgs/tools/package-management/comma/default.nix
+++ b/pkgs/tools/package-management/comma/default.nix
@@ -2,31 +2,30 @@
, fetchFromGitHub
, fzy
, lib
-, makeWrapper
-, nix
-, nix-index
+, makeBinaryWrapper
+, nix-index-unwrapped
, rustPlatform
, testers
}:
rustPlatform.buildRustPackage rec {
pname = "comma";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "comma";
rev = "v${version}";
- sha256 = "sha256-rXAX14yB8v9BOG4ZsdGEedpZAnNqhQ4DtjQwzFX/TLY=";
+ hash = "sha256-EPrXIDi0yO+AVriQgi3t91CLtmYtgmyEfWtFD+wH8As=";
};
- cargoSha256 = "sha256-9PVbiWmaTDx4iob5g9tXC+FV5Jmy6Id9tQxm05fJLkM=";
+ cargoHash = "sha256-/1b3GF0flhvejZ3C/yOzRGl50sWR4IxprwRoMUYEvm8=";
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeBinaryWrapper ];
postInstall = ''
wrapProgram $out/bin/comma \
- --prefix PATH : ${lib.makeBinPath [ nix fzy nix-index ]}
+ --prefix PATH : ${lib.makeBinPath [ fzy nix-index-unwrapped ]}
ln -s $out/bin/comma $out/bin/,
'';
@@ -38,7 +37,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/nix-community/comma";
description = "Runs programs without installing them";
license = licenses.mit;
- maintainers = with maintainers; [ Enzime artturin ];
- platforms = platforms.all;
+ maintainers = with maintainers; [ Enzime artturin marsam ];
};
}