[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/08: gnu: Move brlaser to (gnu packages cups).
From: |
guix-commits |
Subject: |
05/08: gnu: Move brlaser to (gnu packages cups). |
Date: |
Sun, 10 Jan 2021 17:45:50 -0500 (EST) |
nckx pushed a commit to branch master
in repository guix.
commit 8498aee86cc6033ae90a262410a1fb270d88073b
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Jan 10 21:38:46 2021 +0100
gnu: Move brlaser to (gnu packages cups).
* gnu/packages/printers.scm (cups): Move from here...
* gnu/packages/cups.scm (cups): ...to here.
---
gnu/packages/cups.scm | 72 +++++++++++++++++++++++++++++++++++++++++++++--
gnu/packages/printers.scm | 72 -----------------------------------------------
2 files changed, 70 insertions(+), 74 deletions(-)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index c8ca5db..51efee5 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -1,11 +1,11 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017–2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
@@ -47,6 +47,7 @@
#:use-module (gnu packages qt)
#:use-module (gnu packages scanner)
#:use-module (gnu packages tls)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (guix download)
@@ -57,6 +58,73 @@
#:use-module (srfi srfi-1)
#:use-module (ice-9 match))
+(define-public brlaser
+ (let ((commit "9d7ddda8383bfc4d205b5e1b49de2b8bcd9137f1")
+ (revision "1"))
+ (package
+ (name "brlaser")
+ (version (git-version "6" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pdewacht/brlaser")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1drh0nk7amn9a8wykki4l9maqa4vy7vwminypfy1712alwj31nd4"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:configure-flags
+ (list (string-append "-DCUPS_DATA_DIR="
+ (assoc-ref %outputs "out")
+ "/share/cups")
+ (string-append "-DCUPS_SERVER_BIN="
+ (assoc-ref %outputs "out")
+ "/lib/cups"))))
+ (inputs
+ `(("ghostscript" ,ghostscript)
+ ("cups" ,cups)
+ ("zlib" ,zlib)))
+ (home-page "https://github.com/pdewacht/brlaser")
+ (synopsis "Brother laser printer driver")
+ (description "Brlaser is a CUPS driver for Brother laser printers. This
+driver is known to work with these printers:
+
+@enumerate
+@item Brother DCP-1510 series
+@item Brother DCP-1600 series
+@item Brother DCP-7030
+@item Brother DCP-7040
+@item Brother DCP-7055
+@item Brother DCP-7055W
+@item Brother DCP-7060D
+@item Brother DCP-7065DN
+@item Brother DCP-7080
+@item Brother DCP-L2500D series
+@item Brother DCP-L2520D series
+@item Brother DCP-L2540DW series
+@item Brother HL-1110 series
+@item Brother HL-1200 series
+@item Brother HL-2030 series
+@item Brother HL-2140 series
+@item Brother HL-2220 series
+@item Brother HL-2270DW series
+@item Brother HL-5030 series
+@item Brother HL-L2300D series
+@item Brother HL-L2320D series
+@item Brother HL-L2340D series
+@item Brother HL-L2360D series
+@item Brother MFC-1910W
+@item Brother MFC-7240
+@item Brother MFC-7360N
+@item Brother MFC-7365DN
+@item Brother MFC-7840W
+@item Brother MFC-L2710DW series
+@item Lenovo M7605D
+@end enumerate")
+ (license license:gpl2+))))
+
(define-public cups-filters
(package
(name "cups-filters")
diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm
index e03582c..9ab9da3 100644
--- a/gnu/packages/printers.scm
+++ b/gnu/packages/printers.scm
@@ -1,7 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -21,13 +20,9 @@
(define-module (gnu packages printers)
#:use-module (guix packages)
#:use-module (guix git-download)
- #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module ((guix licenses) #:prefix license:)
- #:use-module (gnu packages compression)
- #:use-module (gnu packages cups)
#:use-module (gnu packages libusb)
- #:use-module (gnu packages ghostscript)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages qt))
@@ -73,70 +68,3 @@
with Graphtec and Sihouette plotting cutters using an SVG file as its input.")
(home-page "http://robocut.org")
(license license:gpl3+)))
-
-(define-public brlaser
- (let ((commit "9d7ddda8383bfc4d205b5e1b49de2b8bcd9137f1")
- (revision "1"))
- (package
- (name "brlaser")
- (version (git-version "6" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/pdewacht/brlaser")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1drh0nk7amn9a8wykki4l9maqa4vy7vwminypfy1712alwj31nd4"))))
- (build-system cmake-build-system)
- (arguments
- `(#:configure-flags
- (list (string-append "-DCUPS_DATA_DIR="
- (assoc-ref %outputs "out")
- "/share/cups")
- (string-append "-DCUPS_SERVER_BIN="
- (assoc-ref %outputs "out")
- "/lib/cups"))))
- (inputs
- `(("ghostscript" ,ghostscript)
- ("cups" ,cups)
- ("zlib" ,zlib)))
- (home-page "https://github.com/pdewacht/brlaser")
- (synopsis "Brother laser printer driver")
- (description "Brlaser is a CUPS driver for Brother laser printers. This
-driver is known to work with these printers:
-
-@enumerate
-@item Brother DCP-1510 series
-@item Brother DCP-1600 series
-@item Brother DCP-7030
-@item Brother DCP-7040
-@item Brother DCP-7055
-@item Brother DCP-7055W
-@item Brother DCP-7060D
-@item Brother DCP-7065DN
-@item Brother DCP-7080
-@item Brother DCP-L2500D series
-@item Brother DCP-L2520D series
-@item Brother DCP-L2540DW series
-@item Brother HL-1110 series
-@item Brother HL-1200 series
-@item Brother HL-2030 series
-@item Brother HL-2140 series
-@item Brother HL-2220 series
-@item Brother HL-2270DW series
-@item Brother HL-5030 series
-@item Brother HL-L2300D series
-@item Brother HL-L2320D series
-@item Brother HL-L2340D series
-@item Brother HL-L2360D series
-@item Brother MFC-1910W
-@item Brother MFC-7240
-@item Brother MFC-7360N
-@item Brother MFC-7365DN
-@item Brother MFC-7840W
-@item Brother MFC-L2710DW series
-@item Lenovo M7605D
-@end enumerate")
- (license license:gpl2+))))
- branch master updated (fa6c81b -> 432cb80), guix-commits, 2021/01/10
- 03/08: gnu: obs: Update to 26.1.2., guix-commits, 2021/01/10
- 04/08: gnu: polybar: Update to 3.5.4., guix-commits, 2021/01/10
- 01/08: gnu: zutils: Update to 1.10., guix-commits, 2021/01/10
- 02/08: gnu: llvm: Update to 11.0.1., guix-commits, 2021/01/10
- 06/08: services: cups: Add brlaser extension by default., guix-commits, 2021/01/10
- 05/08: gnu: Move brlaser to (gnu packages cups).,
guix-commits <=
- 07/08: doc: Add missing cups-filters default extension., guix-commits, 2021/01/10
- 08/08: gnu: bwm-ng: Update to 0.6.3., guix-commits, 2021/01/10