diff options
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/apkeep/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/opentelemetry-collector/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/rockbox-utility/default.nix | 43 |
3 files changed, 35 insertions, 20 deletions
diff --git a/pkgs/tools/misc/apkeep/default.nix b/pkgs/tools/misc/apkeep/default.nix index d405302282f..ef7699ccf28 100644 --- a/pkgs/tools/misc/apkeep/default.nix +++ b/pkgs/tools/misc/apkeep/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "apkeep"; - version = "0.9.0"; + version = "0.10.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ST1ifON25mizKZQX3fKeqBloXWW9LXDq5JkZIeiguRY="; + sha256 = "14vm3b2gbmn9pil0aagwchn4kyvi9311id6qv4a376qfb6r1aybf"; }; - cargoSha256 = "sha256-/Xh1s4PO336B1ioKe0IKVGDACpMuXOpxA82U6zn2lj0="; + cargoSha256 = "0i8wzc58ji317kjdw3ls1908z4bqlh1cgjph0fxsvs5i552qjkzp"; prePatch = '' rm .cargo/config.toml diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 851d4f2dc18..1feb290bb13 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.46.0"; + version = "0.47.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-ibaA9oCSsId9A4ul5sfM+L8ExBl+Wv7rhGnb6TZ4WJw="; + sha256 = "sha256-1dMdQWV+gxbMc/2iVsB1LCsYxR0bt5AJEvoFq2/KHCg="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorSha256 = "sha256-Okmsd/skfBmkyLv9oPFH0QvewFZFPpUH2ahWxHt7cy8="; + vendorSha256 = "sha256-ps6fUVg7vhGgy47WTJv/U1qHQ2MGXIWXNZ5Rddo1yQY="; preBuild = '' # set the build version, can't be done via ldflags diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index a75b90d6f54..bf191beca3f 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -1,9 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, cryptopp -, libusb1, qtbase, qttools, makeWrapper -, qmake, withEspeak ? false, espeak ? null -, qt5 }: - -let inherit (lib) getDev; in +{ lib +, stdenv +, fetchurl +, cryptopp +, libusb1 +, makeWrapper +, pkg-config +, qt5 +, withEspeak ? false, espeak ? null +}: stdenv.mkDerivation rec { pname = "rockbox-utility"; @@ -11,16 +15,27 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.rockbox.org/rbutil/source/RockboxUtility-v${version}-src.tar.bz2"; - sha256 = "0zm9f01a810y7aq0nravbsl0vs9vargwvxnfl4iz9qsqygwlj69y"; + hash = "sha256-PhlJ+fNY4/Qjoc72zV9WO+kNqF5bZQuwOh4EpAJwqX4="; }; - buildInputs = [ cryptopp libusb1 qtbase qttools ] - ++ lib.optional withEspeak espeak; - nativeBuildInputs = [ makeWrapper pkg-config qmake qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ + makeWrapper + pkg-config + qt5.qmake + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + cryptopp + libusb1 + qt5.qtbase + qt5.qttools + ] + ++ lib.optional withEspeak espeak; postPatch = '' sed -i rbutil/rbutilqt/rbutilqt.pro \ - -e '/^lrelease.commands =/ s|$$\[QT_INSTALL_BINS\]/lrelease -silent|${getDev qttools}/bin/lrelease|' + -e '/^lrelease.commands =/ s|$$\[QT_INSTALL_BINS\]/lrelease -silent|${lib.getDev qt5.qttools}/bin/lrelease|' ''; preConfigure = '' @@ -48,10 +63,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = with lib; { - description = "Open source firmware for mp3 players"; homepage = "https://www.rockbox.org"; - license = licenses.gpl2; + description = "Open source firmware for digital music players"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres goibhniu ]; platforms = platforms.linux; - maintainers = with maintainers; [ goibhniu ]; }; } |