diff options
Diffstat (limited to 'pkgs/tools')
61 files changed, 454 insertions, 213 deletions
diff --git a/pkgs/tools/X11/xkeysnail/default.nix b/pkgs/tools/X11/xkeysnail/default.nix index fa52a714c7a7..2d66405904f6 100644 --- a/pkgs/tools/X11/xkeysnail/default.nix +++ b/pkgs/tools/X11/xkeysnail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, python3Packages }: +{ lib, fetchFromGitHub, makeWrapper, python3Packages }: python3Packages.buildPythonApplication rec { pname = "xkeysnail"; diff --git a/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix b/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix new file mode 100644 index 000000000000..84372423d611 --- /dev/null +++ b/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "aws-lambda-runtime-interface-emulator"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-lambda-runtime-interface-emulator"; + rev = "v${version}"; + sha256 = "sha256-vbVygZzLlJlxaRF/LIqSJP0gZGyu1wSSdeVjILl/OJE="; + }; + + vendorSha256 = "sha256-WcvYPGgkrK7Zs5IplAoUTay5ys9LrDJHpRN3ywEdWRM="; + + # disabled because I lack the skill + doCheck = false; + + meta = with lib; { + description = "To locally test their Lambda function packaged as a container image."; + homepage = "https://github.com/aws/aws-lambda-runtime-interface-emulator"; + license = licenses.asl20; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index e9d2bb713dde..445d32be1225 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.33"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.19.34"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-Rz0aZTsFV3RAdH04d3jvvqi1wFuIIx3SFddONhM8c8E="; + sha256 = "sha256-RJ+ibZmOxH4r+pGI/rrkRES89u0IRUU3sSE5OFSJ2qw="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/pkgs/tools/admin/chkcrontab/default.nix b/pkgs/tools/admin/chkcrontab/default.nix index bbf8d7eaeb1c..d91894f00063 100644 --- a/pkgs/tools/admin/chkcrontab/default.nix +++ b/pkgs/tools/admin/chkcrontab/default.nix @@ -1,6 +1,6 @@ -{ python, lib }: +{ python3, lib }: -with python.pkgs; +with python3.pkgs; buildPythonApplication rec { pname = "chkcrontab"; diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index 1ab4795dd623..93b5433fcc0a 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clair"; - version = "4.0.3"; + version = "4.0.4"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ztp3t55EOUQqTAEUZtHvHK8nTTVOAmYR9vN2hXLhpVw="; + sha256 = "sha256-KY9POvwmyUVx9jcn02Ltcz2a1ULqyKW73A9Peb6rpYE="; }; - vendorSha256 = "sha256-+0jp/TvUjpeJJxEs2drVkUb/ua9qqqxome4M9TkpfP4="; + vendorSha256 = "sha256-+p3ucnvgOpSLS/uP9RAkWixCkaDoF64qCww013jPqSs="; doCheck = false; diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix new file mode 100644 index 000000000000..2c04eef21607 --- /dev/null +++ b/pkgs/tools/admin/fioctl/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "fioctl"; + version = "0.14.1"; + + src = fetchFromGitHub { + owner = "foundriesio"; + repo = "fioctl"; + rev = "v${version}"; + sha256 = "1jbj2w2s78wcnrwyr80jyc11ipjysv5aab3486kphx8ysvvgcwfs"; + }; + + vendorSha256 = "1a3x6cv18f0n01f4ac1kprzmby8dphygnwsdl98pmzs3gqqnh284"; + + runVend = true; + + buildFlagsArray = '' + -ldflags=-s -w -X github.com/foundriesio/fioctl/subcommands/version.Commit=${src.rev} + ''; + + meta = with lib; { + description = "A simple CLI to manage your Foundries Factory "; + homepage = "https://github.com/foundriesio/fioctl"; + license = licenses.asl20; + maintainers = with maintainers; [ nixinator matthewcroughan ]; + }; +} diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 022496cbd58a..1f86affa8c3b 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "procs"; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { done ''; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; meta = with lib; { description = "A modern replacement for ps written in Rust"; diff --git a/pkgs/tools/archivers/rpm2targz/default.nix b/pkgs/tools/archivers/rpm2targz/default.nix index ac5b132d7ab4..1c4730c8de64 100644 --- a/pkgs/tools/archivers/rpm2targz/default.nix +++ b/pkgs/tools/archivers/rpm2targz/default.nix @@ -10,18 +10,7 @@ , zstd }: -let - shdeps = [ - bzip2 - coreutils - cpio - gnutar - gzip - xz - zstd - ]; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "rpm2targz"; version = "2021.03.16"; @@ -31,9 +20,17 @@ in stdenv.mkDerivation rec { hash = "sha256-rcV+o9V2wWKznqSW2rA8xgnpQ02kpK4te6mYvLRC5vQ="; }; - buildInputs = shdeps; - - postPatch = '' + postPatch = let + shdeps = [ + bzip2 + coreutils + cpio + gnutar + gzip + xz + zstd + ]; + in '' substituteInPlace rpm2targz --replace "=\"rpmoffset\"" "=\"$out/bin/rpmoffset\"" # rpm2targz relies on the executable name # to guess what compressor it should use @@ -41,9 +38,7 @@ in stdenv.mkDerivation rec { sed -i -e '2iexport PATH="${lib.makeBinPath shdeps}"' rpm2targz ''; - preBuild = '' - makeFlagsArray+=(prefix=$out) - ''; + installFlags = [ "prefix=$(out)" ]; meta = with lib; { description = "Convert a .rpm file to a .tar.gz archive"; diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index a3eedf3ea47e..ef47578ac578 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -73,7 +73,7 @@ let }; pluginsWithoutDeps = [ - "bench" "bpd" "bpm" "bucket" "cue" "duplicates" "edit" "embedart" + "bareasc" "bench" "bpd" "bpm" "bucket" "duplicates" "edit" "embedart" "export" "filefilter" "fish" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "hook" "ihate" "importadded" "importfeeds" "info" "inline" "ipfs" "mbcollection" "mbsubmit" "mbsync" "metasync" "missing" "parentwork" "permissions" "play" @@ -105,13 +105,13 @@ in pythonPackages.buildPythonApplication rec { # unstable does not require bs1770gain[2]. # [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639 # [2]: https://github.com/NixOS/nixpkgs/pull/90504 - version = "unstable-2021-03-08"; + version = "unstable-2021-03-24"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "debd382837ef1d30574c2234710d536bb299f979"; - sha256 = "sha256-I6ejW3f72fdzWoz7g4n8pDYz2NiHGrorLegUQhQOSiI="; + rev = "854b4ab48324afe8884fcd11fa47bd6258d2f4f7"; + sha256 = "sha256-y5EWVNF4bd9fNvU6VkucMpenyFZuqdPkrqQDgG9ZPJY="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 4b8908448f68..f07b19830de3 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,20 +1,21 @@ -{ lib, stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh }: +{ lib, stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh, nixosTests }: python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.15"; + version = "1.1.16"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1g62sdzcw3zx4ccky125ciwnzx6z9kwyvskvp7ijmqxqk3nrxjs9"; + sha256 = "0l1dqfwrd9l34rg30cmzmq5bs6yha6kg4vy313jq611jsqj94mmw"; }; nativeBuildInputs = with python3.pkgs; [ + setuptools-scm # For building documentation: sphinx guzzle_sphinx_theme ]; buildInputs = [ - libb2 lz4 zstd openssl python3.pkgs.setuptools_scm + libb2 lz4 zstd openssl ] ++ lib.optionals stdenv.isLinux [ acl ]; propagatedBuildInputs = with python3.pkgs; [ cython llfuse @@ -24,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { export BORG_OPENSSL_PREFIX="${openssl.dev}" export BORG_LZ4_PREFIX="${lz4.dev}" export BORG_LIBB2_PREFIX="${libb2}" - export BORG_LIBZSTD_PREFIX="${zstd}" + export BORG_LIBZSTD_PREFIX="${zstd.dev}" ''; makeWrapperArgs = [ @@ -61,6 +62,10 @@ python3.pkgs.buildPythonApplication rec { # 64 failures, needs pytest-benchmark doCheck = false; + passthru.tests = { + inherit (nixosTests) borgbackup; + }; + meta = with lib; { description = "Deduplicating archiver with compression and encryption"; homepage = "https://www.borgbackup.org"; diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 91d59a4de0f8..6c4f2f6e854e 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pythonPackages +{ lib, fetchurl, python2Packages , gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, p7zip, cabextract, unrar, unshield , bzip2, xz, lzip # unzip is handled by p7zip @@ -11,7 +11,7 @@ let ++ lib.optional (unrarSupport) unrar ++ [ bzip2 xz lzip ]); -in pythonPackages.buildPythonApplication rec { +in python2Packages.buildPythonApplication rec { pname = "dtrx"; version = "7.1"; @@ -24,6 +24,17 @@ in pythonPackages.buildPythonApplication rec { wrapProgram "$out/bin/dtrx" --prefix PATH : "${archivers}" ''; + checkPhase = '' + python2 tests/compare.py + ''; + + checkInputs = with python2Packages; [ + pyyaml + ]; + + # custom test suite fails + doCheck = false; + meta = with lib; { description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives"; homepage = "https://brettcsmith.org/2007/dtrx/"; diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index a6d2382a1a66..12052100db32 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fuse, pkg-config, macfuse-stubs }: +{ lib, stdenv, fetchurl, fuse, pkg-config }: stdenv.mkDerivation rec { version = "1.15.1"; @@ -10,9 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = if stdenv.isDarwin - then [ macfuse-stubs ] - else [ fuse ]; + buildInputs = [ fuse ]; postFixup = '' ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs ''; diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 3777c4e7cb16..eec257c44b73 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, cmake, pkg-config, python, gtest +, cmake, pkg-config, python3, gtest , boost, cryptopp, curl, fuse, openssl }: @@ -44,9 +44,11 @@ stdenv.mkDerivation rec { --replace "(4.5L*1024*1024*1024)" "(0.5L*1024*1024*1024)" ''; - nativeBuildInputs = [ cmake gtest pkg-config python ]; + nativeBuildInputs = [ cmake pkg-config python3 ]; - buildInputs = [ boost cryptopp curl fuse openssl ]; + strictDeps = true; + + buildInputs = [ boost cryptopp curl fuse openssl gtest ]; cmakeFlags = [ "-DCRYFS_UPDATE_CHECKS:BOOL=FALSE" diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 5522b63922a4..3631e52d87d1 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lus+1hkc4GxrTxtdfDJ0XqJp37dcjKp4/sI3CEh8cYA="; + sha256 = "sha256-/gdmrQhYsE4a/1sxtJ5IfVUWjh08wTVrOr4V7Fkn1i0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 63a6153e8ca6..95b5b6ab34aa 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse, macfuse-stubs }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse }: stdenv.mkDerivation rec { pname = "s3fs-fuse"; @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Agb0tq7B98Ioe0G/XEZCYcFQKnMuYXX9x0yg4Gvu3/k="; }; - buildInputs = [ curl openssl libxml2 ] - ++ lib.optionals stdenv.isLinux [ fuse ] - ++ lib.optionals stdenv.isDarwin [ macfuse-stubs ]; + buildInputs = [ curl openssl libxml2 fuse ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; |