From 24fa239c8cf1c183a32bae1f64b8bb5def0d5ba7 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Thu, 9 Jan 2025 01:17:16 +0300 Subject: [PATCH 1/3] stenc: 1.1.1 -> 2.0.0 --- pkgs/by-name/st/stenc/package.nix | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/st/stenc/package.nix b/pkgs/by-name/st/stenc/package.nix index b1d15c56f65b..0810cf135b77 100644 --- a/pkgs/by-name/st/stenc/package.nix +++ b/pkgs/by-name/st/stenc/package.nix @@ -4,27 +4,31 @@ fetchFromGitHub, gitUpdater, autoreconfHook, + pkg-config, + pandoc, }: stdenv.mkDerivation rec { pname = "stenc"; - version = "1.1.1"; + version = "2.0.0"; + + outputs = [ + "out" + "man" + ]; src = fetchFromGitHub { owner = "scsitape"; repo = "stenc"; - rev = version; - sha256 = "GcCRVkv+1mREq3MhMRn5fICthwI4WRQJSP6InuzxP1Q="; + tag = version; + sha256 = "sha256-L0g285H8bf3g+HDYUDRWBZMOBCnWz3Vm38Ijttu404U="; }; - postPatch = '' - # Fix gcc-13 build by pulling missing header. UPstream also fixed it - # in next major version, but there are many other patch dependencies. - # TODO: remove on next major version update - sed -e '1i #include ' -i src/scsiencrypt.h - ''; - - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + pandoc + ]; passthru.updateScript = gitUpdater { }; From 1b11f871e53cd3385251bcbb58848ee6948858f3 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Thu, 9 Jan 2025 01:21:58 +0300 Subject: [PATCH 2/3] stenc: enable tests --- pkgs/by-name/st/stenc/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/st/stenc/package.nix b/pkgs/by-name/st/stenc/package.nix index 0810cf135b77..404fc89b303f 100644 --- a/pkgs/by-name/st/stenc/package.nix +++ b/pkgs/by-name/st/stenc/package.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { pandoc ]; + doCheck = true; + passthru.updateScript = gitUpdater { }; meta = { From 4a7f6d997ae8b996eaee4960fd2180d7bf05ccab Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Thu, 9 Jan 2025 01:33:45 +0300 Subject: [PATCH 3/3] stenc: install bash completions --- pkgs/by-name/st/stenc/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/st/stenc/package.nix b/pkgs/by-name/st/stenc/package.nix index 404fc89b303f..58c82ca15e54 100644 --- a/pkgs/by-name/st/stenc/package.nix +++ b/pkgs/by-name/st/stenc/package.nix @@ -6,6 +6,7 @@ autoreconfHook, pkg-config, pandoc, + installShellFiles, }: stdenv.mkDerivation rec { @@ -28,10 +29,15 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config pandoc + installShellFiles ]; doCheck = true; + postInstall = '' + installShellCompletion --bash bash-completion/stenc + ''; + passthru.updateScript = gitUpdater { }; meta = {