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

Commits on Oct 12, 2019

  1. system-config-printer: 1.5.11 -> 1.5.12 

    Source for the change of upstream url:
* zdohnal/system-config-printer is a fork of
OpenPrinting/system-config-printer
* This is what fedora did:
https://apps.fedoraproject.org/packages/system-config-printer/sources/spec/
(see changelog for  1.5.11-17)
    @symphorien
    symphorien committed Oct 12, 2019
    Copy the full SHA
    a24e9b6 View commit details

  2. nixos/system-config-printer: depends on packagekit

    @symphorien
    symphorien committed Oct 12, 2019
    Copy the full SHA
    1729506 View commit details

Commits on Oct 20, 2019

  1. Merge pull request #70931 from symphorien/system-config-printer 

    system-config-printer: 1.5.11 -> 1.5.12
    @worldofpeace
    worldofpeace authored Oct 20, 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
    64468d4 View commit details
Showing with 29 additions and 24 deletions.
  1. +3 −0 nixos/modules/services/desktops/system-config-printer.nix
  2. +26 −23 pkgs/tools/misc/system-config-printer/default.nix
  3. +0 −1 pkgs/top-level/all-packages.nix
3 changes: 3 additions & 0 deletions nixos/modules/services/desktops/system-config-printer.nix
View file
Original file line number Diff line number Diff line change
@@ -33,6 +33,9 @@ with lib;
pkgs.system-config-printer
];

# for $out/bin/install-printer-driver
services.packagekit.enable = true;

};

}
49 changes: 26 additions & 23 deletions pkgs/tools/misc/system-config-printer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,56 @@
{ stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook
{ stdenv, fetchFromGitHub, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook
, docbook_xml_dtd_412, docbook_xsl
, libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify
, gobject-introspection, libsecret
, gobject-introspection, libsecret, packagekit
, cups-filters
, pythonPackages
, python3Packages, autoreconfHook, bash
}:

stdenv.mkDerivation rec {
pname = "system-config-printer";
version = "1.5.11";
version = "1.5.12";

src = fetchurl {
url = "https://github.com/zdohnal/system-config-printer/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "1lq0q51bhanirpjjvvh4xiafi8hgpk8r32h0dj6dn3f32z8pib9q";
src = fetchFromGitHub {
owner = "openPrinting";
repo = pname;
rev = version;
sha256 = "1a812jsd9pb02jbz9bq16qj5j6k2kw44g7s1xdqqkg7061rd7mwf";
};

prePatch = ''
# for automake
touch README ChangeLog
# for tests
substituteInPlace Makefile.am --replace /bin/bash ${bash}/bin/bash
'';

patches = [ ./detect_serverbindir.patch ];

buildInputs = [
glib udev libusb1 cups
pythonPackages.python
libnotify gobject-introspection gdk-pixbuf pango atk
python3Packages.python
libnotify gobject-introspection gdk-pixbuf pango atk packagekit
libsecret
];

nativeBuildInputs = [
intltool pkgconfig
xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils
pythonPackages.wrapPython
wrapGAppsHook
python3Packages.wrapPython
wrapGAppsHook autoreconfHook
];

pythonPath = with pythonPackages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ];
pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ];

configureFlags = [
"--with-udev-rules"
"--with-udevdir=$(out)/etc/udev"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-udevdir=${placeholder "out"}/etc/udev"
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
];

stripDebugList = [ "bin" "lib" "etc/udev" ];

doCheck = false; # generates shebangs in check phase, too lazy to fix
doCheck = true;

postInstall =
''
@@ -54,20 +63,14 @@ stdenv.mkDerivation rec {
find $out/share/system-config-printer -name \*.py -type f -perm -0100 -print0 | while read -d "" f; do
patchPythonScript "$f"
done
# The below line will be unneeded when the next upstream release arrives.
sed -i -e "s|/usr/local/bin|$out/bin|" "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service"
# Manually expand literal "$(out)", which have failed to expand
sed -e "s|ExecStart=\$(out)|ExecStart=$out|" \
-i "$out/etc/systemd/system/configure-printer@.service"
patchPythonScript $out/etc/udev/udev-add-printer
substituteInPlace $out/etc/udev/rules.d/70-printers.rules \
--replace "udev-configure-printer" "$out/etc/udev/udev-configure-printer"
'';

meta = {
homepage = http://cyberelk.net/tim/software/system-config-printer/;
homepage = "https://github.com/openprinting/system-config-printer";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl2;
};
1 change: 0 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -6426,7 +6426,6 @@ in

system-config-printer = callPackage ../tools/misc/system-config-printer {
libxml2 = libxml2Python;
pythonPackages = python3Packages;
};

stricat = callPackage ../tools/security/stricat { };