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: 72450025dd35
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1b1cc34020a0
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 9, 2017

  1. python/pyinsane2: 2.0.9 -> 2.0.10 

    Upstream changes:

  * Now works with 'setup.py develop' (thanks to Matthieu Coudron)
  * WIA: Some drivers (Lexmark for instance) returns
    WIA_ERROR_PAPER_EMPTY when calling transfer->Download() instead of
    returning a shorted image (like HP)
  * MacOSX + Sane: disable dedicated process workaround (doesn't work)
  * WIA: Minor optimisation (Use collections.deque() instead of
    list.pop())
  * Sane/exit(): Exit gracefully

Full changelog can be found at:

https://github.com/openpaperwork/pyinsane/blob/2.0.10/ChangeLog

Tested by building and running a few scans.

Signed-off-by: aszlig <aszlig@nix.build>
    @aszlig
    aszlig committed Nov 9, 2017
    Copy the full SHA
    c1d12e1 View commit details

  2. paperwork(-backend): 1.2 -> 1.2.1 

    Upstream changes:

  Paperwork-GUI 1.2.1:

   * Add source code of Windows installer (NSIS installer) generator
   * Scanner support / Multi-scan: Cancel also successful scan session.
     Otherwise some scanner won't allow new scan sessions later.
   * Remove gi version warnings when starting (thanks to Matthieu
     Coudron)
   * Documentation: Add missing stdeb dependencies (thanks to Notkea)
   * paperwork-shell: Fix command 'scan'
   * paperwork-shell install: add docstring
   * Fix dialog 'about'

  Paperwork-backend 1.2.1:

   * paperwork-shell: improve help string of 'paperwork-shell chkdeps'
   * Fix label deletion / renaming
   * Windows: Fix FS.safe() when used for PDF import
   * Windows: Fix FS.unsafe() (used for PDF export)

Full upstream changelog can be found at:

https://github.com/openpaperwork/paperwork/releases/tag/1.2.1

Successfully tested building and running Paperwork with a few test
scans.

Signed-off-by: aszlig <aszlig@nix.build>
    @aszlig
    aszlig committed Nov 9, 2017
    2

    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
    1b1cc34 View commit details
Showing with 15 additions and 12 deletions.
  1. +8 −5 pkgs/applications/office/paperwork/default.nix
  2. +7 −7 pkgs/top-level/python-packages.nix
13 changes: 8 additions & 5 deletions pkgs/applications/office/paperwork/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{ lib, python3Packages, fetchFromGitHub, gtk3, cairo
, aspellDicts, buildEnv
, gnome3, hicolor_icon_theme
, gnome3, hicolor_icon_theme, librsvg
, xvfb_run, dbus, libnotify
}:

python3Packages.buildPythonApplication rec {
name = "paperwork-${version}";
# Don't forget to also update paperwork-backend when updating this!
version = "1.2";
version = "1.2.1";

src = fetchFromGitHub {
repo = "paperwork";
owner = "jflesch";
owner = "openpaperwork";
rev = version;
sha256 = "1cb9wnhhpm3dyxjrkyl9bbva56xx85vlwlb7z07m1icflcln14x5";
sha256 = "0lqnq74hdjj778j2k0syibwy4i37l8w932gmibs8617s4yi34rxz";
};

# Patch out a few paths that assume that we're using the FHS:
@@ -47,7 +47,9 @@ python3Packages.buildPythonApplication rec {
}}/lib/aspell";

checkInputs = [ xvfb_run dbus.daemon ];
buildInputs = [ gnome3.defaultIconTheme hicolor_icon_theme libnotify ];
buildInputs = [
gnome3.defaultIconTheme hicolor_icon_theme libnotify librsvg
];

# A few parts of chkdeps need to have a display and a dbus session, so we not
# only need to run a virtual X server + dbus but also have a large enough
@@ -64,6 +66,7 @@ python3Packages.buildPythonApplication rec {

makeWrapperArgs = [
"--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
"--set GDK_PIXBUF_MODULE_FILE \"$GDK_PIXBUF_MODULE_FILE\""
"--prefix XDG_DATA_DIRS : \"$out/share\""
"--suffix XDG_DATA_DIRS : \"$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\""
];
14 changes: 7 additions & 7 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -6520,13 +6520,13 @@ in {

paperwork-backend = buildPythonPackage rec {
name = "paperwork-backend-${version}";
version = "1.2.0";
version = "1.2.1";

src = pkgs.fetchFromGitHub {
owner = "jflesch";
owner = "openpaperwork";
repo = "paperwork-backend";
rev = version;
sha256 = "1pzyy14f9wzh9vwn855k1z48a8mbs73j1dk8730kdlcdkmn3l1ms";
sha256 = "1lrawibm6jnykj1bkrl8196kcxrhndzp7r0brdrb4hs54gql7j5x";
};

# Python 2.x is not supported.
@@ -16043,21 +16043,21 @@ in {

pyinsane2 = buildPythonPackage rec {
name = "pyinsane2-${version}";
version = "2.0.9";
version = "2.0.10";

src = pkgs.fetchurl {
url = "mirror://pypi/p/pyinsane2/${name}.tar.gz";
sha256 = "1g4a1zhrrs7smmnsm7x8j5lvsz0r6rr2jgjykc9c1jlscz3yr747";
sha256 = "00d1wqb3w9bn1rxb2dwmdqbar2lr96izq855l5vzprc17dkgip3j";
};

postPatch = ''
# pyinsane2 forks itself, so we need to re-inject the PYTHONPATH.
sed -i -e '/os.putenv.*PYINSANE_DAEMON/ {
a \ os.putenv("PYTHONPATH", ":".join(sys.path))
}' src/pyinsane2/sane/abstract_proc.py
}' pyinsane2/sane/abstract_proc.py

sed -i -e 's,"libsane.so.1","${pkgs.sane-backends}/lib/libsane.so",' \
src/pyinsane2/sane/rawapi.py
pyinsane2/sane/rawapi.py
'';

# Tests require a scanner to be physically connected, so let's just do a