From 346b939a095793430d847f9dfc5d136bba982936 Mon Sep 17 00:00:00 2001 From: LoveIsGrief Date: Mon, 9 Jan 2023 21:35:27 +0100 Subject: lib/licenses add Fair license --- lib/licenses.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 52956e52afa65..e88054134a3dc 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -558,6 +558,12 @@ in mkLicense lset) ({ redistributable = false; }; + fair = { + fullName = "Fair License"; + spdxId = "Fair"; + free = true; + }; + issl = { fullName = "Intel Simplified Software License"; url = "https://software.intel.com/en-us/license/intel-simplified-software-license"; -- cgit 1.4.1 From 7df27f13ee4177ebd2ee59a7ca89306addbfa63e Mon Sep 17 00:00:00 2001 From: LoveIsGrief Date: Tue, 10 Jan 2023 23:12:54 +0100 Subject: maintainers: Add loveisgrief --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 169663a2f5730..13bd7ada0d9f8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8346,6 +8346,13 @@ githubId = 4969294; name = "Louis Tim Larsen"; }; + loveisgrief = { + name = "LoveIsGrief"; + email = "loveisgrief@tuta.io"; + keys = [{ + fingerprint = "9847 4F48 18C6 4E0A F0C5 3529 E96D 1EDF A053 45EB"; + }]; + }; lovek323 = { email = "jason@oconal.id.au"; github = "lovek323"; -- cgit 1.4.1 From 268feffcaac9f5fa37d4be7d64d43d32e2088170 Mon Sep 17 00:00:00 2001 From: LoveIsGrief Date: Tue, 10 Jan 2023 23:13:19 +0100 Subject: simple-dlna-browser: Add new package A useful CLI script I found that's way light than VLC and other GUI apps since SSDP is pretty much a text-based protocol built on top of HTTP. --- .../networking/simple-dlna-browser/default.nix | 68 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/tools/networking/simple-dlna-browser/default.nix diff --git a/pkgs/tools/networking/simple-dlna-browser/default.nix b/pkgs/tools/networking/simple-dlna-browser/default.nix new file mode 100644 index 0000000000000..c59a1e28910ad --- /dev/null +++ b/pkgs/tools/networking/simple-dlna-browser/default.nix @@ -0,0 +1,68 @@ +{ + # Derivation stuff + fetchFromGitHub, + lib, + makeWrapper, + stdenv, + # Dependencies + # Add these to the wrapper + curl, + gawk, + gnugrep, + gnused, + socat, + wget, +}: +stdenv.mkDerivation { + pname = "simple-dlna-browser"; + version = "unstable-2023-01-09"; + + src = fetchFromGitHub { + owner = "javier-lopez"; + repo = "learn"; + sparseCheckout = [ + "sh/tools/simple-dlna-browser" + ]; + rev = "666e2c402723251ba19ce9d7c11b83b06c15a2c5"; + sha256 = "sha256-jwPAEgti5DrjNnNVW/61GGTP+QedGAjz9kPwYhMAdTk="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + outputWrapper="$out/bin/simple-dlna-browser" + outputWrapped="$out/bin/wrapped-simple-dlna-browser" + + mkdir -p $out/bin + cp sh/tools/simple-dlna-browser $outputWrapped + makeWrapper $outputWrapped $outputWrapper \ + --prefix PATH : ${lib.makeBinPath [ + curl + gawk + gnugrep + gnused + socat + wget + ]} + + # Set the program name to a fixed value + # Normally it is guessed by the filename, but we don't want it to be the name of the wrapper + sed -i -e 's/PROGNAME=".*"/PROGNAME="simple-dlna-browser"/' $outputWrapped + ''; + + meta = { + description = "Query dlna media servers"; + longDescription = '' + A bash script that allows simple interactions with [DLNA] media servers. + It is a light-weight, CLI alternative to [VLC], [Kodi], and other players. + + [DLNA]: https://en.wikipedia.org/wiki/Digital_Living_Network_Alliance + [Kodi]: https://kodi.tv/ + [VLC]: https://www.videolan.org/vlc/ + ''; + homepage = "https://github.com/javier-lopez/learn/blob/master/sh/tools/simple-dlna-browser"; + license = lib.licenses.fair; + maintainers = with lib.maintainers; [ loveisgrief ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2470aae99a266..bd241fc55ec31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1455,6 +1455,8 @@ with pkgs; sgrep = callPackage ../tools/text/sgrep { }; + simple-dlna-browser = callPackage ../tools/networking/simple-dlna-browser { }; + sorted-grep = callPackage ../tools/text/sorted-grep { }; smbscan = callPackage ../tools/security/smbscan { }; -- cgit 1.4.1