diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/bluetooth/bluetuith/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/graphics/vulkan-caps-viewer/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/engage/default.nix | 46 | ||||
-rw-r--r-- | pkgs/tools/misc/eza/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/rosenpass/default.nix | 85 | ||||
-rw-r--r-- | pkgs/tools/security/dumpasn1/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/security/gpg-tui/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/security/openpgp-card-tools/default.nix | 15 | ||||
-rw-r--r-- | pkgs/tools/security/quark-engine/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/crowdin-cli/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/dt/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/text/nawk/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/video/recyclarr/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/video/svt-av1/default.nix | 4 |
14 files changed, 126 insertions, 76 deletions
diff --git a/pkgs/tools/bluetooth/bluetuith/default.nix b/pkgs/tools/bluetooth/bluetuith/default.nix index 8aeab2de7a96a..4018d06b74320 100644 --- a/pkgs/tools/bluetooth/bluetuith/default.nix +++ b/pkgs/tools/bluetooth/bluetuith/default.nix @@ -20,6 +20,7 @@ buildGoModule rec { homepage = "https://github.com/darkhz/bluetuith"; license = licenses.mit; platforms = platforms.linux; + mainProgram = "bluetuith"; maintainers = with maintainers; [ thehedgeh0g ]; }; } diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix index 047ab022aae46..b2a9781f23ec6 100644 --- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix +++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "vulkan-caps-viewer"; - version = "3.31"; + version = "3.32"; src = fetchFromGitHub { owner = "SaschaWillems"; repo = "VulkanCapsViewer"; rev = version; - hash = "sha256-+cJtJPpEFHyy+CbPm0IB2nDa7FM1JY8NOsqGB/WIY2A="; + hash = "sha256-SPz8AurANjNwtsPHdZ2lCaC3VEcEAKn93st/7DJ0oyU="; # Note: this derivation strictly requires vulkan-header to be the same it was developed against. # To help us, they've put it in a git-submodule. # The result will work with any vulkan-loader version. diff --git a/pkgs/tools/misc/engage/default.nix b/pkgs/tools/misc/engage/default.nix deleted file mode 100644 index f9b0f411ee8a3..0000000000000 --- a/pkgs/tools/misc/engage/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, installShellFiles -, rustPlatform -, fetchgit -}: - -let - pname = "engage"; - version = "0.1.2"; -in -rustPlatform.buildRustPackage { - inherit pname version; - - # fetchFromGitLab doesn't work on GitLab's end for unknown reasons - src = fetchgit { - url = "https://or.computer.surgery/charles/${pname}"; - rev = "v${version}"; - hash = "sha256-7zLFgTLeAIaMMoj0iThH/5UhnV9OUGe9CVwbbShCieo="; - }; - - cargoHash = "sha256-+4uqC0VoBSmkS9hYC1lzWeJmK873slZT04TljHPE+Eo="; - - nativeBuildInputs = [ - installShellFiles - ]; - - postInstall = "installShellCompletion --cmd ${pname} " - + builtins.concatStringsSep - " " - (builtins.map - (shell: "--${shell} <($out/bin/${pname} self completions ${shell})") - [ - "bash" - "fish" - "zsh" - ] - ); - - meta = { - description = "A task runner with DAG-based parallelism"; - homepage = "https://or.computer.surgery/charles/engage"; - changelog = "https://or.computer.surgery/charles/engage/-/blob/v${version}/CHANGELOG.md"; - license = with lib.licenses; [ asl20 mit ]; - maintainers = with lib.maintainers; [ CobaltCause ]; - }; -} diff --git a/pkgs/tools/misc/eza/default.nix b/pkgs/tools/misc/eza/default.nix index de77265d832ef..2519f669bef76 100644 --- a/pkgs/tools/misc/eza/default.nix +++ b/pkgs/tools/misc/eza/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-qA9oXAHJyEf5yI1AlofAKs5fNpNQev9FlY/GHNsfo2Q="; + hash = "sha256-Wboe1ww15GVlL9crNMbVHJnlXghcGM7fL5We2+PFII8="; }; - cargoHash = "sha256-xcw2fhEnUheDSJ5vE7Z1EqahVdCluClC7TmC1PFUUV4="; + cargoHash = "sha256-uUUzyDGTYF6hKmP0Wno/btjhC1RjyqdkWu4torGwA0g="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/pkgs/tools/networking/rosenpass/default.nix b/pkgs/tools/networking/rosenpass/default.nix new file mode 100644 index 0000000000000..07669cfeb01e7 --- /dev/null +++ b/pkgs/tools/networking/rosenpass/default.nix @@ -0,0 +1,85 @@ +{ lib +, targetPlatform +, fetchFromGitHub +, rustPlatform +, cmake +, makeWrapper +, pkg-config +, removeReferencesTo +, coreutils +, findutils +, gawk +, wireguard-tools +, bash +, libsodium +}: + +let + rpBinPath = lib.makeBinPath [ + coreutils + findutils + gawk + wireguard-tools + ]; +in +rustPlatform.buildRustPackage rec { + pname = "rosenpass"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-r7/3C5DzXP+9w4rp9XwbP+/NK1axIP6s3Iiio1xRMbk="; + }; + + cargoHash = "sha256-g2w3lZXQ3Kg3ydKdFs8P2lOPfIkfTbAF0MhxsJoX/E4="; + + nativeBuildInputs = [ + cmake # for oqs build in the oqs-sys crate + makeWrapper # for the rp shellscript + pkg-config # let libsodium-sys-stable find libsodium + removeReferencesTo + rustPlatform.bindgenHook # for C-bindings in the crypto libs + ]; + + buildInputs = [ + bash # for patchShebangs to find it + libsodium + ]; + + # otherwise pkg-config tries to link non-existent dynamic libs during the build of liboqs + PKG_CONFIG_ALL_STATIC = true; + + # liboqs requires quite a lot of stack memory, thus we adjust the default stack size picked for + # new threads (which is used by `cargo test`) to be _big enough_ + RUST_MIN_STACK = 8 * 1024 * 1024; # 8 MiB + + # nix defaults to building for aarch64 _without_ the armv8-a + # crypto extensions, but liboqs depends on these + preBuild = lib.optionalString targetPlatform.isAarch + ''NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -march=armv8-a+crypto"''; + + preInstall = '' + install -D rp $out/bin/rp + wrapProgram $out/bin/rp --prefix PATH : "${ rpBinPath }" + for file in doc/*.1 + do + install -D $file $out/share/man/man1/''${file##*/} + done + ''; + + # nix propagates the *.dev outputs of buildInputs for static builds, but that is non-sense for an + # executables only package + postFixup = '' + find -type f -exec remove-references-to -t ${bash.dev} \ + -t ${libsodium.dev} {} \; + ''; + + meta = with lib; { + description = "Build post-quantum-secure VPNs with WireGuard!"; + homepage = "https://rosenpass.eu/"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ wucke13 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/security/dumpasn1/default.nix b/pkgs/tools/security/dumpasn1/default.nix index d224531940a75..030d73a447be9 100644 --- a/pkgs/tools/security/dumpasn1/default.nix +++ b/pkgs/tools/security/dumpasn1/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Display and debug ASN.1 data"; homepage = "https://github.com/katexochen/dumpasn1"; license = licenses.bsd2; + mainProgram = "dumpasn1"; maintainers = with maintainers; [ katexochen ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 99a99e74c4a51..44f7b5dd0fc16 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.9.6"; + version = "0.10.0"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - hash = "sha256-vzdQqiAguwXZ3QNlctnfsuFxNYwBLICVqonFKXdMvSQ="; + hash = "sha256-zTFWIIqIDMI77lg2CB1ug+GeKPVIT1OQ1p80x6tLgGg="; }; - cargoHash = "sha256-clxpTayrWSu0esu8L4/Kf8oKk8zAK3XJwT8IJqHoZpw="; + cargoHash = "sha256-5qLrmU/SfUfiQOOpECTEn8K142STnbhqE3XbJFxKPZg="; nativeBuildInputs = [ gpgme # for gpgme-config diff --git a/pkgs/tools/security/openpgp-card-tools/default.nix b/pkgs/tools/security/openpgp-card-tools/default.nix index c035458c6c32d..6a630883580b6 100644 --- a/pkgs/tools/security/openpgp-card-tools/default.nix +++ b/pkgs/tools/security/openpgp-card-tools/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , rustPlatform -, fetchCrate +, fetchFromGitea , pkg-config , pcsclite , nettle @@ -12,14 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "openpgp-card-tools"; - version = "0.9.3"; + version = "0.9.4"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-F+j8bK0sBBLWlQzLAcvl6BdiI3Dy8ollwTpL7929nJ8="; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "openpgp-card"; + repo = "openpgp-card-tools"; + rev = "v${version}"; + hash = "sha256-ISIABjuh0BC6OUFa5I9Wou+av7Dp4bZH8Aazi6x7cqY="; }; - cargoHash = "sha256-Wn3fXAft+sju8FhX6YFHRvqt815NhTlfhLJarSemvm0="; + cargoHash = "sha256-+EEpoI9OQvnJR6bVbEuLn3O7w6BchjBzr+oMGsWdP/k="; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; buildInputs = [ pcsclite nettle ] ++ lib.optionals stdenv.isDarwin [ PCSC ]; diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/tools/security/quark-engine/default.nix index 0a3de075f810c..c855fdde93336 100644 --- a/pkgs/tools/security/quark-engine/default.nix +++ b/pkgs/tools/security/quark-engine/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "quark-engine"; - version = "23.6.1"; + version = "23.8.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-RkYLTZ40ZINg3cNPBJrSOGOzSSfislBmwdUOQHDu32U="; + sha256 = "sha256-sdhTrRh6xkkIDZDGE22hSr5dD179VWdMVs6L1cJ9yiw="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index bb56897b9b36a..07bbb36327fa6 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.13.0"; + version = "3.14.0"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - hash = "sha256-YQvCOdMIMMEtT2K9WBWp5xmDNGeICvgTs0GnX+D4DZI="; + hash = "sha256-Yb4zORtmEgZGu9h05/t4sQ6eTljHba89JZKh7vzIp2Q="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; diff --git a/pkgs/tools/text/dt/default.nix b/pkgs/tools/text/dt/default.nix index be5a00f3613fd..bc4c0dd9938e9 100644 --- a/pkgs/tools/text/dt/default.nix +++ b/pkgs/tools/text/dt/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dt"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "so-dang-cool"; repo = "dt"; rev = "v${finalAttrs.version}"; - hash = "sha256-C6sG8iqXs64x2AWCxKGFPyoXC1Fn4p2eSLWwJAQ8CSc="; + hash = "sha256-u9MI6mrP+QXr3VDgmXW7GRkHKCiDoA9HlznTEGNsck4="; }; nativeBuildInputs = [ zig_0_11.hook ]; @@ -36,8 +36,10 @@ stdenv.mkDerivation (finalAttrs: { In short, dt is intended to be generally useful, with zero pretense of elegance. ''; + changelog = "https://github.com/so-dang-cool/dt/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ booniepepper ]; + platforms = lib.platforms.unix; mainProgram = "dt"; }; }) diff --git a/pkgs/tools/text/nawk/default.nix b/pkgs/tools/text/nawk/default.nix index e9ae489a02e3a..756b5aa12e614 100644 --- a/pkgs/tools/text/nawk/default.nix +++ b/pkgs/tools/text/nawk/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, bison, buildPackages }: +{ lib, stdenv, fetchFromGitHub, bison, buildPackages, installShellFiles }: stdenv.mkDerivation rec { pname = "nawk"; - version = "20220122"; + version = "20230909"; src = fetchFromGitHub { owner = "onetrueawk"; repo = "awk"; rev = version; - hash = "sha256-W5WkGk4WY3g1qSFjJxFBa8KY1k13oK6WAMg5GH6kKU4="; + hash = "sha256-sBJ+ToFkhU5Ei84nqzbS0bUbsa+60iLSz2oeV5+PXEk="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison ]; + nativeBuildInputs = [ bison installShellFiles ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "HOSTCC=${if stdenv.buildPlatform.isDarwin then "clang" else "cc"}" @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall install -Dm755 a.out "$out/bin/nawk" - install -Dm644 awk.1 "$out/share/man/man1/nawk.1" + installManPage awk.1 runHook postInstall ''; diff --git a/pkgs/tools/video/recyclarr/default.nix b/pkgs/tools/video/recyclarr/default.nix index f41a1c2c521a0..b07e91a50c019 100644 --- a/pkgs/tools/video/recyclarr/default.nix +++ b/pkgs/tools/video/recyclarr/default.nix @@ -26,10 +26,10 @@ let or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-WtIT5fkkaNDIot1lY5xacYD8XwuaYYnL0ZrJO9EXB3A="; - arm64-linux_hash = "sha256-aFLdnGYeKJs0Gp83SqvDg3YO2mGVF5ZIONNQwXMGLj8="; - x64-osx_hash = "sha256-eiDO3PdpPk+NXWBKBkpzIHf/1xDe0XByC6NBBfxs55s="; - arm64-osx_hash = "sha256-uPv7ZQm6JbgxpylrSi5X5yX0Enrkhq+1sCmFxaghM94="; + x64-linux_hash = "sha256-vexo2zx6trv5Q8JifLQG93ZNaAY6ym0ShI81HjBUqTs="; + arm64-linux_hash = "sha256-oLtXFkE8b9dxmTwttjJbBSOhxkwInGLpD+WNjDy1ktM="; + x64-osx_hash = "sha256-fVIGBuOhwaWttmAGECVm3i4GPKer37mRq6cBz1BcsBc="; + arm64-osx_hash = "sha256-eD74AcnRxFgD9PvoPYTBqI0/7MGCqu1I2sq8L1XrmMQ="; }."${arch}-${os}_hash"; libPath = { @@ -40,7 +40,7 @@ let in stdenv.mkDerivation rec { pname = "recyclarr"; - version = "5.2.1"; + version = "5.3.1"; src = fetchurl { url = "https://github.com/recyclarr/recyclarr/releases/download/v${version}/recyclarr-${os}-${arch}.tar.xz"; diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index 87422a42f0afe..062f21bb4d201 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation (finalAttrs: { nasm ]; + cmakeFlags = [ + "-DSVT_AV1_LTO=ON" + ]; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; |