From fb2a8bdf99042dd200b4bd0d930c8cca0d28f08c Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Mon, 23 Oct 2023 15:38:36 +0200 Subject: [PATCH 1/6] tomb: format with nixpkgs-fmt --- pkgs/os-specific/linux/tomb/default.nix | 30 ++++++++++++++++--------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index af04476aa1d0..5043d9e06551 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -1,5 +1,15 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper -, gettext, zsh, pinentry, cryptsetup, gnupg, util-linux, e2fsprogs, sudo +{ stdenv +, lib +, fetchFromGitHub +, makeWrapper +, gettext +, zsh +, pinentry +, cryptsetup +, gnupg +, util-linux +, e2fsprogs +, sudo }: stdenv.mkDerivation rec { @@ -7,9 +17,9 @@ stdenv.mkDerivation rec { version = "2.9"; src = fetchFromGitHub { - owner = "dyne"; - repo = "Tomb"; - rev = "v${version}"; + owner = "dyne"; + repo = "Tomb"; + rev = "v${version}"; sha256 = "0d6vmfcf4kd0p2bcljmdnyc2fmbwvar81cc472zx86r7yc3ih102"; }; @@ -27,18 +37,18 @@ stdenv.mkDerivation rec { installCheckPhase = "$out/bin/tomb -h"; installPhase = '' - install -Dm755 tomb $out/bin/tomb + install -Dm755 tomb $out/bin/tomb install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1 wrapProgram $out/bin/tomb \ - --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext gnupg pinentry util-linux e2fsprogs ]} + --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup e2fsprogs gettext gnupg pinentry util-linux ]} ''; meta = with lib; { description = "File encryption on GNU/Linux"; - homepage = "https://www.dyne.org/software/tomb/"; - license = licenses.gpl3; + homepage = "https://www.dyne.org/software/tomb/"; + license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } From 9481b1fe8f013a8639697ef4ccbef0309d7cf916 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Mon, 23 Oct 2023 15:39:36 +0200 Subject: [PATCH 2/6] tomb: 2.9 -> 2.10 https://github.com/dyne/Tomb/blob/master/ChangeLog.md#210 https://github.com/dyne/Tomb/compare/v2.9...v2.10 --- pkgs/os-specific/linux/tomb/default.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 5043d9e06551..485f4288cfaa 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -1,29 +1,34 @@ { stdenv , lib , fetchFromGitHub +, substituteAll , makeWrapper +, getent , gettext , zsh , pinentry , cryptsetup , gnupg +, libargon2 +, lsof , util-linux , e2fsprogs -, sudo +, testers +, nix-update-script }: stdenv.mkDerivation rec { pname = "tomb"; - version = "2.9"; + version = "2.10"; src = fetchFromGitHub { owner = "dyne"; repo = "Tomb"; - rev = "v${version}"; - sha256 = "0d6vmfcf4kd0p2bcljmdnyc2fmbwvar81cc472zx86r7yc3ih102"; + rev = "refs/tags/v${version}"; + hash = "sha256-lLxQJX0P6b6lbXEcrq45EsX9iKiayZ9XkhqgMfpN3/w="; }; - buildInputs = [ sudo zsh pinentry ]; + buildInputs = [ zsh pinentry ]; nativeBuildInputs = [ makeWrapper ]; @@ -33,20 +38,18 @@ stdenv.mkDerivation rec { --replace 'TOMBEXEC=$0' 'TOMBEXEC=tomb' ''; - doInstallCheck = true; - installCheckPhase = "$out/bin/tomb -h"; - installPhase = '' install -Dm755 tomb $out/bin/tomb install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1 wrapProgram $out/bin/tomb \ - --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup e2fsprogs gettext gnupg pinentry util-linux ]} + --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup e2fsprogs getent gettext gnupg libargon2 lsof pinentry util-linux ]} ''; meta = with lib; { description = "File encryption on GNU/Linux"; homepage = "https://www.dyne.org/software/tomb/"; + changelog = "https://github.com/dyne/Tomb/blob/v${version}/ChangeLog.md"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; From 7f18b54727837b6af22cb7d806980f89f57b1155 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 18 Oct 2023 02:55:08 +0200 Subject: [PATCH 3/6] tomb: add passthru.updateScript --- pkgs/os-specific/linux/tomb/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 485f4288cfaa..f501b2ba5a31 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -13,7 +13,6 @@ , lsof , util-linux , e2fsprogs -, testers , nix-update-script }: @@ -46,11 +45,16 @@ stdenv.mkDerivation rec { --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup e2fsprogs getent gettext gnupg libargon2 lsof pinentry util-linux ]} ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "File encryption on GNU/Linux"; homepage = "https://www.dyne.org/software/tomb/"; changelog = "https://github.com/dyne/Tomb/blob/v${version}/ChangeLog.md"; license = licenses.gpl3; + mainProgram = "tomb"; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; }; From 42ad64f5d1eefc7e8aeb664dbcb8833377f7870a Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 18 Oct 2023 02:56:12 +0200 Subject: [PATCH 4/6] tomb: add anthonyroussel to maintainers --- pkgs/os-specific/linux/tomb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index f501b2ba5a31..5fff28c3f276 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/dyne/Tomb/blob/v${version}/ChangeLog.md"; license = licenses.gpl3; mainProgram = "tomb"; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg anthonyroussel ]; platforms = platforms.linux; }; } From 99c8b3b70a3d0989dfcd7dcf31e6b344af4f7085 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 27 Oct 2023 21:15:01 +0200 Subject: [PATCH 5/6] tomb: add all required dependencies with wrapProgram --- pkgs/os-specific/linux/tomb/default.nix | 28 ++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 5fff28c3f276..4fad6e7547ea 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -3,16 +3,20 @@ , fetchFromGitHub , substituteAll , makeWrapper +, zsh +, coreutils +, cryptsetup +, e2fsprogs +, file +, gawk , getent , gettext -, zsh -, pinentry -, cryptsetup +, gnugrep , gnupg , libargon2 , lsof +, pinentry , util-linux -, e2fsprogs , nix-update-script }: @@ -42,7 +46,21 @@ stdenv.mkDerivation rec { install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1 wrapProgram $out/bin/tomb \ - --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup e2fsprogs getent gettext gnupg libargon2 lsof pinentry util-linux ]} + --prefix PATH : $out/bin:${lib.makeBinPath [ + coreutils + cryptsetup + e2fsprogs + file + gawk + getent + gettext + gnugrep + gnupg + libargon2 + lsof + pinentry + util-linux + ]} ''; passthru = { From db4c847f869761e50042264d86230fbb1b000d58 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 10 Nov 2023 00:06:46 +0100 Subject: [PATCH 6/6] tomb: fix meta.license --- pkgs/os-specific/linux/tomb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 4fad6e7547ea..9c97377cfe04 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { description = "File encryption on GNU/Linux"; homepage = "https://www.dyne.org/software/tomb/"; changelog = "https://github.com/dyne/Tomb/blob/v${version}/ChangeLog.md"; - license = licenses.gpl3; + license = licenses.gpl3Only; mainProgram = "tomb"; maintainers = with maintainers; [ peterhoeg anthonyroussel ]; platforms = platforms.linux;