From 01cd4663d67b061e9ad580e0e2c689d093b8ae10 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 14 Aug 2019 11:43:46 -0400
Subject: tests/printing: don’t wait for unit services
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These are now socket activated, we don’t need it to start up front.
---
 nixos/tests/printing.nix | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'nixos/tests/printing.nix')

diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index e8702c1ffbf1..72ee641948f1 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -34,10 +34,6 @@ import ./make-test.nix ({pkgs, ... }: {
     ''
       startAll;
 
-      # Make sure that cups is up on both sides.
-      $server->waitForUnit("cups.service");
-      $client->waitForUnit("cups.service");
-      $client->sleep(10); # wait until cups is fully initialized
       $client->succeed("lpstat -r") =~ /scheduler is running/ or die;
       # check local encrypted connections work without error
       $client->succeed("lpstat -E -r") =~ /scheduler is running/ or die;
-- 
cgit 1.4.1


From e9b7085ff8dc5980ea3e60c7282e9a2260f4b8a2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 14 Aug 2019 11:44:30 -0400
Subject: cups: add myself as maintainer

---
 nixos/modules/services/printing/cupsd.nix | 3 +++
 nixos/tests/printing.nix                  | 2 +-
 pkgs/misc/cups/default.nix                | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'nixos/tests/printing.nix')

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 48409b5c91d4..42c1b9482cb2 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -426,4 +426,7 @@ in
     security.pam.services.cups = {};
 
   };
+
+  meta.maintainers = with lib.maintainers; [ matthewbauer ];
+
 }
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 72ee641948f1..74583ae55623 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -3,7 +3,7 @@
 import ./make-test.nix ({pkgs, ... }: {
   name = "printing";
   meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ domenkozar eelco ];
+    maintainers = [ domenkozar eelco matthewbauer ];
   };
 
   nodes = {
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 11873e6f2a06..789aabce0435 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -133,7 +133,7 @@ stdenv.mkDerivation rec {
     homepage = https://cups.org/;
     description = "A standards-based printing system for UNIX";
     license = licenses.gpl2; # actually LGPL for the library and GPL for the rest
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ matthewbauer ];
     platforms = platforms.unix;
   };
 }
-- 
cgit 1.4.1