From 42c3024877bbdd127e7002e35f41cd87aaf792f7 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 8 Feb 2016 16:47:20 +0100 Subject: profpatsch: remove insane experiment --- machines/default.nix | 1 - machines/profpatsch/experiments.nix | 9 --- machines/profpatsch/tmp/sane/backends/default.nix | 13 ---- machines/profpatsch/tmp/sane/backends/generic.nix | 76 ----------------------- 4 files changed, 99 deletions(-) delete mode 100644 machines/profpatsch/experiments.nix delete mode 100644 machines/profpatsch/tmp/sane/backends/default.nix delete mode 100644 machines/profpatsch/tmp/sane/backends/generic.nix diff --git a/machines/default.nix b/machines/default.nix index 32fd53b0..7c0ed379 100644 --- a/machines/default.nix +++ b/machines/default.nix @@ -21,7 +21,6 @@ in { }; profpatsch = { katara = callMachine ./profpatsch/katara.nix {}; - experiments = callMachine ./profpatsch/experiments.nix {}; }; misc = { mailserver = callMachine ./misc/mailserver.nix {}; diff --git a/machines/profpatsch/experiments.nix b/machines/profpatsch/experiments.nix deleted file mode 100644 index 0264747e..00000000 --- a/machines/profpatsch/experiments.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, lib, pkgs, ...}: - -{ - nixpkgs.config.packageOverrides = pkgs: { - sane-backends = pkgs.callPackage ./tmp/sane/backends {}; - }; - - hardware.sane.enable = true; -} diff --git a/machines/profpatsch/tmp/sane/backends/default.nix b/machines/profpatsch/tmp/sane/backends/default.nix deleted file mode 100644 index a3ca7fdd..00000000 --- a/machines/profpatsch/tmp/sane/backends/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "1.0.25"; - src = fetchurl { - sha256 = "0b3fvhrxl4l82bf3v0j47ypjv6a0k5lqbgknrq1agpmjca6vmmx4"; - urls = [ - "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-${version}.tar.gz/f9ed5405b3c12f07c6ca51ee60225fe7/sane-backends-${version}.tar.gz" - "https://alioth.debian.org/frs/download.php/file/4146/sane-backends-${version}.tar.gz" - ]; - curlOpts = "--insecure"; - }; -}) diff --git a/machines/profpatsch/tmp/sane/backends/generic.nix b/machines/profpatsch/tmp/sane/backends/generic.nix deleted file mode 100644 index e457ba29..00000000 --- a/machines/profpatsch/tmp/sane/backends/generic.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ stdenv, fetchurl -, avahi, libjpeg, libusb1, libv4l, net_snmp -, gettext, pkgconfig - -# List of { src name backend } attibute sets - see installFirmware below: -, extraFirmware ? [] - -# For backwards compatibility with older setups; use extraFirmware instead: -, gt68xxFirmware ? null, snapscanFirmware ? null - -# Passed from versioned package (e.g. default.nix, git.nix): -, version, src, ... -}: - -stdenv.mkDerivation { - inherit src version; - - name = "sane-backends-${version}"; - - outputs = [ "out" "doc" "man" ]; - - configureFlags = [] - ++ stdenv.lib.optional (avahi != null) "--enable-avahi" - ++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0" - ; - - buildInputs = [ avahi libusb1 libv4l net_snmp ]; - nativeBuildInputs = [ gettext pkgconfig ]; - - postInstall = let - - compatFirmware = extraFirmware - ++ stdenv.lib.optional (gt68xxFirmware != null) { - src = gt68xxFirmware.fw; - inherit (gt68xxFirmware) name; - backend = "gt68xx"; - } - ++ stdenv.lib.optional (snapscanFirmware != null) { - src = snapscanFirmware; - name = "your-firmwarefile.bin"; - backend = "snapscan"; - }; - - installFirmware = f: '' - mkdir -p $out/share/sane/${f.backend} - ln -sv ${f.src} $out/share/sane/${f.backend}/${f.name} - ''; - - in '' - mkdir -p $out/etc/udev/rules.d/ - ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \ - cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules - # the created 49-libsane references /bin/sh - substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \ - --replace "RUN+=\"/bin/sh" "RUN+=\"${stdenv.shell}" - - substituteInPlace $out/lib/libsane.la \ - --replace "-ljpeg" "-L${libjpeg}/lib -ljpeg" - '' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware); - - meta = with stdenv.lib; { - description = "SANE (Scanner Access Now Easy) backends"; - longDescription = '' - Collection of open-source SANE backends (device drivers). - SANE is a universal scanner interface providing standardized access to - any raster image scanner hardware: flatbed scanners, hand-held scanners, - video- and still-cameras, frame-grabbers, etc. For a list of supported - scanners, see http://www.sane-project.org/sane-backends.html. - ''; - homepage = "http://www.sane-project.org/"; - license = licenses.gpl2Plus; - - maintainers = with maintainers; [ nckx simons ]; - platforms = platforms.linux; - }; -} -- cgit 1.4.1