From 4b1a7d1498f04f1c0b4e06ea614dc13d730a2674 Mon Sep 17 00:00:00 2001 From: Dominik Schrempf Date: Fri, 26 Feb 2021 21:49:42 +0100 Subject: [PATCH 1/2] vimiv-qt: init at 0.8.0 untabify fix maintainer fix maintainer-list don't use expression for owner (but why did it not work?) space before operator Co-authored-by: Sandro no quotation marks Co-authored-by: Sandro reduce comment Co-authored-by: Sandro quotation marks and for loop in custom post install script Co-authored-by: Sandro python38Packages Co-authored-by: Sandro don't bring python39 into scope Co-authored-by: Sandro formatting Co-authored-by: Sandro description rm dschrempf for separate commit use qt5 prefix installShellFiles python39Packages -> python3 share installShellFiles --- .../graphics/vimiv-qt/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/applications/graphics/vimiv-qt/default.nix diff --git a/pkgs/applications/graphics/vimiv-qt/default.nix b/pkgs/applications/graphics/vimiv-qt/default.nix new file mode 100644 index 00000000000..8e0caff1d17 --- /dev/null +++ b/pkgs/applications/graphics/vimiv-qt/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, lib +, fetchFromGitHub +, python3 +, qt5 +, installShellFiles +}: + +python3.pkgs.buildPythonApplication rec { + pname = "vimiv-qt"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "karlch"; + repo = pname; + rev = "v${version}"; + sha256 = "1pj3gak7nxkw9r9m71zsfvcaq8dk9crbk5rz4n7pravxkl5hs2bg"; + }; + + nativeBuildInputs = [ installShellFiles qt5.wrapQtAppsHook python3.pkgs.setuptools ]; + + propagatedBuildInputs = with python3.pkgs; [ pyqt5 py3exiv2 qt5.qtsvg ]; + + postInstall = '' + install -Dm644 misc/vimiv.desktop $out/share/applications/vimiv.desktop + install -Dm644 misc/org.karlch.vimiv.qt.metainfo.xml $out/metainfo/org.karlch.vimiv.qt.metainfo.xml + install -Dm644 LICENSE $out/licenses/vimiv/LICENSE + install -Dm644 icons/vimiv.svg $out/icons/hicolor/scalable/apps/vimiv.svg + installManPage misc/vimiv.1 + + for i in 16 32 64 128 256 512; do + install -Dm644 icons/vimiv_''${i}x''${i}.png $out/icons/hicolor/''${i}x''${i}/apps/vimiv.png + done + ''; + + # Vimiv has to be wrapped manually because it is a non-ELF executable. + dontWrapQtApps = true; + preFixup = '' + wrapQtApp $out/bin/vimiv + ''; + + meta = with lib; { + description = "Image viewer with Vim-like keybindings (Qt port)"; + license = licenses.gpl3Plus; + homepage = "https://github.com/karlch/vimiv-qt"; + maintainers = with maintainers; [ dschrempf ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8433db5235..9d7f4ea71e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25588,6 +25588,8 @@ in vimiv = callPackage ../applications/graphics/vimiv { }; + vimiv-qt = callPackage ../applications/graphics/vimiv-qt { }; + macvim = callPackage ../applications/editors/vim/macvim-configurable.nix { stdenv = clangStdenv; }; vimHugeX = vim_configurable; From e9b96bfaca290eec7d70496708c82f75660b0c30 Mon Sep 17 00:00:00 2001 From: Dominik Schrempf Date: Mon, 1 Mar 2021 14:40:49 +0100 Subject: [PATCH 2/2] maintainers: add dschrempf alphabetical maintainer list --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2d122346fca..9c98d9e0b02 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2473,6 +2473,16 @@ githubId = 10198051; name = "Drew Risinger"; }; + dschrempf = { + name = "Dominik Schrempf"; + email = "dominik.schrempf@gmail.com"; + github = "dschrempf"; + githubId = 5596239; + keys = [{ + longkeyid = "rsa2048/0x875F2BCF163F1B29"; + fingerprint = "62BC E2BD 49DF ECC7 35C7 E153 875F 2BCF 163F 1B29"; + }]; + }; dsferruzza = { email = "david.sferruzza@gmail.com"; github = "dsferruzza";