diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-11-10 15:18:19 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-11-10 15:18:19 +0100 |
commit | afabc4a15d5ba6631bd4d865b8be37fc67d52809 (patch) | |
tree | 2342d9e8bd8b4cfbfee2b9a98c088df9f1c809ca /pkgs/tools/text | |
parent | 9a0c85ffc5aedc46b4d81f3b9fc22d7f488e3ff9 (diff) | |
parent | 714e527a726c9613fca8e13586a1b19198d68d9b (diff) | |
download | nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.gz nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.bz2 nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.lz nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.xz nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.zst nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.zip |
Merge remote-tracking branch 'origin/master' into HEAD
Conflicts: pkgs/development/libraries/SDL2/default.nix
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/mdhtml/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/sd/default.nix | 21 |
2 files changed, 15 insertions, 10 deletions
diff --git a/pkgs/tools/text/mdhtml/default.nix b/pkgs/tools/text/mdhtml/default.nix index b5d12e7b3dcf..8882ca5ea192 100644 --- a/pkgs/tools/text/mdhtml/default.nix +++ b/pkgs/tools/text/mdhtml/default.nix @@ -5,14 +5,14 @@ buildGoModule rec { pname = "mdhtml"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Tomkoid"; repo = pname; rev = version; - hash = "sha256-893pqrrTftzKqPYZgukV/yx2gkukVZWDTgg7ufx1MsY="; + hash = "sha256-Pzl6Hmc24uWQ02FQM84rsypTJy1GdvYqfLDjN6Ryq4Q="; }; vendorHash = null; diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index 009150062db2..8dc160cd014d 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -1,28 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, installShellFiles +, Security }: rustPlatform.buildRustPackage rec { pname = "sd"; - version = "0.7.6"; + version = "1.0.0"; src = fetchFromGitHub { owner = "chmln"; repo = pname; rev = "v${version}"; - sha256 = "0c5bsqs6c55x4j640vhzlmbiylhp5agr7lx0jrwcjazfyvxihc01"; + hash = "sha256-hC4VKEgrAVuqOX7b24XhtrxrnJW5kmlX4E6QbY9H8OA="; }; - cargoSha256 = "1iwgy9zzdxay6hb9pz47jchy03jrsy5csxijlq4i228qhqnvq1lr"; + cargoHash = "sha256-IhCuWCaSU7c7Tot4uvxE7oabY69wDLstuBN35OzkQcU="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - preFixup = '' - installManPage $releaseDir/build/sd-*/out/sd.1 + postInstall = '' + installManPage gen/sd.1 - installShellCompletion $releaseDir/build/sd-*/out/sd.{bash,fish} - installShellCompletion --zsh $releaseDir/build/sd-*/out/_sd + installShellCompletion gen/completions/sd.{bash,fish} + installShellCompletion --zsh gen/completions/_sd ''; meta = with lib; { |