From a9b20bb178ddefdc6f1b98c7efb3f0bd64b8e150 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 26 Mar 2024 17:13:50 +0100 Subject: apvlv: 0.1.5 -> 0.5.0 https://github.com/naihe2010/apvlv/compare/v0.1.5...v0.5.0-final --- pkgs/applications/misc/apvlv/default.nix | 114 ++++++++++++++------- .../misc/apvlv/fix-build-with-poppler-0.73.0.patch | 13 --- 2 files changed, 76 insertions(+), 51 deletions(-) delete mode 100644 pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index f45fb95aba59a..77632c4820ba3 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -1,50 +1,73 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, pcre, libxkbcommon, libepoxy -, gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence, wrapGAppsHook +{ + cmake, + copyDesktopItems, + ebook_tools, + fetchFromGitHub, + freetype, + ghostscript, + gtk3, + installShellFiles, + lib, + libepoxy, + libpthreadstubs, + libXdmcp, + libxkbcommon, + libxml2, + libxshmfence, + man, + nix-update-script, + pcre, + pkg-config, + poppler, + stdenv, + testers, + webkitgtk, + wrapGAppsHook, }: -stdenv.mkDerivation rec { - version = "0.1.5"; +stdenv.mkDerivation (finalAttrs: { pname = "apvlv"; + # If you change the version, please also update src.rev accordingly + version = "0.5.0"; + src = fetchFromGitHub { owner = "naihe2010"; repo = "apvlv"; - rev = "v${version}"; - sha256 = "1n4xiic8lqnv3mqi7wpdv866gyyakax71gffv3n9427rmcld465i"; + rev = "refs/tags/v0.5.0-final"; + hash = "sha256-5Wbv3dXieymhhPmEKQu8X/38WsDA1T/IBPoMXdpzcaA="; }; env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; nativeBuildInputs = [ cmake + copyDesktopItems + ghostscript + installShellFiles + man pkg-config wrapGAppsHook ]; buildInputs = [ - poppler pcre libxkbcommon libepoxy - freetype gtk3 - libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation - ]; - - patches = [ - (fetchpatch { - url = "https://github.com/naihe2010/apvlv/commit/d432635b9c5ea6c052a2ae1fb71aedec5c4ad57a.patch"; - sha256 = "1am8dgv2kkpqmm2vaysa61czx8ppdx94zb3c59sx88np50jpy70w"; - }) - (fetchpatch { - url = "https://github.com/naihe2010/apvlv/commit/4c7a583e8431964def482e5471f02e6de8e62a7b.patch"; - sha256 = "1dszm120lwm90hcg5zmd4vr6pjyaxc84qmb7k0fr59mmb3qif62j"; - }) - # fix build with gcc7 - (fetchpatch { - url = "https://github.com/naihe2010/apvlv/commit/a3a895772a27d76dab0c37643f0f4c73f9970e62.patch"; - sha256 = "1fpc7wr1ajilvwi5gjsy5g9jcx4bl03gp5dmajg90ljqbhwz2bfi"; - }) - ./fix-build-with-poppler-0.73.0.patch + ebook_tools + freetype + gtk3 + libepoxy + libpthreadstubs + libXdmcp + libxkbcommon + libxml2 + libxshmfence # otherwise warnings in compilation + pcre + poppler + webkitgtk ]; installPhase = '' + runHook preInstall + # binary mkdir -p $out/bin cp src/apvlv $out/bin/apvlv @@ -53,23 +76,38 @@ stdenv.mkDerivation rec { mkdir -p $out/share/doc/apvlv/ cp ../Startup.pdf $out/share/doc/apvlv/Startup.pdf cp ../main_menubar.glade $out/share/doc/apvlv/main_menubar.glade - '' - + lib.optionalString (!stdenv.isDarwin) '' - install -D ../apvlv.desktop $out/share/applications/apvlv.desktop + + mkdir -p $out/etc + cp ../apvlvrc.example $out/etc/apvlvrc + + installManPage ../apvlv.1 + + runHook postInstall ''; - meta = with lib; { - homepage = "http://naihe2010.github.io/apvlv/"; + desktopItems = [ + "../apvlv.desktop" + ]; + + passthru = { + tests.version = testers.testVersion { + command = "${lib.getExe finalAttrs.finalPackage} -v"; + package = finalAttrs.finalPackage; + version = "${finalAttrs.version}-rel"; + }; + }; + + meta = { + changelog = "https://github.com/naihe2010/apvlv/blob/v${finalAttrs.version}/NEWS"; description = "PDF viewer with Vim-like behaviour"; - mainProgram = "apvlv"; + homepage = "https://naihe2010.github.io/apvlv/"; + license = lib.licenses.lgpl2; longDescription = '' apvlv is a PDF/DJVU/UMD/TXT Viewer Under Linux/WIN32 with Vim-like behaviour. ''; - - license = licenses.lgpl2; - platforms = platforms.linux; - maintainers = [ maintainers.ardumont ]; + mainProgram = "apvlv"; + maintainers = with lib.maintainers; [ ardumont ]; + platforms = lib.platforms.linux; }; - -} +}) diff --git a/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch b/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch deleted file mode 100644 index d2a7831dca639..0000000000000 --- a/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/ApvlvPdf.cc b/src/ApvlvPdf.cc -index 765b112..83d133f 100644 ---- a/src/ApvlvPdf.cc -+++ b/src/ApvlvPdf.cc -@@ -29,7 +29,7 @@ - #include "ApvlvPdf.h" - - #ifndef POPPLER_WITH_GDK --#include -+#include - - static void - copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, -- cgit 1.4.1 From 0d86a49d54710edaa6f23e913dbe57671d3391f8 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 26 Mar 2024 17:12:12 +0100 Subject: apvlv: add anthonyroussel to maintainers --- pkgs/applications/misc/apvlv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index 77632c4820ba3..5771769323512 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { with Vim-like behaviour. ''; mainProgram = "apvlv"; - maintainers = with lib.maintainers; [ ardumont ]; + maintainers = with lib.maintainers; [ ardumont anthonyroussel ]; platforms = lib.platforms.linux; }; }) -- cgit 1.4.1 From bc2e4a537e0160fbf591aefb6c70d363f926147b Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 26 Mar 2024 17:10:47 +0100 Subject: apvlv: move to pkgs/by-name --- pkgs/applications/misc/apvlv/default.nix | 113 ------------------------------- pkgs/by-name/ap/apvlv/package.nix | 113 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 113 insertions(+), 115 deletions(-) delete mode 100644 pkgs/applications/misc/apvlv/default.nix create mode 100644 pkgs/by-name/ap/apvlv/package.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix deleted file mode 100644 index 5771769323512..0000000000000 --- a/pkgs/applications/misc/apvlv/default.nix +++ /dev/null @@ -1,113 +0,0 @@ -{ - cmake, - copyDesktopItems, - ebook_tools, - fetchFromGitHub, - freetype, - ghostscript, - gtk3, - installShellFiles, - lib, - libepoxy, - libpthreadstubs, - libXdmcp, - libxkbcommon, - libxml2, - libxshmfence, - man, - nix-update-script, - pcre, - pkg-config, - poppler, - stdenv, - testers, - webkitgtk, - wrapGAppsHook, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "apvlv"; - - # If you change the version, please also update src.rev accordingly - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "naihe2010"; - repo = "apvlv"; - rev = "refs/tags/v0.5.0-final"; - hash = "sha256-5Wbv3dXieymhhPmEKQu8X/38WsDA1T/IBPoMXdpzcaA="; - }; - - env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; - - nativeBuildInputs = [ - cmake - copyDesktopItems - ghostscript - installShellFiles - man - pkg-config - wrapGAppsHook - ]; - - buildInputs = [ - ebook_tools - freetype - gtk3 - libepoxy - libpthreadstubs - libXdmcp - libxkbcommon - libxml2 - libxshmfence # otherwise warnings in compilation - pcre - poppler - webkitgtk - ]; - - installPhase = '' - runHook preInstall - - # binary - mkdir -p $out/bin - cp src/apvlv $out/bin/apvlv - - # displays pdfStartup.pdf as default pdf entry - mkdir -p $out/share/doc/apvlv/ - cp ../Startup.pdf $out/share/doc/apvlv/Startup.pdf - cp ../main_menubar.glade $out/share/doc/apvlv/main_menubar.glade - - mkdir -p $out/etc - cp ../apvlvrc.example $out/etc/apvlvrc - - installManPage ../apvlv.1 - - runHook postInstall - ''; - - desktopItems = [ - "../apvlv.desktop" - ]; - - passthru = { - tests.version = testers.testVersion { - command = "${lib.getExe finalAttrs.finalPackage} -v"; - package = finalAttrs.finalPackage; - version = "${finalAttrs.version}-rel"; - }; - }; - - meta = { - changelog = "https://github.com/naihe2010/apvlv/blob/v${finalAttrs.version}/NEWS"; - description = "PDF viewer with Vim-like behaviour"; - homepage = "https://naihe2010.github.io/apvlv/"; - license = lib.licenses.lgpl2; - longDescription = '' - apvlv is a PDF/DJVU/UMD/TXT Viewer Under Linux/WIN32 - with Vim-like behaviour. - ''; - mainProgram = "apvlv"; - maintainers = with lib.maintainers; [ ardumont anthonyroussel ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/by-name/ap/apvlv/package.nix b/pkgs/by-name/ap/apvlv/package.nix new file mode 100644 index 0000000000000..5771769323512 --- /dev/null +++ b/pkgs/by-name/ap/apvlv/package.nix @@ -0,0 +1,113 @@ +{ + cmake, + copyDesktopItems, + ebook_tools, + fetchFromGitHub, + freetype, + ghostscript, + gtk3, + installShellFiles, + lib, + libepoxy, + libpthreadstubs, + libXdmcp, + libxkbcommon, + libxml2, + libxshmfence, + man, + nix-update-script, + pcre, + pkg-config, + poppler, + stdenv, + testers, + webkitgtk, + wrapGAppsHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "apvlv"; + + # If you change the version, please also update src.rev accordingly + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "naihe2010"; + repo = "apvlv"; + rev = "refs/tags/v0.5.0-final"; + hash = "sha256-5Wbv3dXieymhhPmEKQu8X/38WsDA1T/IBPoMXdpzcaA="; + }; + + env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; + + nativeBuildInputs = [ + cmake + copyDesktopItems + ghostscript + installShellFiles + man + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + ebook_tools + freetype + gtk3 + libepoxy + libpthreadstubs + libXdmcp + libxkbcommon + libxml2 + libxshmfence # otherwise warnings in compilation + pcre + poppler + webkitgtk + ]; + + installPhase = '' + runHook preInstall + + # binary + mkdir -p $out/bin + cp src/apvlv $out/bin/apvlv + + # displays pdfStartup.pdf as default pdf entry + mkdir -p $out/share/doc/apvlv/ + cp ../Startup.pdf $out/share/doc/apvlv/Startup.pdf + cp ../main_menubar.glade $out/share/doc/apvlv/main_menubar.glade + + mkdir -p $out/etc + cp ../apvlvrc.example $out/etc/apvlvrc + + installManPage ../apvlv.1 + + runHook postInstall + ''; + + desktopItems = [ + "../apvlv.desktop" + ]; + + passthru = { + tests.version = testers.testVersion { + command = "${lib.getExe finalAttrs.finalPackage} -v"; + package = finalAttrs.finalPackage; + version = "${finalAttrs.version}-rel"; + }; + }; + + meta = { + changelog = "https://github.com/naihe2010/apvlv/blob/v${finalAttrs.version}/NEWS"; + description = "PDF viewer with Vim-like behaviour"; + homepage = "https://naihe2010.github.io/apvlv/"; + license = lib.licenses.lgpl2; + longDescription = '' + apvlv is a PDF/DJVU/UMD/TXT Viewer Under Linux/WIN32 + with Vim-like behaviour. + ''; + mainProgram = "apvlv"; + maintainers = with lib.maintainers; [ ardumont anthonyroussel ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24c64d4e92873..131be81aa2e19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36028,8 +36028,6 @@ with pkgs; lua = lua5_3; }; - apvlv = callPackage ../applications/misc/apvlv { }; - xpdf = libsForQt5.callPackage ../applications/misc/xpdf { stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; -- cgit 1.4.1