From 1625dc93086db97190383a4b610bfa181decec8a Mon Sep 17 00:00:00 2001 From: linuxissuper Date: Sat, 2 Sep 2023 14:47:50 +0200 Subject: [PATCH 1/2] maintainers: add linuxissuper --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b99333277213..c0680df7817c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9849,6 +9849,13 @@ githubId = 725613; name = "Linus Arver"; }; + linuxissuper = { + email = "m+nix@linuxistcool.de"; + matrix = "@m:linuxistcool.de"; + github = "linuxissuper"; + githubId = 74221543; + name = "Moritz Goltdammer"; + }; lionello = { email = "lio@lunesu.com"; github = "lionello"; From cecfb9af77e07000d06d0f0c16298cddeb177d11 Mon Sep 17 00:00:00 2001 From: linuxissuper Date: Sat, 10 Jun 2023 19:27:17 +0200 Subject: [PATCH 2/2] sirikali: init at 1.5.1 --- pkgs/tools/security/sirikali/default.nix | 88 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 90 insertions(+) create mode 100644 pkgs/tools/security/sirikali/default.nix diff --git a/pkgs/tools/security/sirikali/default.nix b/pkgs/tools/security/sirikali/default.nix new file mode 100644 index 000000000000..a3e67a2b76a5 --- /dev/null +++ b/pkgs/tools/security/sirikali/default.nix @@ -0,0 +1,88 @@ +{ lib +, stdenv +, qtbase +, libpwquality +, hicolor-icon-theme +, fetchFromGitHub +, wrapQtAppsHook +, cmake +, pkg-config +, libgcrypt +, cryfs +, encfs +, fscrypt-experimental +, gocryptfs +, securefs +, sshfs +, libsecret +, kwallet +, withKWallet ? true +, withLibsecret ? true +}: + +stdenv.mkDerivation rec { + pname = "sirikali"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "mhogomchungu"; + repo = "sirikali"; + rev = version; + hash = "sha256-1bY8cCMMK4Jie4+9c7eUEBrPEYDaOqFHZ5252TPSotA="; + }; + + buildInputs = [ + qtbase + libpwquality + hicolor-icon-theme + libgcrypt + cryfs + encfs + fscrypt-experimental + gocryptfs + securefs + sshfs + ] + ++ lib.optionals withKWallet [ libsecret ] + ++ lib.optionals withLibsecret [ kwallet ] + ; + + nativeBuildInputs = [ + wrapQtAppsHook + cmake + pkg-config + ]; + + qtWrapperArgs = [ + ''--prefix PATH : ${lib.makeBinPath [ + cryfs + encfs + fscrypt-experimental + gocryptfs + securefs + sshfs + ]}'' + ]; + + postPatch = '' + substituteInPlace "src/engines.cpp" --replace "/sbin/" "/run/wrappers/bin/" + ''; + + doCheck = true; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=RELEASE" + "-DINTERNAL_LXQT_WALLET=false" + "-DNOKDESUPPORT=${if withKWallet then "false" else "true"}" + "-DNOSECRETSUPPORT=${if withLibsecret then "false" else "true"}" + "-DQT5=true" + ]; + + meta = with lib; { + description = "A Qt/C++ GUI front end to sshfs, ecryptfs-simple, cryfs, gocryptfs, securefs, fscrypt and encfs"; + homepage = "https://github.com/mhogomchungu/sirikali"; + changelog = "https://github.com/mhogomchungu/sirikali/blob/${src.rev}/changelog"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ linuxissuper ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 497ff2761007..f1d93a4330aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -42294,6 +42294,8 @@ with pkgs; dict-cc-py = callPackage ../applications/misc/dict-cc-py { }; + sirikali = libsForQt5.callPackage ../tools/security/sirikali { }; + wttrbar = callPackage ../applications/misc/wttrbar { }; wpm = callPackage ../applications/misc/wpm { };