public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:nixos/nixpkgs

Browse Source
This commit is contained in:
John Ericson 2020-03-25 11:51:19 -04:00
commit e95ccab981
7 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/zathura/cb/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "0.1.8"; version = "0.1.8";
src = fetchurl { src = fetchurl {
url = "https://pwmt.org/projects/zathura/plugins/download/${pname}-${version}.tar.xz"; url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
sha256 = "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5"; sha256 = "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5";
}; };
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";
meta = with lib; { meta = with lib; {
homepage = https://pwmt.org/projects/zathura-cb/; homepage = "https://pwmt.org/projects/zathura-cb/";
description = "A zathura CB plugin"; description = "A zathura CB plugin";
longDescription = '' longDescription = ''
The zathura-cb plugin adds comic book support to zathura. The zathura-cb plugin adds comic book support to zathura.

10
pkgs/applications/misc/zathura/core/default.nix
View File

@ -9,12 +9,12 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zathura-core"; pname = "zathura";
version = "0.4.4"; version = "0.4.5";
src = fetchurl { src = fetchurl {
url = "https://git.pwmt.org/pwmt/zathura/-/archive/${version}/zathura-${version}.tar.gz"; url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
sha256 = "0v5klgr009rsxi41h73k0398jbgmgh37asvwz2w15i4fzmw89jgb"; sha256 = "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c";
}; };
outputs = [ "bin" "man" "dev" "out" ]; outputs = [ "bin" "man" "dev" "out" ];
@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
"-Dmanpages=enabled" "-Dmanpages=enabled"
"-Dconvert-icon=enabled" "-Dconvert-icon=enabled"
"-Dsynctex=enabled" "-Dsynctex=enabled"
# Make sure tests are enabled for doCheck
"-Dtests=enabled"
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

9
pkgs/applications/misc/zathura/djvu/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: { stdenv, fetchurl, meson, ninja, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "zathura-djvu-0.2.8"; pname = "zathura-djvu";
version = "0.2.9";
src = fetchurl { src = fetchurl {
url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
sha256 = "0axkv1crdxn0z44whaqp2ibkdqcykhjnxk7qzms0dp1b67an9rnh"; sha256 = "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln";
}; };
nativeBuildInputs = [ meson ninja pkgconfig ]; nativeBuildInputs = [ meson ninja pkgconfig ];
@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://pwmt.org/projects/zathura-djvu/; homepage = "https://pwmt.org/projects/zathura-djvu/";
description = "A zathura DJVU plugin"; description = "A zathura DJVU plugin";
longDescription = '' longDescription = ''
The zathura-djvu plugin adds DjVu support to zathura by using the The zathura-djvu plugin adds DjVu support to zathura by using the

17
pkgs/applications/misc/zathura/pdf-mupdf/default.nix
View File

@ -1,20 +1,13 @@
{ stdenv, lib, meson, ninja, fetchFromGitHub { stdenv, lib, meson, ninja, fetchurl
, pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }: , pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.3.5"; version = "0.3.5";
pname = "zathura-pdf-mupdf"; pname = "zathura-pdf-mupdf";
# pwmt.org server was down at the time of last update src = fetchurl {
# src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
# url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.xz"; sha256 = "1pjwsb7zwclxsvz229fl7y2saf1pv3ifwv3ay8viqxgrp9x3z9hq";
# sha256 = "1zbaqimav4wfgimpy3nfzl10qj7vyv23rdy2z5z7z93jwbp2rc2j";
# };
src = fetchFromGitHub {
owner = "pwmt";
repo = "zathura-pdf-mupdf";
rev = version;
sha256 = "0wb46hllykbi30ir69s8s23mihivqn13mgfdzawbsn2a21p8y4zl";
}; };
nativeBuildInputs = [ meson ninja pkgconfig ]; nativeBuildInputs = [ meson ninja pkgconfig ];
@ -26,7 +19,7 @@ stdenv.mkDerivation rec {
PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura"; PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura";
meta = with lib; { meta = with lib; {
homepage = https://pwmt.org/projects/zathura-pdf-mupdf/; homepage = "https://pwmt.org/projects/zathura-pdf-mupdf/";
description = "A zathura PDF plugin (mupdf)"; description = "A zathura PDF plugin (mupdf)";
longDescription = '' longDescription = ''
The zathura-pdf-mupdf plugin adds PDF support to zathura by The zathura-pdf-mupdf plugin adds PDF support to zathura by

8
pkgs/applications/misc/zathura/pdf-poppler/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, poppler }: { stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, poppler }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.2.9";
pname = "zathura-pdf-poppler"; pname = "zathura-pdf-poppler";
version = "0.3.0";
src = fetchurl { src = fetchurl {
url = "https://git.pwmt.org/pwmt/zathura-pdf-poppler/-/archive/${version}/${pname}-${version}.tar.gz"; url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
sha256 = "0c15rnwh42m3ybrhax01bl36w0iynaq8xg6l08riml3cyljypi9l"; sha256 = "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m";
}; };
nativeBuildInputs = [ meson ninja pkgconfig zathura_core ]; nativeBuildInputs = [ meson ninja pkgconfig zathura_core ];
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";
meta = with lib; { meta = with lib; {
homepage = https://pwmt.org/projects/zathura-pdf-poppler/; homepage = "https://pwmt.org/projects/zathura-pdf-poppler/";
description = "A zathura PDF plugin (poppler)"; description = "A zathura PDF plugin (poppler)";
longDescription = '' longDescription = ''
The zathura-pdf-poppler plugin adds PDF support to zathura by The zathura-pdf-poppler plugin adds PDF support to zathura by

7
pkgs/applications/misc/zathura/ps/default.nix
View File

@ -1,10 +1,11 @@
{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, libspectre, gettext }: { stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, libspectre, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "zathura-ps-0.2.6"; pname = "zathura-ps";
version = "0.2.6";
src = fetchurl { src = fetchurl {
url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
sha256 = "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y"; sha256 = "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y";
}; };
@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";
meta = with lib; { meta = with lib; {
homepage = https://pwmt.org/projects/zathura-ps/; homepage = "https://pwmt.org/projects/zathura-ps/";
description = "A zathura PS plugin"; description = "A zathura PS plugin";
longDescription = '' longDescription = ''
The zathura-ps plugin adds PS support to zathura by using the The zathura-ps plugin adds PS support to zathura by using the

2
pkgs/applications/misc/zathura/wrapper.nix
View File

@ -8,6 +8,8 @@ in symlinkJoin {
paths = with zathura_core; [ man dev out ]; paths = with zathura_core; [ man dev out ];
inherit plugins;
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
postBuild = '' postBuild = ''