swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

xv: 0.1.1 -> 0.1.2, rename to xxv

Browse source 
Also update the license.
This commit is contained in:
Lily Ballard 2020-02-22 17:23:28 -08:00 committed by Jon
parent 9ed55b73dd
commit 18007d5656
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/tools/misc/xv/default.nix → pkgs/tools/misc/xxv/default.nix
View file

@ -7,20 +7,17 @@ let useNcurses = !stdenv.hostPlatform.isWindows; in
assert useNcurses -> ncurses != null; assert useNcurses -> ncurses != null;
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "xv"; pname = "xxv";
version = "0.1.1"; version = "0.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chrisvest"; owner = "chrisvest";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0x2yd21sr4wik3z22rknkx1fgb64j119ynjls919za8gd83zk81g"; sha256 = "0ppfsgdigza2jppbkg4qanjhlkpnq7p115c4471vc6vpikpfrlk3";
}; };
# Delete this on next update; see #79975 for details cargoSha256 = "1gnyig87a0yqgkng52fpn6hv629vym6k7ydljnxrhb5phmj2qbqx";
legacyCargoFetcher = true;
cargoSha256 = "0m69pcmnx3c3q7lgvbhxc8dl6lavv5ch4r6wg2bhdmapcmb4p7jq";
buildInputs = lib.optionals useNcurses [ ncurses ] buildInputs = lib.optionals useNcurses [ ncurses ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]) ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ])
@ -33,10 +30,10 @@ rustPlatform.buildRustPackage rec {
meta = with lib; { meta = with lib; {
description = "A visual hex viewer for the terminal"; description = "A visual hex viewer for the terminal";
longDescription = '' longDescription = ''
XV is a terminal hex viewer with a text user interface, written in 100% safe Rust. XXV is a terminal hex viewer with a text user interface, written in 100% safe Rust.
''; '';
homepage = https://chrisvest.github.io/xv/; homepage = "https://chrisvest.github.io/xxv/";
license = with licenses; [ asl20 ]; license = with licenses; [ gpl3 ];
maintainers = with maintainers; [ lilyball ]; maintainers = with maintainers; [ lilyball ];
platforms = platforms.all; platforms = platforms.all;
}; };

1
pkgs/top-level/aliases.nix
View file

@ -509,6 +509,7 @@ mapAliases ({
xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs."; # added 2020-01-20 xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs."; # added 2020-01-20
xlibs = xorg; # added 2015-09 xlibs = xorg; # added 2015-09
xpraGtk3 = xpra; # added 2018-09-13 xpraGtk3 = xpra; # added 2018-09-13
xv = xxv; # added 2020-02-22
youtubeDL = youtube-dl; # added 2014-10-26 youtubeDL = youtube-dl; # added 2014-10-26
zdfmediathk = mediathekview; # added 2019-01-19 zdfmediathk = mediathekview; # added 2019-01-19
gnome_user_docs = gnome-user-docs; # added 2019-11-20 gnome_user_docs = gnome-user-docs; # added 2019-11-20

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

@ -7586,7 +7586,7 @@ in
xurls = callPackage ../tools/text/xurls {}; xurls = callPackage ../tools/text/xurls {};
xv = callPackage ../tools/misc/xv {}; xxv = callPackage ../tools/misc/xxv {};
xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; };