Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6e673204e8c7
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 70b5f9584d92
Choose a head ref
  • 8 commits
  • 4 files changed
  • 6 contributors

Commits on Jul 6, 2020

  1. gscan2pdf: 2.6.5 -> 2.8.0

    @pacien
    pacien committed Jul 6, 2020
    Copy the full SHA
    a564ea2 View commit details

  2. marktext: 0.16.0-rc.2 -> 0.16.1. 

    The upgrade apparently made it necessary to also add `XDG_DATA_DIRS`
to fix the crash mentioned in the added comment.

I copied this solution from:
`pkgs/applications/misc/devdocs-desktop/default.nix`
    @nh2
    nh2 committed Jul 6, 2020
    Copy the full SHA
    42a7167 View commit details

  3. marktext: 0.16.1 -> 0.16.2

    @nh2
    nh2 committed Jul 6, 2020
    Copy the full SHA
    8da4950 View commit details

  4. agave: 14 -> 15 

    https://github.com/agarick/agave/releases/tag/v15
(cherry picked from commit 14ac1cc7e2882a4a09584c58b08f015e94be32f3)
    @dtzWill
    dtzWill committed Jul 6, 2020

    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
    bc49e1f View commit details

Commits on Jul 7, 2020

  1. Merge pull request #83701 from nh2/marktext-0.16.1 

    marktext: 0.16.0-rc.2 -> 0.16.2
    @srhb
    srhb authored Jul 7, 2020

    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
    7ae0fa1 View commit details

  2. Merge pull request #92521 from dtzWill/update/agave-15 

    agave: 14 -> 15
    @danieldk
    danieldk authored Jul 7, 2020

    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
    f1ceb02 View commit details

  3. libsForQt5.qwt: 6.1.4 -> 6.1.5

    @r-ryantm @bjornfor
    r-ryantm authored and bjornfor committed Jul 7, 2020
    Copy the full SHA
    049b68b View commit details

  4. Merge pull request #92471 from pacien/gscan2pdf-v2.8.0 

    gscan2pdf: 2.6.5 -> 2.8.0
    @danieldk
    danieldk authored Jul 7, 2020

    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
    70b5f95 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/gscan2pdf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,11 +10,11 @@ with stdenv.lib;

perlPackages.buildPerlPackage rec {
pname = "gscan2pdf";
version = "2.6.5";
version = "2.8.0";

src = fetchurl {
url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz";
sha256 = "0x8931i5zs4zl3iqjhlp7h8y6ssklxiqsddz5kh84nl3p0izbg0y";
sha256 = "0rqx41hkppil3lp1dhkxwlhv0kwp8w8fkgzlapryq1yd9pgkx6lw";
};

nativeBuildInputs = [ wrapGAppsHook ];
12 changes: 9 additions & 3 deletions pkgs/applications/misc/marktext/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
{ appimageTools, fetchurl, lib }:
{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }:

let
pname = "marktext";
version = "v0.16.0-rc.2";
version = "v0.16.2";
in
appimageTools.wrapType2 rec {
name = "${pname}-${version}-binary";

src = fetchurl {
url = "https://github.com/marktext/marktext/releases/download/${version}/marktext-x86_64.AppImage";
sha256 = "1w1mxa1j94zr36xhvlhzq8d77pi359vdxqb2j8mnz2bib9khxk9k";
sha256 = "0ivf9lvv2jk7dvxmqprzcsxgya3617xmx5bppjvik44z14b5x8r7";
};

profile = ''
export LC_ALL=C.UTF-8
''
# Fixes file open dialog error
# GLib-GIO-ERROR **: 20:36:48.243: No GSettings schemas are installed on the system
# See https://github.com/NixOS/nixpkgs/pull/83701#issuecomment-608034097
+ ''
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';

multiPkgs = null; # no 32bit needed
4 changes: 2 additions & 2 deletions pkgs/data/fonts/agave/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

let
pname = "agave";
version = "14";
version = "15";
in fetchurl {
name = "${pname}-${version}";
url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf";
@@ -13,7 +13,7 @@ in fetchurl {
install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf
'';

sha256 = "14hr6cdn5xbfpszj4qyfqbwmjyrkmi83yl0g9j3y3jw561jwy27j";
sha256 = "0xphr465qnwf1yhin3hml1nn9ypjk3n0i4bs38glx5b5swrhlmhk";

meta = with lib; {
description = "truetype monospaced typeface designed for X environments";
4 changes: 2 additions & 2 deletions pkgs/development/libraries/qwt/6.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }:

stdenv.mkDerivation rec {
name = "qwt-6.1.4";
name = "qwt-6.1.5";

src = fetchurl {
url = "mirror://sourceforge/qwt/${name}.tar.bz2";
sha256 = "1navkcnmn0qz8kzsyqmk32d929zl72l0b580w1ica7z5559j2a8m";
sha256 = "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0";
};

propagatedBuildInputs = [ qtbase qtsvg qttools ];