Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5b19d1e46181
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7c3e8cda89db
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 6, 2019

  1. girara: 0.3.2 -> 0.3.3 

    Source URL and homepage also updated.
    @samdoshi
    samdoshi committed Oct 6, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1aa3e67 View commit details

  2. zathura: 0.4.3 -> 0.4.4 

    Source URL and homepage also updated.
    @samdoshi
    samdoshi committed Oct 6, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2678b8e View commit details

Commits on Oct 7, 2019

  1. Merge pull request #70530 from samdoshi/zathura 

    zathura 0.4.3 > 0.4.4 (and girara 0.3.2 -> 0.3.3)
    @globin
    globin authored Oct 7, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7c3e8cd View commit details
Showing with 8 additions and 8 deletions.
  1. +4 −4 pkgs/applications/misc/girara/default.nix
  2. +4 −4 pkgs/applications/misc/zathura/core/default.nix
8 changes: 4 additions & 4 deletions pkgs/applications/misc/girara/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
pname = "girara";
version = "0.3.2";
version = "0.3.3";

outputs = [ "out" "dev" ];

src = fetchurl {
url = "https://pwmt.org/projects/girara/download/${pname}-${version}.tar.xz";
sha256 = "1kc6n1mxjxa7wvwnqy94qfg8l9jvx9qrvrr2kc7m4g0z20x3a00p";
url = "https://git.pwmt.org/pwmt/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
sha256 = "13vr62kkkqs2xsrmsn114n6c6084ix1qyjksczqsc3s2y3bdsmj4";
};

nativeBuildInputs = [ meson ninja pkgconfig gettext check dbus xvfb_run ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
'';

meta = with stdenv.lib; {
homepage = https://pwmt.org/projects/girara/;
homepage = "https://git.pwmt.org/pwmt/girara";
description = "User interface library";
longDescription = ''
girara is a library that implements a GTK based VIM-like user interface
8 changes: 4 additions & 4 deletions pkgs/applications/misc/zathura/core/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,11 +10,11 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "zathura-core";
version = "0.4.3";
version = "0.4.4";

src = fetchurl {
url = "https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz";
sha256 = "0hgx5x09i6d0z45llzdmh4l348fxh1y102sb1w76f2fp4r21j4ky";
url = "https://git.pwmt.org/pwmt/zathura/-/archive/${version}/zathura-${version}.tar.gz";
sha256 = "0v5klgr009rsxi41h73k0398jbgmgh37asvwz2w15i4fzmw89jgb";
};

outputs = [ "bin" "man" "dev" "out" ];
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
doCheck = true;

meta = {
homepage = https://pwmt.org/projects/zathura/;
homepage = "https://git.pwmt.org/pwmt/zathura";
description = "A core component for zathura PDF viewer";
license = licenses.zlib;
platforms = platforms.unix;