diff options
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/android-tools/default.nix | 24 | ||||
-rw-r--r-- | pkgs/tools/misc/boxxy/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/broot/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/ddcutil/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/misc/esphome/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/fastfetch/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/fclones/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/fw/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/gh-actions-cache/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/infracost/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/libcpuid/default.nix | 34 | ||||
-rw-r--r-- | pkgs/tools/misc/mapcidr/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/parallel/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/spigot/default.nix | 42 | ||||
-rw-r--r-- | pkgs/tools/misc/twm/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/wakapi/default.nix | 7 |
16 files changed, 44 insertions, 134 deletions
diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix index 6276d50c73d..891bea3fe47 100644 --- a/pkgs/tools/misc/android-tools/default.nix +++ b/pkgs/tools/misc/android-tools/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, cmake, pkg-config, perl, go, python3 +, cmake, ninja, pkg-config, perl, go, python3 , protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2 }: @@ -9,33 +9,17 @@ in stdenv.mkDerivation rec { pname = "android-tools"; - version = "34.0.1"; + version = "34.0.4"; src = fetchurl { url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"; - hash = "sha256-YCNOy8oZoXp+L0akWBlg1kW3xVuHDZJKIUlMdqb1SOw="; + hash = "sha256-eiL/nOqB/0849WBoeFjo+PtzNiRBJZfjzBqwJi+No6E="; }; - patches = [ - # Fix building with newer protobuf versions. - (fetchurl { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/android-tools/-/raw/295ad7d5cb1e3b4c75bd40281d827f9168bbaa57/protobuf-23.patch"; - hash = "sha256-KznGgZdYT6e5wG3gtfJ6i93bYfp/JFygLW/ZzvXUA0Y="; - }) - ]; - - # Fix linking with private abseil-cpp libraries. - postPatch = '' - sed -i '/^find_package(Protobuf REQUIRED)$/i find_package(protobuf CONFIG)' vendor/CMakeLists.txt - ''; - - nativeBuildInputs = [ cmake pkg-config perl go ]; + nativeBuildInputs = [ cmake ninja pkg-config perl go ]; buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ]; propagatedBuildInputs = [ pythonEnv ]; - # Don't try to fetch any Go modules via the network: - GOFLAGS = [ "-mod=vendor" ]; - preConfigure = '' export GOCACHE=$TMPDIR/go-cache ''; diff --git a/pkgs/tools/misc/boxxy/default.nix b/pkgs/tools/misc/boxxy/default.nix index 27e38475978..4a0a4fe0a99 100644 --- a/pkgs/tools/misc/boxxy/default.nix +++ b/pkgs/tools/misc/boxxy/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "boxxy"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromGitHub { owner = "queer"; repo = "boxxy"; rev = "v${version}"; - hash = "sha256-vggerp66ALH7aqC6daH1a82ajJg5ZmEZTqC98IHhzFU="; + hash = "sha256-BxI2Ju1I1IytCjx6vUoIy1jzebSeRmoObDEtN/sBEDg="; }; - cargoHash = "sha256-nKuxeVFCc4Etl5x5vgpCXbU7WkLVaL9wRCVSWhffPzU="; + cargoHash = "sha256-ZEQsCm13MoFtpIjjtD5UANH5zrPDX4IjEmqJLwnftps="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 39790d65381..de0fd1a1155 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.26.1"; + version = "1.27.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-IqDcE6P4DSH/A4TKzPoLZsO00t0zGPCutM0yVI41nrM="; + hash = "sha256-yZsb/G+8XoJS4Fg6WFuEk1v3Ht5i3G3p+sKi+Z3jeGU="; }; - cargoHash = "sha256-Lo/O/q2kGioWxkRJ/c9jWAHSm2Y839RsK4NM4qP576c="; + cargoHash = "sha256-xHmrFIXXkuhYGApgNoJxcL1Kpf8ellwQgiH8AEZvDRU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 0a5bc1cec7c..903f923b5d8 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -4,9 +4,8 @@ , autoreconfHook , pkg-config , glib -, i2c-tools +, jansson , udev -, kmod , libgudev , libusb1 , libdrm @@ -15,23 +14,23 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "1.4.2"; + version = "2.0.0"; src = fetchurl { url = "https://www.ddcutil.com/tarballs/ddcutil-${version}.tar.gz"; - hash = "sha256-wGwTZheRHi5pGf6WB9hGd8m/pLOmnlYYrS5dd+QItAQ="; + hash = "sha256-CunFRQHKk3q8CU60TSRnRoCW7+9X1+JpJHm773HhmZs="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib - i2c-tools - kmod + jansson libdrm libgudev libusb1 udev + xorg.libXext xorg.libXrandr ]; diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 958738478ba..ef6e0f1de6e 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.10.4"; + version = "2023.10.5"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rDq6uudT1kW97TiE9FswfgzLlNPTo8+YjD7HEvbrMn0="; + hash = "sha256-I/VA1/vw0WrTsLC1F3IrKYf8lmTJHLG/RYj3VcJx+Zc="; }; postPatch = '' diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index 28e4a4df847..77eeaeaf670 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-v/dFynTESqRWAxu5Wz0/EroXuwmNj3EEPJxzpfTGKtk="; + hash = "sha256-H2iIL41h3o8184S/XMYAuIDPVJPm+zSI/YX8FT8vLio="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index 563b35d665b..01f35bd8c65 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.33.1"; + version = "0.34.0"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - hash = "sha256-MnsA7zZ3T0L80dgCUj4F/F9IKTzADs65esM1DdgQeSU="; + hash = "sha256-JgeajCubRz9hR6uvRAw1HXdKa6Ua+l/Im/bYXdx1gL0="; }; - cargoHash = "sha256-xBoTzDeMmkSExOjD588l1vy73lbkzb60V4Fd4zhrU8c="; + cargoHash = "sha256-mEgFfg8I+JJuUEvj+sia2aL3BVg3HteQorZ2EOiLo64="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit diff --git a/pkgs/tools/misc/fw/default.nix b/pkgs/tools/misc/fw/default.nix index 7cb9be3ccb5..0c79edc0429 100644 --- a/pkgs/tools/misc/fw/default.nix +++ b/pkgs/tools/misc/fw/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "fw"; - version = "2.17.1"; + version = "2.18.0"; src = fetchFromGitHub { owner = "brocode"; repo = "fw"; rev = "v${version}"; - hash = "sha256-8Jq7VjTKwq8n9lrwTzazkkrq8/mNacFTwz/M+eAwBWM="; + hash = "sha256-8PcIaSXmk6/p5N6L2/nLrFS6JUZRRJsN2mKQYtevS6s="; }; - cargoHash = "sha256-tIrACx4KRjfxLyxTiP32PpdN8NegaHBIkINsPGgygVQ="; + cargoHash = "sha256-l6mRjVk3qNAxfNqcKGo2dceD2Xb+hk+xMvdh/U1jZXw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/gh-actions-cache/default.nix b/pkgs/tools/misc/gh-actions-cache/default.nix index 4c80d032ab1..8bc735f4e52 100644 --- a/pkgs/tools/misc/gh-actions-cache/default.nix +++ b/pkgs/tools/misc/gh-actions-cache/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gh-actions-cache"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "actions"; repo = "gh-actions-cache"; rev = "v${version}"; - hash = "sha256-5iCj6z4HCMVFeplb3dGP/V60z6zMUnUPVBMnPi4yU1Q="; + hash = "sha256-GVha3xxLTBTiKfAjGb2q9btsGYzWQivGLyZ4Gg0s/N0="; }; - vendorHash = "sha256-i9akQ0IjH9NItjYvMWLiGnFQrfZhA7SOvPZiUvdtDrk="; + vendorHash = "sha256-4/Zt+ga3abEPtR0FjWIsDpOiG1bfVtVuLuXP8aHbzqk="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index 26c0acdef4d..7fc02624db6 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.29"; + version = "0.10.30"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-xtxTIC7DNTvcDMXtFJOJkJGn78HdzCWVrBMS5Ksmtcc="; + sha256 = "sha256-YHhaOf2MNrFHv29pEnhkOjFH30Mi5Oi6gYkSH6PZhU4="; }; - vendorHash = "sha256-ZKRtUlrEk/W2qZSbsh0ddwmspH6quzzY0cFSQmO0i10="; + vendorHash = "sha256-yjPtNTfkL8+fkmXW98SnpboMqdsjQYCif65sn0jjLgc="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix deleted file mode 100644 index cb3de447572..00000000000 --- a/pkgs/tools/misc/libcpuid/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "libcpuid"; - version = "0.6.3"; - - src = fetchFromGitHub { - owner = "anrieff"; - repo = "libcpuid"; - rev = "v${version}"; - sha256 = "sha256-lhoHqdS5tke462guORg+PURjVmjAgviT5KJHp6PyvUA="; - }; - - patches = [ - # Fixes cross-compilation to NetBSD - # https://github.com/anrieff/libcpuid/pull/190 - (fetchpatch { - name = "pass-pthread-to-linker.patch"; - url = "https://github.com/anrieff/libcpuid/commit/c28436e7239f28dab0e2a3bcdbce95f41e1363b1.patch"; - sha256 = "sha256-J2mB010JcE4si0rERjcrL9kJgbWHKaQCIZPDkmRvcq4="; - }) - ]; - - nativeBuildInputs = [ autoreconfHook ]; - - meta = with lib; { - homepage = "https://libcpuid.sourceforge.net/"; - description = "A small C library for x86 CPU detection and feature extraction"; - changelog = "https://raw.githubusercontent.com/anrieff/libcpuid/master/ChangeLog"; - license = licenses.bsd2; - maintainers = with maintainers; [ orivej artuuge ]; - platforms = platforms.x86; - }; -} diff --git a/pkgs/tools/misc/mapcidr/default.nix b/pkgs/tools/misc/mapcidr/default.nix index 00abf2e5630..2cb179fac94 100644 --- a/pkgs/tools/misc/mapcidr/default.nix +++ b/pkgs/tools/misc/mapcidr/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mapcidr"; - version = "1.1.11"; + version = "1.1.14"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gi1saAav8VrlssXW8ezLAze2kp1hnATd3RCIZUspEcM="; + hash = "sha256-Vhh/OS61dfArsowXMogr/bu/gg354nte9PuobD9lCaU="; }; - vendorHash = "sha256-9mX+EUeLp4zpVHAzdlmrr31vjWjG1VjHwSDwbTxMufM="; + vendorHash = "sha256-wqbAOoRQEE7CDmaH5MRzsSKOdyrxwBY/1wDz3MCfsBc="; modRoot = "."; subPackages = [ diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index cf2b84a9c50..9b223c12f8f 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, perl, makeWrapper, procps, coreutils, buildPackages }: +{ fetchurl, lib, stdenv, perl, makeWrapper, procps, coreutils, gawk, buildPackages }: stdenv.mkDerivation rec { pname = "parallel"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/parallel \ - --prefix PATH : "${lib.makeBinPath [ procps perl coreutils ]}" + --prefix PATH : "${lib.makeBinPath [ procps perl coreutils gawk ]}" ''; doCheck = true; diff --git a/pkgs/tools/misc/spigot/default.nix b/pkgs/tools/misc/spigot/default.nix deleted file mode 100644 index 5f50307537b..00000000000 --- a/pkgs/tools/misc/spigot/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchurl -, cmake -, gmp -, halibut -, ncurses -, perl -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "spigot"; - version = "20220606.eb585f8"; - - src = fetchurl { - url = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/spigot-${finalAttrs.version}.tar.gz"; - hash = "sha256-JyNNZo/HUPWv5rYtlNYp8Hl0C7i3yxEyKm+77ysN7Ao="; - }; - - nativeBuildInputs = [ - cmake - halibut - perl - ]; - - buildInputs = [ - gmp - ncurses - ]; - - outputs = [ "out" "man" ]; - - strictDeps = true; - - meta = { - homepage = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/"; - description = "A command-line exact real calculator"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/tools/misc/twm/default.nix b/pkgs/tools/misc/twm/default.nix index 68a58d04602..3f08d53fd45 100644 --- a/pkgs/tools/misc/twm/default.nix +++ b/pkgs/tools/misc/twm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "twm"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "vinnymeller"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q8WdNmO5uSm4PvitBXQ7YEkjJhlCz4qfJO/F6+XckXY="; + sha256 = "sha256-icJQSPt3733H5pIdnpC/Vx+u6LgwokCdbvE3wvDkIlw="; }; - cargoHash = "sha256-fxDUUfC7mBgVHN+M6pb5leRp28wzO69ZdStdYmQFxQE="; + cargoHash = "sha256-DxT3Wsiy4zVlTSJwHqV/McSi/pc9pB0wyWY54fj1zVE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/wakapi/default.nix b/pkgs/tools/misc/wakapi/default.nix index abc36f63bd0..66e4ca5125c 100644 --- a/pkgs/tools/misc/wakapi/default.nix +++ b/pkgs/tools/misc/wakapi/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "wakapi"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "muety"; repo = pname; rev = version; - sha256 = "sha256-uTDvipz08hrdFB/gAoxVp4Eesh57HOFUG4AD/5T33H8="; + sha256 = "sha256-BRIcStqRzwoFG9HkWBpfumeCzbrSI0Hg//a0iDQtNw8="; }; vendorHash = "sha256-SqkE4vTT+QoLhKrQcGa2L5WmD+fCX7vli4FjgwLnqjg="; @@ -16,6 +16,9 @@ buildGoModule rec { # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; + # Fix up reported version + postPatch = ''echo ${version} > version.txt''; + ldflags = [ "-s" "-w" |