From 705fb1e7a0d4ef894379bba89b3f8dd98ce8b357 Mon Sep 17 00:00:00 2001 From: Sam Bickley Date: Fri, 4 Dec 2020 16:19:31 -0600 Subject: [PATCH 1/3] maintainers: add samb96 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3454dc71997..2ca767d0579 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7749,6 +7749,12 @@ github = "s1341"; githubId = 5682183; }; + samb96 = { + email = "samb96@gmail.com"; + github = "samb96"; + githubId = 819426; + name = "Sam Bickley"; + }; samdoshi = { email = "sam@metal-fish.co.uk"; github = "samdoshi"; From 17c02c8c11295f03858a17c2e0a75ca8e519c729 Mon Sep 17 00:00:00 2001 From: Sam Bickley Date: Fri, 4 Dec 2020 16:24:38 -0600 Subject: [PATCH 2/3] libinklevel: init at 0.9.3 --- .../libraries/libinklevel/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/libinklevel/default.nix diff --git a/pkgs/development/libraries/libinklevel/default.nix b/pkgs/development/libraries/libinklevel/default.nix new file mode 100644 index 00000000000..90f6936d458 --- /dev/null +++ b/pkgs/development/libraries/libinklevel/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, pkg-config, libusb1 }: + +stdenv.mkDerivation rec { + pname = "libinklevel"; + version = "0.9.3"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1zwkicjznkzw81ax745inv4n29y20vq82w8249vizaal76739n19"; + }; + + buildInputs = [ + pkg-config + libusb1 + ]; + + outputs = [ "out" "dev" "doc" ]; + + meta = with stdenv.lib; { + description = "A library for checking the ink level of your printer"; + longDescription = '' + Libinklevel is a library for checking the ink level of your printer on a + system which runs Linux or FreeBSD. It supports printers attached via + USB. Currently printers of the following brands are supported: HP, Epson + and Canon. Canon BJNP network printers are supported too. This is not + official software from the printer manufacturers. The goal of this + project is to create a vendor independent API for retrieving the ink + level of a printer connected to a Linux or FreeBSD box. + ''; + homepage = "http://libinklevel.sourceforge.net/"; + license = licenses.gpl2; + platforms = platforms.linux ++ platforms.freebsd; + maintainers = with maintainers; [ samb96 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 512ba7617d6..c054371bd69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14016,6 +14016,8 @@ in libinjection = callPackage ../development/libraries/libinjection { }; + libinklevel = callPackage ../development/libraries/libinklevel { }; + libnats-c = callPackage ../development/libraries/libnats-c { openssl = openssl_1_0_2; }; From 5d94f363c7790a8d2af6a476008d7e5be9323c53 Mon Sep 17 00:00:00 2001 From: Sam Bickley Date: Fri, 4 Dec 2020 16:33:26 -0600 Subject: [PATCH 3/3] ink: init at 0.5.3 --- pkgs/tools/misc/ink/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/ink/default.nix diff --git a/pkgs/tools/misc/ink/default.nix b/pkgs/tools/misc/ink/default.nix new file mode 100644 index 00000000000..266298d9ec2 --- /dev/null +++ b/pkgs/tools/misc/ink/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, libinklevel }: + +stdenv.mkDerivation rec { + pname = "ink"; + version = "0.5.3"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1fk0b8vic04a3i3vmq73hbk7mzbi57s8ks6ighn3mvr6m2v8yc9d"; + }; + + buildInputs = [ + libinklevel + ]; + + outputs = [ "out" "man" ]; + + meta = with stdenv.lib; { + description = "A command line tool for checking the ink level of your locally connected printer"; + longDescription = '' + Ink is a command line tool for checking the ink level of your locally connected printer on a system which runs Linux or FreeBSD. Canon BJNP network printers are supported too. + ''; + homepage = "http://ink.sourceforge.net/"; + license = licenses.gpl2; + platforms = platforms.linux ++ platforms.freebsd; + maintainers = with maintainers; [ samb96 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c054371bd69..2b14be55e90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2306,6 +2306,8 @@ in ifm = callPackage ../tools/graphics/ifm {}; + ink = callPackage ../tools/misc/ink { }; + interlock = callPackage ../servers/interlock {}; jellyfin = callPackage ../servers/jellyfin { };