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: 5ad2b732e9ed
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5f6ba36fd289
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Apr 9, 2020

  1. Merge #84773: thunderbird*: 68.6.0 -> 68.7.0

    https://www.thunderbird.net/en-US/thunderbird/68.7.0/releasenotes/
    (ATM it's unclear if there are any security fixes or not.)
    
    (cherry picked from commit f719350)
    Re-tested both on 20.03.
    vcunat committed Apr 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    8421672 View commit details
  2. Merge #82267: sane-airscan: init at 0.9.17

    (cherry picked from commit ab1a184)
    marsam authored and vcunat committed Apr 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    5f6ba36 View commit details
27 changes: 27 additions & 0 deletions pkgs/applications/graphics/sane/backends/airscan/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, avahi, libsoup, libjpeg
, sane-backends, meson, ninja }:
stdenv.mkDerivation rec {
pname = "sane-airscan";
version = "0.9.17";

nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ avahi libsoup libjpeg sane-backends ];

src = fetchFromGitHub {
owner = "alexpevzner";
repo = pname;
rev = version;
sha256 = "03y0c1z5s3wbvxa9nvji62w42cmvcgm2sw72j7wm831995q3abmx";
};

meta = with lib; {
homepage = "https://github.com/alexpevzner/sane-airscan";
description = "Scanner Access Now Easy - Apple AirScan (eSCL) driver";
longDescription = ''
sane-airscan: Linux support of Apple AirScan (eSCL) compatible document scanners.
'';
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ zaninime ];
};
}
Loading