diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index 0428602688d..56504cd2361 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -4,7 +4,9 @@ with lib; let - pkg = if config.hardware.sane.snapshot then pkgs.saneBackendsGit else pkgs.saneBackends; + pkg = if config.hardware.sane.snapshot + then pkgs.sane-backends-git + else pkgs.sane-backends; backends = [ pkg ] ++ config.hardware.sane.extraBackends; saneConfig = pkgs.mkSaneConfig { paths = backends; }; diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index bacfa500ede..b0ad5be9371 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp -, pkgconfig, freetype, fontconfig, which, imagemagick, curl, saneBackends +, pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig which ]; buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp - imagemagick curl saneBackends + imagemagick curl sane-backends ]; makeFlags = [ "prefix=$(out)" "verbose=yes" ]; diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index a0f6e5bac50..d7b06622055 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, saneBackends, libX11, gtk, pkgconfig, libusb ? null}: +{ stdenv, fetchurl, sane-backends, libX11, gtk, pkgconfig, libusb ? null}: stdenv.mkDerivation rec { name = "sane-frontends-1.0.14"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c ''; - buildInputs = [saneBackends libX11 gtk pkgconfig] ++ + buildInputs = [sane-backends libX11 gtk pkgconfig] ++ (if libusb != null then [libusb] else []); meta = { diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 9bca047a7cf..85b23e3c2f2 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, saneBackends, saneFrontends, libX11, gtk, pkgconfig, libpng +{ stdenv, fetchurl, sane-backends, saneFrontends, libX11, gtk, pkgconfig, libpng , libusb ? null , gimpSupport ? false, gimp_2_8 ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { chmod a+rX -R . ''; - buildInputs = [libpng saneBackends saneFrontends libX11 gtk pkgconfig ] + buildInputs = [libpng sane-backends saneFrontends libX11 gtk pkgconfig ] ++ (if libusb != null then [libusb] else []) ++ stdenv.lib.optional gimpSupport gimp_2_8; diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index c169d262fb6..3fe8c06ca63 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool -, libusb1, libxml2, pkgconfig, saneBackends, vala, wrapGAppsHook }: +, libusb1, libxml2, pkgconfig, sane-backends, vala, wrapGAppsHook }: let version = "3.19.3"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz"; }; - buildInputs = [ cairo colord glib gusb gtk3 libusb1 libxml2 saneBackends + buildInputs = [ cairo colord glib gusb gtk3 libusb1 libxml2 sane-backends vala ]; nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index da6749f2bf5..8a2f8a37f06 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -7,7 +7,7 @@ , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra -, unixODBC, mdds, saneBackends, mythes, libexttextcat, libvisio +, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio , fontsConf, pkgconfig, libzip, bluez5, libtool, maven , libatomic_ops, graphite2, harfbuzz, libodfgen , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 @@ -220,7 +220,7 @@ in stdenv.mkDerivation rec { libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer gst_all_1.gst-plugins-base neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler - python3 sablotron saneBackends tcsh unzip vigra which zip zlib + python3 sablotron sane-backends tcsh unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libxshmfence libatomic_ops graphite2 harfbuzz librevenge libe-book libmwaw glm glew diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix index 6c3543eef37..d55419f02c7 100644 --- a/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix +++ b/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix @@ -1,7 +1,7 @@ -{ stdenv, kde, kdelibs, saneBackends }: +{ stdenv, kde, kdelibs, sane-backends }: kde { - buildInputs = [ kdelibs saneBackends ]; + buildInputs = [ kdelibs sane-backends ]; meta = { description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index fcb0354fd65..f31b62481d8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -35389,18 +35389,18 @@ self: { }) {}; "bindings-sane" = callPackage - ({ mkDerivation, base, bindings-DSL, saneBackends }: + ({ mkDerivation, base, bindings-DSL, sane-backends }: mkDerivation { pname = "bindings-sane"; version = "0.0.1"; sha256 = "a27eb00e69a804e65f39246611a747f3a833a87dab536c7f3cde60583a60b04b"; libraryHaskellDepends = [ base bindings-DSL ]; - libraryPkgconfigDepends = [ saneBackends ]; + libraryPkgconfigDepends = [ sane-backends ]; homepage = "http://floss.scru.org/bindings-sane"; description = "FFI bindings to libsane"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) saneBackends;}; + }) {inherit (pkgs) sane-backends;}; "bindings-sc3" = callPackage ({ mkDerivation, base, bindings-DSL, scsynth }: diff --git a/pkgs/misc/drivers/hplip/3.15.9.nix b/pkgs/misc/drivers/hplip/3.15.9.nix index 04ebb7a55ee..722615be46e 100644 --- a/pkgs/misc/drivers/hplip/3.15.9.nix +++ b/pkgs/misc/drivers/hplip/3.15.9.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, substituteAll , pkgconfig -, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus, usbutils +, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils , net_snmp, polkit , qtSupport ? true, qt4, pyqt4 , withPlugin ? false @@ -56,7 +56,7 @@ stdenv.mkDerivation { libusb1 pythonPackages.python pythonPackages.wrapPython - saneBackends + sane-backends dbus net_snmp ] ++ stdenv.lib.optionals qtSupport [ diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 8b3676663d3..071ffe8c100 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, substituteAll , pkgconfig -, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus, usbutils +, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils , net_snmp, polkit , qtSupport ? true, qt4, pyqt4 , withPlugin ? false @@ -56,7 +56,7 @@ stdenv.mkDerivation { libusb1 pythonPackages.python pythonPackages.wrapPython - saneBackends + sane-backends dbus net_snmp ] ++ stdenv.lib.optionals qtSupport [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 843aceebaef..e50f2291041 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15753,7 +15753,6 @@ let xsane = callPackage ../applications/graphics/sane/xsane.nix { libpng = libpng12; - saneBackends = saneBackends; }; xwiimote = callPackage ../misc/drivers/xwiimote {