diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-06-12 00:02:19 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-12 00:02:19 +0000 |
commit | 112762351dc212ac1aab631ccdeadacbca193bee (patch) | |
tree | 2db4e2253c214eeb48e59903e6aa53018fb98591 /pkgs/tools/misc | |
parent | 57ad9ab8d6ca8989987389c7f2a2ee7f1e6a68fd (diff) | |
parent | f5c28a079c597bf8e35cdbe579ad22819067e897 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/antimicrox/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/asciinema-agg/Cargo.lock | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/asciinema-agg/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/misc/fclones/gui.nix | 43 | ||||
-rw-r--r-- | pkgs/tools/misc/geekbench/6.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/svtplay-dl/default.nix | 4 |
6 files changed, 54 insertions, 10 deletions
diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix index d95efa0dbd085..f989ae912edd8 100644 --- a/pkgs/tools/misc/antimicrox/default.nix +++ b/pkgs/tools/misc/antimicrox/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "antimicrox"; - version = "3.3.3"; + version = "3.3.4"; src = fetchFromGitHub { owner = "AntiMicroX"; repo = pname; rev = version; - sha256 = "sha256-svEk+IFttkCXmoAOFH3k2rRC/OL9HXOLiuGrCh10YNc="; + sha256 = "sha256-WEtKeQKRZcYpZ4mnFdj4ZRApBuD8fByf11Uu6ylbAcY="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; diff --git a/pkgs/tools/misc/asciinema-agg/Cargo.lock b/pkgs/tools/misc/asciinema-agg/Cargo.lock index f77ba5a1de938..f23b7500cc109 100644 --- a/pkgs/tools/misc/asciinema-agg/Cargo.lock +++ b/pkgs/tools/misc/asciinema-agg/Cargo.lock @@ -10,7 +10,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "agg" -version = "1.4.1" +version = "1.4.2" dependencies = [ "anyhow", "avt", diff --git a/pkgs/tools/misc/asciinema-agg/default.nix b/pkgs/tools/misc/asciinema-agg/default.nix index eb55382ac4f6f..923768504c755 100644 --- a/pkgs/tools/misc/asciinema-agg/default.nix +++ b/pkgs/tools/misc/asciinema-agg/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "agg"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "asciinema"; - repo = pname; + repo = "agg"; rev = "v${version}"; - sha256 = "sha256-ozkC3jaM7Q0BKS7KrgN+sI6YU0996ioTgbrJ4uJ6/9E="; + sha256 = "sha256-pyXGWSL2HnRfcLo1V/pFKNI08B51ZvmJsYhl893CUl0="; }; cargoLock = { @@ -25,6 +25,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A command-line tool for generating animated GIF files from asciicast v2 files produced by asciinema terminal recorder"; homepage = "https://github.com/asciinema/agg"; + changelog = "https://github.com/asciinema/agg/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/tools/misc/fclones/gui.nix b/pkgs/tools/misc/fclones/gui.nix new file mode 100644 index 0000000000000..dfb9f06eb3c7d --- /dev/null +++ b/pkgs/tools/misc/fclones/gui.nix @@ -0,0 +1,43 @@ +{ lib +, rustPlatform +, fetchCrate +, pkg-config +, wrapGAppsHook4 +, gdk-pixbuf +, gtk4 +, libadwaita +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "fclones-gui"; + version = "0.1.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-rMeXUNpoEzqsDmlTmnHsFkas3zFgdCH0WSeP83RtT+c="; + }; + + cargoHash = "sha256-2oeyTMYg0PyTpSMLaub3nZGeoK5U6BlC8OReBwRi3DA="; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + gdk-pixbuf + gtk4 + libadwaita + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.IOKit + ]; + + meta = with lib; { + description = "Interactive duplicate file remover"; + homepage = "https://github.com/pkolaczk/fclones/tree/main/fclones-gui"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/misc/geekbench/6.nix b/pkgs/tools/misc/geekbench/6.nix index be1f32d8e62e9..4c72ecf057a8c 100644 --- a/pkgs/tools/misc/geekbench/6.nix +++ b/pkgs/tools/misc/geekbench/6.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "6.0.3"; + version = "6.1.0"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - hash = "sha256-08c5YBKljeFo31Y7WHEnLLiJdFJm8RfkY2Q44C2dp7k="; + hash = "sha256-GBJHnT6tfLdZuaawwhEvqOFYcmM42DZxRxm7cJNi0aA="; }; dontConfigure = true; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 1284bc52d0d33..91c9d27bf2a98 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -15,7 +15,7 @@ let python pytest nose cryptography pyyaml requests mock requests-mock python-dateutil setuptools; - version = "4.20"; + version = "4.22"; in @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "spaam"; repo = "svtplay-dl"; rev = version; - hash = "sha256-nG4ErqQC7GZDLClqcE3cliXxowzCku/SnB39AVIqkNw="; + hash = "sha256-xY6XhQb9Nn0W09EZuLUgPiCR4uGb8ibnORCZOVLFXwA="; }; pythonPaths = [ cryptography pyyaml requests ]; |