diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/awscli/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/timg/default.nix | 33 | ||||
-rw-r--r-- | pkgs/tools/misc/zoxide/default.nix | 24 | ||||
-rw-r--r-- | pkgs/tools/networking/boundary/default.nix | 8 |
4 files changed, 39 insertions, 30 deletions
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 7eb5dc6a8a7c..c5b426e463b7 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -21,11 +21,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.49"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.19.52"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-SiE3t26giRwNMJHGpeSzEO0nFjXS+bms4pRydOGWQyI="; + sha256 = "sha256-keKyuNeDC/90pn89KjoDTO8AGsmI8nqfDNSeGyM6iHQ="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/pkgs/tools/graphics/timg/default.nix b/pkgs/tools/graphics/timg/default.nix new file mode 100644 index 000000000000..5acbaa7ffd20 --- /dev/null +++ b/pkgs/tools/graphics/timg/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, graphicsmagick, libjpeg +, ffmpeg, zlib, libexif }: + +stdenv.mkDerivation rec { + pname = "timg"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "hzeller"; + repo = "timg"; + rev = "v${version}"; + sha256 = "10qhjfkbazncmj07y0a6cpmi7ki0l10qzpvi2zh8369yycqqxr8y"; + }; + + buildInputs = [ graphicsmagick ffmpeg libexif libjpeg zlib ]; + + nativeBuildInputs = [ cmake pkg-config ]; + + cmakeFlags = [ + "-DTIMG_VERSION_FROM_GIT=Off" + "-DWITH_VIDEO_DECODING=On" + "-DWITH_VIDEO_DEVICE=On" + "-DWITH_OPENSLIDE_SUPPORT=Off" # https://openslide.org/ lib not yet in nix + ]; + + meta = with lib; { + homepage = "https://timg.sh/"; + description = "A terminal image and video viewer"; + license = licenses.gpl2Only; + platforms = platforms.unix; + maintainers = with maintainers; [ hzeller ]; + }; +} diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index 5cad350f4982..a454a73384b5 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -5,13 +5,6 @@ , withFzf ? true , fzf , libiconv - # checkInputs -, fish -, powershell -, shellcheck -, shfmt -, xonsh -, zsh }: rustPlatform.buildRustPackage rec { @@ -27,23 +20,6 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - # tests are broken on darwin - doCheck = !stdenv.isDarwin; - - # fish needs a writable HOME for whatever reason - preCheck = '' - export HOME=$(mktemp -d) - ''; - - checkInputs = [ - fish - powershell - shellcheck - shfmt - xonsh - zsh - ]; - postPatch = lib.optionalString withFzf '' substituteInPlace src/fzf.rs \ --replace '"fzf"' '"${fzf}/bin/fzf"' diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index 50b3fa07782d..1eb445cfd3e0 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.1.8"; + version = "0.2.0"; src = let @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { }; in fetchsrc version { - x86_64-linux = "sha256-CZueZqN1XoSmqOsocGwUoIZ5878uSHFYW2KDURWRHhM="; - aarch64-linux = "sha256-/pl9MzR4GFjiefc7Sde+jTGi/QaY3U/An8J5+KQR/68="; - x86_64-darwin = "sha256-kkqROFXvEpxRySByGtmGtFJPBr5Dw3BOPQ+bArqLxAA="; + x86_64-linux = "sha256-4h1Lx+Et1AfX75Cn0YUhV4MkEtzP6ICqAHVKex3PBpg="; + aarch64-linux = "sha256-i7gzv8GdDgikPT1tMia4xltEYiIZ/VNRbAiGF2o8oKA="; + x86_64-darwin = "sha256-tleIY1loPE61n59Qc9CJeropRUvTBbcIA8xmB1SaMt8="; }; dontConfigure = true; |