nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-19 11:23:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

colmena: only depend on one nix version (#353776)

Browse Source
This commit is contained in:
Sandro 2024-11-06 16:55:16 +01:00 committed by GitHub
commit bbdb6c9774
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/admin/colmena/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, installShellFiles, makeBinaryWrapper, nix-eval-jobs, nixVersions { stdenv, lib, fetchpatch, rustPlatform, fetchFromGitHub, installShellFiles, makeBinaryWrapper, nix-eval-jobs, nix
, colmena, testers }: , colmena, testers }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -20,6 +20,14 @@ rustPlatform.buildRustPackage rec {
NIX_EVAL_JOBS = "${nix-eval-jobs}/bin/nix-eval-jobs"; NIX_EVAL_JOBS = "${nix-eval-jobs}/bin/nix-eval-jobs";
patches = [
# Fixes nix 2.24 compat: https://github.com/zhaofengli/colmena/pull/236
(fetchpatch {
url = "https://github.com/zhaofengli/colmena/commit/36382ee2bef95983848435065f7422500c7923a8.patch";
sha256 = "sha256-5cQ2u3eTzhzjPN+rc6xWIskHNtheVXXvlSeJ1G/lz+E=";
})
];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd colmena \ installShellCompletion --cmd colmena \
--bash <($out/bin/colmena gen-completions bash) \ --bash <($out/bin/colmena gen-completions bash) \
@ -27,7 +35,7 @@ rustPlatform.buildRustPackage rec {
--fish <($out/bin/colmena gen-completions fish) --fish <($out/bin/colmena gen-completions fish)
wrapProgram $out/bin/colmena \ wrapProgram $out/bin/colmena \
--prefix PATH ":" "${lib.makeBinPath [ nixVersions.nix_2_18 ]}" --prefix PATH ":" "${lib.makeBinPath [ nix ]}"
''; '';
# Recursive Nix is not stable yet # Recursive Nix is not stable yet