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: 970b2b853d41
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: 89cb711b807f
Choose a head ref
  • 4 commits
  • 2 files changed
  • 4 contributors

Commits on Jul 26, 2020

  1. mate.atril: add support for more filetypes

    @dawidsowa
    dawidsowa committed Jul 26, 2020
    Copy the full SHA
    de98a63 View commit details

  2. hy: 0.18.0 -> 0.19.0

    @r-ryantm
    r-ryantm committed Jul 26, 2020
    Copy the full SHA
    20ec6b7 View commit details

Commits on Jul 27, 2020

  1. Merge pull request #93924 from r-ryantm/auto-update/hy 

    hy: 0.18.0 -> 0.19.0
    @ryantm
    ryantm authored Jul 27, 2020
    Copy the full SHA
    e12aa01 View commit details

  2. Merge pull request #93851 from dawidsowa/atril 

    mate.atril: add support for more filetypes
    @romildo
    romildo authored Jul 27, 2020
    Copy the full SHA
    89cb711 View commit details
Showing with 37 additions and 4 deletions.
  1. +35 −2 pkgs/desktops/mate/atril/default.nix
  2. +2 −2 pkgs/development/interpreters/hy/default.nix
37 changes: 35 additions & 2 deletions pkgs/desktops/mate/atril/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,25 @@
{ stdenv, fetchurl, pkgconfig, gettext, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, texlive, mate, wrapGAppsHook }:
{ stdenv
, fetchurl
, pkgconfig
, gettext
, gtk3
, glib
, libxml2
, libsecret
, poppler
, itstool
, hicolor-icon-theme
, texlive
, mate
, wrapGAppsHook
, enableEpub ? true, webkitgtk
, enableDjvu ? true, djvulibre
, enablePostScript ? true, libspectre
, enableXps ? true, libgxps
, enableImages ? false
}:

with stdenv.lib;

stdenv.mkDerivation rec {
pname = "atril";
@@ -26,7 +47,19 @@ stdenv.mkDerivation rec {
mate.mate-desktop
hicolor-icon-theme
texlive.bin.core # for synctex, used by the pdf back-end
];
]
++ optionals enableDjvu [ djvulibre ]
++ optionals enableEpub [ webkitgtk ]
++ optionals enablePostScript [ libspectre ]
++ optionals enableXps [ libgxps ]
;

configureFlags = [ ]
++ optionals (enableDjvu) [ "--enable-djvu" ]
++ optionals (enableEpub) [ "--enable-epub" ]
++ optionals (enablePostScript) [ "--enable-ps" ]
++ optionals (enableXps) [ "--enable-xps" ]
++ optionals (enableImages) [ "--enable-pixbuf" ];

NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

4 changes: 2 additions & 2 deletions pkgs/development/interpreters/hy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

python3Packages.buildPythonApplication rec {
pname = "hy";
version = "0.18.0";
version = "0.19.0";

src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "04dfwm336gw61fmgwikvh0cnxk682p19b4w555wl5d7mlym4rwj2";
sha256 = "05k05qmiiysiwdc05sxmanwhv1crfwbb3l8swxfisbzbvmv1snis";
};

checkInputs = with python3Packages; [ flake8 pytest ];