From ad07cd4fc2e37cdeca8f6b920f4d955fa280f595 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 18 Sep 2023 14:58:14 -0500 Subject: [PATCH] treewide: add version tests (#255781) --- pkgs/applications/file-managers/ranger/default.nix | 6 +++++- pkgs/applications/misc/1password/default.nix | 6 +++++- pkgs/development/tools/lazygit/default.nix | 6 +++++- pkgs/os-specific/darwin/sketchybar/default.nix | 6 ++++++ pkgs/os-specific/darwin/skhd/default.nix | 6 ++++++ pkgs/tools/misc/lazydocker/default.nix | 6 +++++- pkgs/tools/misc/ncdu/default.nix | 5 +++++ pkgs/tools/misc/toilet/default.nix | 6 +++++- pkgs/tools/system/bottom/default.nix | 6 ++++++ pkgs/tools/system/btop/default.nix | 6 ++++++ 10 files changed, 54 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/file-managers/ranger/default.nix b/pkgs/applications/file-managers/ranger/default.nix index 96d43dc8f24..4906a06123c 100644 --- a/pkgs/applications/file-managers/ranger/default.nix +++ b/pkgs/applications/file-managers/ranger/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m +{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m, ranger, testers , imagePreviewSupport ? true , neoVimSupport ? true , improvedEncodingDetection ? true @@ -49,6 +49,10 @@ python3Packages.buildPythonApplication rec { --replace "set preview_images false" "set preview_images true" ''; + passthru.tests.version = testers.testVersion { + package = ranger; + }; + meta = with lib; { description = "File manager with minimalistic curses interface"; homepage = "https://ranger.github.io/"; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index d4dddd861f2..a4f0b957c99 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchzip, autoPatchelfHook, installShellFiles, cpio, xar }: +{ lib, stdenv, fetchurl, fetchzip, autoPatchelfHook, installShellFiles, cpio, xar, _1password, testers }: let inherit (stdenv.hostPlatform) system; @@ -63,6 +63,10 @@ stdenv.mkDerivation { $out/bin/${mainProgram} --version ''; + passthru.tests.version = testers.testVersion { + package = _1password; + }; + meta = with lib; { description = "1Password command-line tool"; homepage = "https://developer.1password.com/docs/cli/"; diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index a28d4774c12..97233ab1158 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, lazygit, testers }: buildGoModule rec { pname = "lazygit"; @@ -16,6 +16,10 @@ buildGoModule rec { ldflags = [ "-X main.version=${version}" "-X main.buildSource=nix" ]; + passthru.tests.version = testers.testVersion { + package = lazygit; + }; + meta = with lib; { description = "Simple terminal UI for git commands"; homepage = "https://github.com/jesseduffield/lazygit"; diff --git a/pkgs/os-specific/darwin/sketchybar/default.nix b/pkgs/os-specific/darwin/sketchybar/default.nix index b2b4186b7eb..069fac3d59f 100644 --- a/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/pkgs/os-specific/darwin/sketchybar/default.nix @@ -9,6 +9,7 @@ , IOKit , MediaRemote , SkyLight +, testers }: let @@ -53,6 +54,11 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + version = "sketchybar-v${finalAttrs.version}"; + }; + meta = { description = "A highly customizable macOS status bar replacement"; homepage = "https://github.com/FelixKratz/SketchyBar"; diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix index be70e1c8bcd..fa6e1aa01e9 100644 --- a/pkgs/os-specific/darwin/skhd/default.nix +++ b/pkgs/os-specific/darwin/skhd/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , Carbon , Cocoa +, testers }: stdenv.mkDerivation (finalAttrs: { @@ -31,6 +32,11 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace $out/Library/LaunchDaemons/org.nixos.skhd.plist --subst-var out ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + version = "skhd-v${finalAttrs.version}"; + }; + meta = { description = "Simple hotkey daemon for macOS"; homepage = "https://github.com/koekeishiya/skhd"; diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index 8c45351b385..33ac0630655 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, lazydocker, testers }: buildGoModule rec { pname = "lazydocker"; @@ -21,6 +21,10 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + passthru.tests.version = testers.testVersion { + package = lazydocker; + }; + meta = with lib; { description = "A simple terminal UI for both docker and docker-compose"; homepage = "https://github.com/jesseduffield/lazydocker"; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 26475346450..47a1365b536 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -4,6 +4,7 @@ , ncurses , zig_0_11 , installShellFiles +, testers , pie ? stdenv.isDarwin }: @@ -31,6 +32,10 @@ stdenv.mkDerivation (finalAttrs: { installManPage ncdu.1 ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + meta = { homepage = "https://dev.yorhel.nl/ncdu"; description = "Disk usage analyzer with an ncurses interface"; diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix index 41eaa6b03bf..d67383e4d52 100644 --- a/pkgs/tools/misc/toilet/default.nix +++ b/pkgs/tools/misc/toilet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libcaca }: +{ lib, stdenv, fetchurl, pkg-config, libcaca, toilet, testers }: stdenv.mkDerivation rec { pname = "toilet"; @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libcaca ]; + passthru.tests.version = testers.testVersion { + package = toilet; + }; + meta = with lib; { description = "Display large colourful characters in text mode"; homepage = "http://caca.zoy.org/wiki/toilet"; diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index 223d4b0f2c9..dfc1ffcd112 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -4,6 +4,8 @@ , installShellFiles , stdenv , darwin +, bottom +, testers }: rustPlatform.buildRustPackage rec { @@ -36,6 +38,10 @@ rustPlatform.buildRustPackage rec { BTM_GENERATE = true; + passthru.tests.version = testers.testVersion { + package = bottom; + }; + meta = with lib; { description = "A cross-platform graphical process/system monitor with a customizable interface"; homepage = "https://github.com/ClementTsang/bottom"; diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index b74089ae0a9..a4a5156525d 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , darwin , removeReferencesTo +, btop +, testers }: stdenv.mkDerivation rec { @@ -30,6 +32,10 @@ stdenv.mkDerivation rec { ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/bin/btop) ''; + passthru.tests.version = testers.testVersion { + package = btop; + }; + meta = with lib; { description = "A monitor of resources"; homepage = "https://github.com/aristocratos/btop";