From a2a0927269a613b802c62bcb380a1482db62b557 Mon Sep 17 00:00:00 2001 From: Timma Date: Sat, 11 Jan 2020 13:53:06 +0530 Subject: maintainers: add ktrsoft --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 09a45d267e725..cda14ba1058d5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7014,6 +7014,11 @@ github = "timbertson"; name = "Tim Cuthbertson"; }; + timma = { + email = "kunduru.it.iitb@gmail.com"; + github = "ktrsoft"; + name = "Timma"; + }; timokau = { email = "timokau@zoho.com"; github = "timokau"; -- cgit 1.4.1 From 775f3e037e0d457471f5042c6d58488b45627c4e Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 6 Jan 2020 18:51:37 +0100 Subject: maintainers: add flyfloh --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7e5a2e1986b70..9e1f92793cf73 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2439,6 +2439,12 @@ githubId = 844574; name = "Daniel Austin"; }; + flyfloh = { + email = "nix@halbmastwurf.de"; + github = "flyfloh"; + githubId = 74379; + name = "Florian Pester"; + }; fmthoma = { email = "f.m.thoma@googlemail.com"; github = "fmthoma"; -- cgit 1.4.1 From eec3db0cde2e7bc041b18b19d4ae98ae60fdaf5d Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Sun, 12 Jan 2020 01:51:04 +0100 Subject: maintainers: add nloomans --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9e1f92793cf73..bdeed800890f3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5088,6 +5088,12 @@ githubId = 7588406; name = "Andrew R. M."; }; + nloomans = { + email = "noah@nixos.noahloomans.com"; + github = "nloomans"; + githubId = 7829481; + name = "Noah Loomans"; + }; nmattia = { email = "nicolas@nmattia.com"; github = "nmattia"; -- cgit 1.4.1 From b0dac58dc1b14b4d433f2e95cb48828290a3971e Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Sat, 14 Dec 2019 11:22:39 +0000 Subject: maintainers: add kwohlfahrt --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bdeed800890f3..2b29cef78d1f8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3844,6 +3844,12 @@ githubId = 449813; name = "Roman Kuznetsov"; }; + kwohlfahrt = { + email = "kai.wohlfahrt@gmail.com"; + github = "kwohlfahrt"; + githubId = 2422454; + name = "Kai Wohlfahrt"; + }; kylesferrazza = { name = "Kyle Sferrazza"; email = "kyle.sferrazza@gmail.com"; -- cgit 1.4.1 From b45c4d2d88c9ca2df1e8b10df18e39551762f143 Mon Sep 17 00:00:00 2001 From: Julien Coolen Date: Thu, 9 Jan 2020 23:35:00 +0100 Subject: protonvpn-cli-ng: init at 2.2.0 --- maintainers/maintainer-list.nix | 10 +++++++ .../networking/protonvpn-cli-ng/default.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 46 insertions(+) create mode 100644 pkgs/applications/networking/protonvpn-cli-ng/default.nix (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dc0db933330cb..bbcc07e1ae259 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3448,6 +3448,16 @@ githubId = 4611077; name = "Raymond Gauthier"; }; + jtcoolen = { + email = "jtcoolen@pm.me"; + name = "Julien Coolen"; + github = "jtcoolen"; + githubId = 54635632; + keys = [{ + longkeyid = "rsa4096/0x19642151C218F6F5"; + fingerprint = "4C68 56EE DFDA 20FB 77E8 9169 1964 2151 C218 F6F5"; + }]; + }; jtobin = { email = "jared@jtobin.io"; github = "jtobin"; diff --git a/pkgs/applications/networking/protonvpn-cli-ng/default.nix b/pkgs/applications/networking/protonvpn-cli-ng/default.nix new file mode 100644 index 0000000000000..03d1a665273e7 --- /dev/null +++ b/pkgs/applications/networking/protonvpn-cli-ng/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, python3Packages, openvpn, dialog }: + +python3Packages.buildPythonApplication rec { + name = "protonvpn-cli-ng"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "protonvpn"; + repo = "protonvpn-cli-ng"; + rev = "v${version}"; + sha256 = "11fvnnr5p3qdc4y10815jnydcjvxlxwkkq9kvaajg0yszq84rwkz"; + }; + + propagatedBuildInputs = (with python3Packages; [ + requests + docopt + setuptools + pythondialog + ]) ++ [ + dialog + openvpn + ]; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Linux command-line client for ProtonVPN"; + homepage = "https://github.com/protonvpn/protonvpn-cli-ng"; + maintainers = [ maintainers.jtcoolen ]; + license = licenses.gpl3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd59fa7bbd24f..2c710c42e6429 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20792,6 +20792,8 @@ in protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { }; + protonvpn-cli-ng = callPackage ../applications/networking/protonvpn-cli-ng { }; + ps2client = callPackage ../applications/networking/ps2client { }; psi = callPackage ../applications/networking/instant-messengers/psi { }; -- cgit 1.4.1 From 1d7c399f892114a01ea2513ed7d941d0c51ddfcc Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 17 Jan 2020 09:09:39 +1000 Subject: maintainers: add zowoq --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6fc68933d244a..f095ff0ef11ed 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7850,6 +7850,12 @@ githubId = 1069303; name = "Kim Simmons"; }; + zowoq = { + email = "59103226+zowoq@users.noreply.github.com"; + github = "zowoq"; + githubId = 59103226; + name = "zowoq"; + }; zraexy = { email = "zraexy@gmail.com"; github = "zraexy"; -- cgit 1.4.1 From 0801820a53ea55df3609cbaee9587304a50d8be6 Mon Sep 17 00:00:00 2001 From: Scott Dier Date: Mon, 20 Jan 2020 19:43:00 +0100 Subject: maintainers: add sdier --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6fc68933d244a..dc032e5edcd9e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6276,6 +6276,12 @@ github = "scubed2"; name = "Sterling Stein"; }; + sdier = { + email = "scott@dier.name"; + github = "sdier"; + githubId = 11613056; + name = "Scott Dier"; + }; sdll = { email = "sasha.delly@gmail.com"; github = "sdll"; -- cgit 1.4.1 From 227a3f438300a20c88e2017109ffb3d1ac0f7a58 Mon Sep 17 00:00:00 2001 From: DwarfMaster Date: Tue, 21 Jan 2020 16:39:52 +1000 Subject: Renamed maintainer lucas8 -> dwarfmaster --- maintainers/maintainer-list.nix | 12 ++++++------ pkgs/applications/graphics/imlibsetroot/default.nix | 2 +- pkgs/applications/science/logic/cubicle/default.nix | 2 +- pkgs/tools/text/fanficfare/default.nix | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dc032e5edcd9e..844ed91360d6c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1919,6 +1919,12 @@ fingerprint = "5DD7 C6F6 0630 F08E DAE7 4711 1525 585D 1B43 C62A"; }]; }; + dwarfmaster = { + email = "nixpkgs@dwarfmaster.net"; + github = "dwarfmaster"; + githubId = 2025623; + name = "Luc Chabassier"; + }; dxf = { email = "dingxiangfei2009@gmail.com"; github = "dingxiangfei2009"; @@ -4169,12 +4175,6 @@ github = "ltavard"; name = "Laure Tavard"; }; - lucas8 = { - email = "luc.linux@mailoo.org"; - github = "lucas8"; - githubId = 2025623; - name = "Luc Chabassier"; - }; lucus16 = { email = "lars.jellema@gmail.com"; github = "Lucus16"; diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix index 49868bbd831f1..8ca4d71bb56cd 100644 --- a/pkgs/applications/graphics/imlibsetroot/default.nix +++ b/pkgs/applications/graphics/imlibsetroot/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { homepage = http://robotmonkeys.net/2010/03/30/imlibsetroot/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ lucas8 ]; + maintainers = with maintainers; [ dwarfmaster ]; }; } diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix index cd41e1ca64b9f..d198de41f9b79 100644 --- a/pkgs/applications/science/logic/cubicle/default.nix +++ b/pkgs/applications/science/logic/cubicle/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://cubicle.lri.fr/; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ lucas8 ]; + maintainers = with maintainers; [ dwarfmaster ]; }; } diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index b01317a532ff5..31952cb1b1b37 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { homepage = https://github.com/JimmXinu/FanFicFare; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ lucas8 ]; + maintainers = with maintainers; [ dwarfmaster ]; inherit version; }; } -- cgit 1.4.1 From 2ad6b93ba3cab30baf14870bb813b3a90280f203 Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Fri, 17 Jan 2020 16:57:14 -0500 Subject: maintainers: add antoinerg --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a63968e172ee9..2730218f48f7f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -517,6 +517,12 @@ githubId = 5327697; name = "Anatolii Prylutskyi"; }; + antoinerg = { + email = "roygobeil.antoine@gmail.com"; + github = "antoinerg"; + githubId = 301546; + name = "Antoine Roy-Gobeil"; + }; anton-dessiatov = { email = "anton.dessiatov@gmail.com"; github = "anton-dessiatov"; -- cgit 1.4.1 From 5a19bf03d9c765f9c26be917dd3644b42c6c0b44 Mon Sep 17 00:00:00 2001 From: Jarrod Pas Date: Wed, 22 Jan 2020 01:40:11 -0600 Subject: add jpas to maintainers --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2730218f48f7f..13b6793c816bf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3492,6 +3492,12 @@ github = "jorsn"; githubId = 4646725; }; + jpas = { + name = "Jarrod Pas"; + email = "jarrod@jarrodpas.com"; + github = "jpas"; + githubId = 5689724; + }; jpdoyle = { email = "joethedoyle@gmail.com"; github = "jpdoyle"; -- cgit 1.4.1 From a76b5a2c94523aa947a81daed2a3e2d0b5917b99 Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Wed, 22 Jan 2020 21:12:43 +0000 Subject: maintainers: remove 00-matt --- maintainers/maintainer-list.nix | 6 ------ pkgs/applications/networking/cluster/kubeless/default.nix | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2730218f48f7f..1f0ead51af152 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -40,12 +40,6 @@ See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data. */ { - "00-matt" = { - name = "Matt Smith"; - email = "matt@offtopica.uk"; - github = "00-matt"; - githubId = 48835712; - }; "0x4A6F" = { email = "0x4A6F@shackspace.de"; name = "Joachim Ernst"; diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix index aaf183ad6667c..48540bffb5369 100644 --- a/pkgs/applications/networking/cluster/kubeless/default.nix +++ b/pkgs/applications/networking/cluster/kubeless/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { homepage = "https://kubeless.io"; description = "The Kubernetes Native Serverless Framework"; license = licenses.asl20; - maintainers = with maintainers; [ "00-matt" ]; + maintainers = with maintainers; []; platforms = platforms.unix; }; } -- cgit 1.4.1 From f25166203a602e26324bbf4689a9f14858c9b8a0 Mon Sep 17 00:00:00 2001 From: blanky0230 Date: Fri, 15 Nov 2019 16:42:35 +0100 Subject: maintainers: add blanky0230 to maintainers. --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2730218f48f7f..7e8042292ee41 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -957,6 +957,11 @@ githubId = 5718007; name = "Bastian Köcher"; }; + blanky0230 = { + email = "blanky0230@gmail.com"; + github = "blanky0230"; + name = "Thomas Blank"; + }; blitz = { email = "js@alien8.de"; github = "blitz"; -- cgit 1.4.1 From 89f80c0a907292df86779a0d62adda894ba598ec Mon Sep 17 00:00:00 2001 From: kraem Date: Tue, 21 Jan 2020 19:30:56 +0100 Subject: maintainers: add kraem --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a63968e172ee9..fc9c724ad3528 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3812,6 +3812,12 @@ githubId = 787421; name = "Kevin Quick"; }; + kraem = { + email = "me@kraem.xyz"; + github = "kraem"; + githubId = 26622971; + name = "Ronnie Ebrin"; + }; kragniz = { email = "louis@kragniz.eu"; github = "kragniz"; -- cgit 1.4.1 From d44322f1f3844fbff5833ad07c7c21aae26bd067 Mon Sep 17 00:00:00 2001 From: "Farkas, Arnold" Date: Wed, 22 Jan 2020 03:53:30 -0500 Subject: maintainers: add arnoldfarkas --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1f0ead51af152..eff670a5affe1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -594,6 +594,12 @@ githubId = 1296771; name = "Anders Riutta"; }; + arnoldfarkas = { + email = "arnold.farkas@gmail.com"; + github = "arnoldfarkas"; + githubId = 59696216; + name = "Arnold Farkas"; + }; arobyn = { email = "shados@shados.net"; github = "shados"; -- cgit 1.4.1 From db6ef4dccfa6ca05c6bf368137a48f9d6b94b238 Mon Sep 17 00:00:00 2001 From: samlich <1349989+samlich@users.noreply.github.com> Date: Fri, 24 Jan 2020 19:43:52 +0000 Subject: maintainers: add samlich --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bcfc7007b6b1f..acd8bbcde8fd2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6181,6 +6181,16 @@ githubId = 6022042; name = "Sam Parkinson"; }; + samlich = { + email = "nixos@samli.ch"; + github = "samlich"; + githubId = 1349989; + name = "samlich"; + keys = [{ + longkeyid = "rsa4096/B1568953B1939F1C"; + fingerprint = "AE8C 0836 FDF6 3FFC 9580 C588 B156 8953 B193 9F1C"; + }]; + }; samrose = { email = "samuel.rose@gmail.com"; github = "samrose"; -- cgit 1.4.1 From 5365e3650da6127118bf26febd23dd71ca72d9e9 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 24 Jan 2020 17:47:09 +0100 Subject: luaPackages.digestif: scm1 -> 0.2-1 Now it's a released package so no need to specify the manifest anymore. --- maintainers/scripts/luarocks-packages.csv | 2 +- .../development/lua-modules/generated-packages.nix | 22 ++++++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) (limited to 'maintainers') diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 526a928438d27..49ebf3e5b4222 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -11,7 +11,7 @@ compat53,,,,,vcunat coxpcall,,,1.17.0-1,, cqueues,,,,,vcunat cyrussasl,,,,,vcunat -digestif,,http://luarocks.org/dev,,lua5_3, +digestif,,,,lua5_3, dkjson,,,,, fifo,,,,, http,,,,,vcunat diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 4cff22a8d41c3..2a70baf8d3ce7 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -266,28 +266,18 @@ cyrussasl = buildLuarocksPackage { }; digestif = buildLuarocksPackage { pname = "digestif"; - version = "scm-1"; - - knownRockspec = (fetchurl { - url = http://luarocks.org/dev/digestif-scm-1.rockspec; - sha256 = "18rixbni4hmrmh3qj3vpjbsphzdvchswajphc9ysm52ccpyzh687"; - }).outPath; - - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "git://github.com/astoff/digestif", - "rev": "51c321f1b68b77f648fa6adf356de48925f69fe0", - "date": "2019-06-08T15:03:33+02:00", - "sha256": "1c9cl81vfzirc325wipdy992yn20b8xv8nqzl5mdhyz8zfp84hs7", - "fetchSubmodules": true -} - '') ["date"]) ; + version = "0.2-1"; + src = fetchurl { + url = mirror://luarocks/digestif-0.2-1.src.rock; + sha256 = "03blpj5lxlhmxa4hnj21sz7sc84g96igbc7r97yb2smmlbyq8hxd"; + }; disabled = (luaOlder "5.3"); propagatedBuildInputs = [ lua lpeg dkjson ]; meta = with stdenv.lib; { homepage = "https://github.com/astoff/digestif/"; - description = "Code analyzer for TeX."; + description = "A code analyzer for TeX"; license = { fullName = "MIT"; }; -- cgit 1.4.1 From bc07d117f2ce6156ddc4b383d9ec94ef714d4dda Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 24 Jan 2020 18:18:30 +0100 Subject: luaPackages.linenoise: init at 0.9-1 --- maintainers/scripts/luarocks-packages.csv | 1 + .../development/lua-modules/generated-packages.nix | 25 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) (limited to 'maintainers') diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 49ebf3e5b4222..f9b74b279e8f7 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -18,6 +18,7 @@ http,,,,,vcunat inspect,,,,, ldoc,,,,, lgi,,,,, +linenoise,,,,, ljsyscall,,,,lua5_1,lblasc lpeg,,,,,vyp lpeg_patterns,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 2a70baf8d3ce7..d1e72b41cdd5e 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -402,6 +402,31 @@ lgi = buildLuarocksPackage { }; }; }; +linenoise = buildLuarocksPackage { + pname = "linenoise"; + version = "0.9-1"; + + knownRockspec = (fetchurl { + url = mirror://luarocks/linenoise-0.9-1.rockspec; + sha256 = "0wic8g0d066pj9k51farsvcdbnhry2hphvng68w9k4lh0zh45yg4"; + }).outPath; + + src = fetchurl { + url = https://github.com/hoelzro/lua-linenoise/archive/0.9.tar.gz; + sha256 = "177h6gbq89arwiwxah9943i8hl5gvd9wivnd1nhmdl7d8x0dn76c"; + }; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/hoelzro/lua-linenoise"; + description = "A binding for the linenoise command line library"; + license = { + fullName = "MIT/X11"; + }; + }; +}; ljsyscall = buildLuarocksPackage { pname = "ljsyscall"; version = "0.12-1"; -- cgit 1.4.1 From 460224d4cd350e6a77dcbc6dc233d7ffb933b2c3 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 24 Jan 2020 20:58:00 +0100 Subject: luaPackages.luaepnf: init at 0.3-1 --- maintainers/scripts/luarocks-packages.csv | 1 + pkgs/development/lua-modules/generated-packages.nix | 21 ++++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) (limited to 'maintainers') diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index f9b74b279e8f7..73de7b518dbb7 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -44,6 +44,7 @@ luadbi-mysql,,,,, luadbi-postgresql,,,,, luadbi-sqlite3,,,,, luadoc,,,,, +luaepnf,,,,, luaevent,,,,, luaexpat,,,1.3.0-1,,arobyn flosse luaffi,,http://luarocks.org/dev,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index d1e72b41cdd5e..3e01b2f975779 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -933,9 +933,24 @@ luadoc = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "http://luadoc.luaforge.net/"; description = "LuaDoc is a documentation tool for Lua source code"; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; + }; +}; +luaepnf = buildLuarocksPackage { + pname = "luaepnf"; + version = "0.3-1"; + + src = fetchurl { + url = mirror://luarocks/luaepnf-0.3-1.src.rock; + sha256 = "12z7radxk1dkyjqflr85sghywgc82xdg4mzb9mbwbrrqbnjw8mp5"; + }; + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua lpeg ]; + + meta = with stdenv.lib; { + homepage = "http://siffiejoe.github.io/lua-luaepnf/"; + description = "Extended PEG Notation Format (easy grammars for LPeg)"; + license.fullName = "MIT"; }; }; luaevent = buildLuarocksPackage { -- cgit 1.4.1 From a032a3ad90f7794977c10a95141e424b8211ecd9 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 24 Jan 2020 20:58:58 +0100 Subject: luaPackages.luarepl: init at 0.9-1 --- maintainers/scripts/luarocks-packages.csv | 1 + .../development/lua-modules/generated-packages.nix | 27 +++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) (limited to 'maintainers') diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 73de7b518dbb7..ceb47f57db56a 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -52,6 +52,7 @@ luafilesystem,,,1.7.0-2,,flosse vcunat lualogging,,,,, luaossl,,,,lua5_1,vcunat luaposix,,,,,vyp lblasc +luarepl,,,,, luasec,,,,,flosse luasocket,,,,, luasql-sqlite3,,,,,vyp diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 3e01b2f975779..eaa0f41aadbea 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1083,9 +1083,30 @@ luaposix = buildLuarocksPackage { homepage = "https://github.com/luaposix/luaposix/"; description = "Lua bindings for POSIX"; maintainers = with maintainers; [ vyp lblasc ]; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; + }; +}; +luarepl = buildLuarocksPackage { + pname = "luarepl"; + version = "0.9-1"; + + knownRockspec = (fetchurl { + url = mirror://luarocks/luarepl-0.9-1.rockspec; + sha256 = "1409lanxv4s8kq5rrh46dvld77ip33qzfn3vac3i9zpzbmgb5i8z"; + }).outPath; + + src = fetchurl { + url = https://github.com/hoelzro/lua-repl/archive/0.9.tar.gz; + sha256 = "04xka7b84d9mrz3gyf8ywhw08xp65v8jrnzs8ry8k9540aqs721w"; + }; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/hoelzro/lua-repl"; + description = "A reusable REPL component for Lua, written in Lua"; + license.fullName = "MIT/X11"; }; }; luasec = buildLuarocksPackage { -- cgit 1.4.1 From 84a2134baad9859f6a9fab88edd1a22437ba600a Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 24 Jan 2020 21:19:22 +0100 Subject: luaPackages.vstruct: init at 2.0.2-1 --- maintainers/scripts/luarocks-packages.csv | 1 + pkgs/development/lua-modules/generated-packages.nix | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) (limited to 'maintainers') diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index ceb47f57db56a..01e3150ede13b 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -75,3 +75,4 @@ std__debug,std._debug,,,, std_normalize,std.normalize,,,, stdlib,,,,,vyp pulseaudio,,,,,doronbehar +vstruct,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index eaa0f41aadbea..9afd8ab6a6ef8 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1536,9 +1536,23 @@ stdlib = buildLuarocksPackage { homepage = "http://lua-stdlib.github.io/lua-stdlib"; description = "General Lua Libraries"; maintainers = with maintainers; [ vyp ]; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; + }; +}; +vstruct = buildLuarocksPackage { + pname = "vstruct"; + version = "2.0.2-1"; + + src = fetchurl { + url = mirror://luarocks/vstruct-2.0.2-1.src.rock; + sha256 = "05k1685618wh7vg8av92mh1i1rjqg15x12gifbp9kyqzc2nk3kzq"; + }; + disabled = (luaOlder "5.1") || (luaAtLeast "5.3"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ToxicFrog/vstruct"; + description = "Lua library to manipulate binary data"; }; }; -- cgit 1.4.1 From 27c88c51e70d63e28bec35df27c3db4baead6d33 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 24 Jan 2020 21:20:26 +0100 Subject: update-luarocks-packages: disable by default Not only the binary `parallel` displays a re,inder to quote their software but it systematically breaks update here regardless of my network quality. Better be slow than fail. If anyone can fix it, we may rollback this. --- maintainers/scripts/update-luarocks-packages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'maintainers') diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index 1a31d71086fa9..5c42080745ebc 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -19,7 +19,7 @@ export LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua" # 10 is a pretty arbitrary number of simultaneous jobs, but it is generally # impolite to hit a webserver with *too* many simultaneous connections :) -PARALLEL_JOBS=10 +PARALLEL_JOBS=1 exit_trap() { local lc="$BASH_COMMAND" rc=$? -- cgit 1.4.1 From 22a1deaf2cebf6f9a9be26b0e49c91750a574043 Mon Sep 17 00:00:00 2001 From: Karl Fischer Date: Sat, 25 Jan 2020 21:24:59 +0100 Subject: add maintainer: fishi0x01 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1f0ead51af152..e5b7ce05fe773 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2399,6 +2399,12 @@ githubId = 415760; name = "Jonas Höglund"; }; + fishi0x01 = { + email = "fishi0x01@gmail.com"; + github = "fishi0x01"; + githubId = 10799507; + name = "Karl Fischer"; + }; Flakebi = { email = "flakebi@t-online.de"; github = "Flakebi"; -- cgit 1.4.1 From 37539e18a57138c2a98c3452259c386b1144740c Mon Sep 17 00:00:00 2001 From: petercommand Date: Tue, 24 Dec 2019 17:18:07 +0800 Subject: xmousepasteblock: init at 1.0 --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/tools/X11/xmousepasteblock/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 pkgs/tools/X11/xmousepasteblock/default.nix (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a79221ce2854d..3ed31c9ce9191 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5443,6 +5443,12 @@ githubId = 3250809; name = "Milan Pässler"; }; + petercommand = { + email = "petercommand@gmail.com"; + github = "petercommand"; + githubId = 1260660; + name = "petercommand"; + }; peterhoeg = { email = "peter@hoeg.com"; github = "peterhoeg"; diff --git a/pkgs/tools/X11/xmousepasteblock/default.nix b/pkgs/tools/X11/xmousepasteblock/default.nix new file mode 100644 index 0000000000000..0cace7f452bbf --- /dev/null +++ b/pkgs/tools/X11/xmousepasteblock/default.nix @@ -0,0 +1,21 @@ +{ xorg, stdenv, libev, fetchFromGitHub, pkgconfig }: + +stdenv.mkDerivation rec { + pname = "xmousepasteblock"; + version = "1.0"; + src = fetchFromGitHub { + owner = "milaq"; + repo = "XMousePasteBlock"; + sha256 = "0vidckfp277cg2gsww8a8q5b18m10iy4ppyp2qipr89771nrcmns"; + rev = version; + }; + makeFlags = "PREFIX=$(out)"; + buildInputs = with xorg; [ libX11 libXext libXi libev ]; + nativeBuildInputs = [ pkgconfig ]; + meta = with stdenv.lib; { + description = "Middle mouse button primary X selection/clipboard paste disabler"; + homepage = https://github.com/milaq/XMousePasteBlock; + license = stdenv.lib.licenses.gpl2; + maintainers = [ maintainers.petercommand ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eef90aa75b7a8..17d35b3644c23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2138,6 +2138,8 @@ in libmaxminddb = null; }; + xmousepasteblock = callPackage ../tools/X11/xmousepasteblock { }; + mar1d = callPackage ../games/mar1d { } ; mcrypt = callPackage ../tools/misc/mcrypt { }; -- cgit 1.4.1 From f2fea8894dae30ae1cc46c70302a9cc7d54a6ea4 Mon Sep 17 00:00:00 2001 From: blanky0230 Date: Thu, 21 Nov 2019 23:10:41 +0100 Subject: nixos/tuxedo-keyboard: init module. --- maintainers/maintainer-list.nix | 1 + nixos/modules/hardware/tuxedo-keyboard.nix | 35 +++++++++++++++++++++ nixos/modules/module-list.nix | 1 + .../linux/firmware/tuxedo-keyboard/default.nix | 36 ---------------------- pkgs/os-specific/linux/tuxedo-keyboard/default.nix | 28 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 66 insertions(+), 37 deletions(-) create mode 100644 nixos/modules/hardware/tuxedo-keyboard.nix delete mode 100644 pkgs/os-specific/linux/firmware/tuxedo-keyboard/default.nix create mode 100644 pkgs/os-specific/linux/tuxedo-keyboard/default.nix (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7e8042292ee41..2798a6c0f8ed8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -960,6 +960,7 @@ blanky0230 = { email = "blanky0230@gmail.com"; github = "blanky0230"; + githubId = 5700358; name = "Thomas Blank"; }; blitz = { diff --git a/nixos/modules/hardware/tuxedo-keyboard.nix b/nixos/modules/hardware/tuxedo-keyboard.nix new file mode 100644 index 0000000000000..898eed2449355 --- /dev/null +++ b/nixos/modules/hardware/tuxedo-keyboard.nix @@ -0,0 +1,35 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.hardware.tuxedo-keyboard; + tuxedo-keyboard = config.boot.kernelPackages.tuxedo-keyboard; +in + { + options.hardware.tuxedo-keyboard = { + enable = mkEnableOption '' + Enables the tuxedo-keyboard driver. + + To configure the driver, pass the options to the configuration. + There are several parameters you can change. It's best to check at the source code description which options are supported. + You can find all the supported parameters at: + + In order to use the custom lighting with the maximumg brightness and a color of 0xff0a0a one would put pass like this: + + + boot.kernelParams = [ + "tuxedo_keyboard.mode=0" + "tuxedo_keyboard.brightness=255" + "tuxedo_keyboard.color_left=0xff0a0a" + ]; + + ''; + }; + + config = mkIf cfg.enable + { + boot.kernelModules = ["tuxedo_keyboard"]; + boot.extraModulePackages = [ tuxedo-keyboard ]; + }; + } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index eadf1d2d89b3c..8953ec03948b1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -62,6 +62,7 @@ ./hardware/printers.nix ./hardware/raid/hpsa.nix ./hardware/steam-hardware.nix + ./hardware/tuxedo-keyboard.nix ./hardware/usb-wwan.nix ./hardware/onlykey.nix ./hardware/video/amdgpu.nix diff --git a/pkgs/os-specific/linux/firmware/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/firmware/tuxedo-keyboard/default.nix deleted file mode 100644 index 79586bbe12299..0000000000000 --- a/pkgs/os-specific/linux/firmware/tuxedo-keyboard/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchFromGitHub, kernel, kmod }: - -# TODO: look at the other kernel modules packages and see if you find improvements to do - -stdenv.mkDerivation rec { - pname = "tuxedo-keyboard-${kernel.version}"; - version = "2019-08-26"; - - src = fetchFromGitHub { - owner = "tuxedocomputers"; - repo = "tuxedo-keyboard"; - rev = "d65e76e84cfd8169591fc2a0a7c9219fa19da1b5"; - sha256 = "1s48qpwybwh5pwqas2d1v2a7x4r97sm4hr9i4902r1d7h384bv17"; - }; - - - unpackPhase = '' - mkdir -p $out/build/src - cp -r $src/* $out/build - ''; - - makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; - - installPhase = '' - mkdir -p "$out/lib/modules/${kernel.modDirVersion}" - cp $out/build/src/tuxedo_keyboard.ko $out/lib/modules/${kernel.modDirVersion} - rm -rf $out/build - ''; - - meta = { - description = "Full color keyboard driver for tuxedo computers laptops"; - homepage = "https://github.com/tuxedocomputers/tuxedo-keyboard/"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.blanky0230 ]; - }; -} diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix new file mode 100644 index 0000000000000..b67bf2d3dab6f --- /dev/null +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, kernel, kmod }: + +stdenv.mkDerivation rec { + pname = "tuxedo-keyboard-${kernel.version}"; + version = "2019-08-26"; + + src = fetchFromGitHub { + owner = "tuxedocomputers"; + repo = "tuxedo-keyboard"; + rev = "d65e76e84cfd8169591fc2a0a7c9219fa19da1b5"; + sha256 = "1s48qpwybwh5pwqas2d1v2a7x4r97sm4hr9i4902r1d7h384bv17"; + }; + + makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + + installPhase = '' + mkdir -p "$out/lib/modules/${kernel.modDirVersion}" + mv src/tuxedo_keyboard.ko $out/lib/modules/${kernel.modDirVersion} + ''; + + meta = with stdenv.lib; { + description = "Full color keyboard driver for tuxedo computers laptops"; + homepage = "https://github.com/tuxedocomputers/tuxedo-keyboard/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.blanky0230 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2faf957dc9a75..397612f7a538c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16570,7 +16570,7 @@ in facetimehd = callPackage ../os-specific/linux/facetimehd { }; - tuxedo-keyboard = callPackage ../os-specific/linux/firmware/tuxedo-keyboard { }; + tuxedo-keyboard = callPackage ../os-specific/linux/tuxedo-keyboard { }; jool = callPackage ../os-specific/linux/jool { }; -- cgit 1.4.1 From 1af6bdd48f21e120cb4539617d468eefb07c4f90 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 27 Jan 2020 08:29:28 -0600 Subject: plasma5: 5.16.5 -> 5.17.5 --- maintainers/scripts/fetch-kde-qt.sh | 3 +- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 371 ++++++++++++++++++------------------ 3 files changed, 193 insertions(+), 183 deletions(-) (limited to 'maintainers') diff --git a/maintainers/scripts/fetch-kde-qt.sh b/maintainers/scripts/fetch-kde-qt.sh index a267a5fa8715d..c6c980dd0cb67 100755 --- a/maintainers/scripts/fetch-kde-qt.sh +++ b/maintainers/scripts/fetch-kde-qt.sh @@ -28,7 +28,8 @@ find . -type f | while read src; do done cat >"$SRCS" < Date: Tue, 28 Jan 2020 14:48:10 +0100 Subject: maintainers: add foxit64 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 22f9b78a650ac..8d0b13fcfb0f1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7974,4 +7974,10 @@ githubId = 8686360; name = "Illia Shestakov"; }; + foxit64 = { + email = "o4nsxy05@gmail.com"; + github = "foxit64"; + githubId = 56247270; + name = "Foxit"; + }; } -- cgit 1.4.1 From 3ff2f1555e496d2bcbfe3e19060b4787b7d3d896 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Tue, 28 Jan 2020 11:01:15 -0800 Subject: maintainers: add Frostman --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8a5a5e50d01cc..0da9e6df17155 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2550,6 +2550,12 @@ githubId = 1943632; name = "fro_ozen"; }; + Frostman = { + email = "me@slukjanov.name"; + github = "Frostman"; + githubId = 134872; + name = "Sergei Lukianov"; + }; frontsideair = { email = "photonia@gmail.com"; github = "frontsideair"; -- cgit 1.4.1 From fb112ee97f04f26ac73ae2413a31b3b5a023bf6a Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 29 Jan 2020 12:40:44 -0500 Subject: add maintainer: drewrisinger University of Maryland PhD Student. Quantum Computing. --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0da9e6df17155..36ba653c87885 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1905,6 +1905,12 @@ email = "burkett.andrew@gmail.com"; name = "Andrew Burkett"; }; + drewrisinger = { + email = "drisinger+nixpkgs@gmail.com"; + github = "drewrisinger"; + gitHubId = 10198051; + name = "Drew Risinger"; + }; dsferruzza = { email = "david.sferruzza@gmail.com"; github = "dsferruzza"; -- cgit 1.4.1 From 3c5f6dca9f85978cf40a329ea84c4664c7c3358b Mon Sep 17 00:00:00 2001 From: Илья Федин Date: Sun, 8 Dec 2019 18:26:28 +0400 Subject: maintainers: add ilya-fedin --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0da9e6df17155..43668ab43180e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3028,6 +3028,12 @@ githubId = 4401220; name = "Michael Eden"; }; + ilya-fedin = { + email = "fedin-ilja2010@ya.ru"; + github = "ilya-fedin"; + githubId = 17829319; + name = "Ilya Fedin"; + }; ilya-kolpakov = { email = "ilya.kolpakov@gmail.com"; github = "ilya-kolpakov"; -- cgit 1.4.1 From 4d67e30713972b7404f5a9fc29017c3c694ccc08 Mon Sep 17 00:00:00 2001 From: Asad Saeeduddin Date: Sun, 2 Feb 2020 01:25:29 -0500 Subject: gitAndTools.git-interactive-rebase-tool: init --- maintainers/maintainer-list.nix | 6 + .../version-management/git-and-tools/default.nix | 2 + .../01-terminaltests.patch | 169 +++++++++++++++++++++ .../git-interactive-rebase-tool/default.nix | 27 ++++ 4 files changed, 204 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/01-terminaltests.patch create mode 100644 pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b55f44c1d612d..fe887b9d7cee7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8004,4 +8004,10 @@ githubId = 56247270; name = "Foxit"; }; + masaeedu = { + email = "masaeedu@gmail.com"; + github = "masaeedu"; + githubId = 3674056; + name = "Asad Saeeduddin"; + }; } diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index c6e046ea45bc0..3a68f7903822c 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -103,6 +103,8 @@ let git-imerge = callPackage ./git-imerge { }; + git-interactive-rebase-tool = callPackage ./git-interactive-rebase-tool {}; + git-machete = python3Packages.callPackage ./git-machete { }; git-octopus = callPackage ./git-octopus { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/01-terminaltests.patch b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/01-terminaltests.patch new file mode 100644 index 0000000000000..1bbae6dc01a75 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/01-terminaltests.patch @@ -0,0 +1,169 @@ +--- a/src/display/utils.rs ++++ b/src/display/utils.rs +@@ -53,166 +53,3 @@ + _ => ColorMode::TwoTone, + } + } +- +-#[cfg(all(windows, test))] +-mod tests { +- use crate::display::color_mode::ColorMode; +- use crate::display::utils::detect_color_mode; +- +- #[test] +- fn detect_color_mode_windows() { +- assert_eq!(detect_color_mode(2), ColorMode::ThreeBit); +- } +-} +- +-#[cfg(all(unix, test))] +-mod tests { +- use crate::display::color_mode::ColorMode; +- use crate::display::utils::detect_color_mode; +- use std::env::{remove_var, set_var}; +- +- fn clear_env() { +- remove_var("COLORTERM"); +- remove_var("VTE_VERSION"); +- remove_var("TERM_PROGRAM"); +- remove_var("TERM"); +- } +- +- #[test] +- fn detect_color_mode_no_env_2_colors() { +- clear_env(); +- assert_eq!(detect_color_mode(2), ColorMode::TwoTone); +- } +- +- #[test] +- fn detect_color_mode_no_env_8_colors() { +- clear_env(); +- assert_eq!(detect_color_mode(8), ColorMode::ThreeBit); +- } +- +- #[test] +- fn detect_color_mode_no_env_less_8_colors() { +- clear_env(); +- assert_eq!(detect_color_mode(7), ColorMode::TwoTone); +- } +- +- #[test] +- fn detect_color_mode_no_env_16_colors() { +- clear_env(); +- assert_eq!(detect_color_mode(16), ColorMode::FourBit); +- } +- +- #[test] +- fn detect_color_mode_no_env_less_16_colors() { +- clear_env(); +- assert_eq!(detect_color_mode(15), ColorMode::ThreeBit); +- } +- +- #[test] +- fn detect_color_mode_no_env_256_colors() { +- clear_env(); +- assert_eq!(detect_color_mode(256), ColorMode::EightBit); +- } +- +- #[test] +- fn detect_color_mode_no_env_less_256_colors() { +- clear_env(); +- assert_eq!(detect_color_mode(255), ColorMode::FourBit); +- } +- +- #[test] +- fn detect_color_mode_no_env_more_256_colors() { +- clear_env(); +- assert_eq!(detect_color_mode(257), ColorMode::EightBit); +- } +- +- #[test] +- fn detect_color_mode_term_env_no_256() { +- clear_env(); +- set_var("TERM", "XTERM"); +- assert_eq!(detect_color_mode(0), ColorMode::TwoTone); +- } +- +- #[test] +- fn detect_color_mode_term_env_with_256() { +- clear_env(); +- set_var("TERM", "XTERM-256"); +- assert_eq!(detect_color_mode(0), ColorMode::EightBit); +- } +- +- #[test] +- fn detect_color_mode_term_program_env_apple_terminal() { +- clear_env(); +- set_var("TERM_PROGRAM", "Apple_Terminal"); +- assert_eq!(detect_color_mode(0), ColorMode::EightBit); +- } +- +- #[test] +- fn detect_color_mode_term_program_env_iterm() { +- clear_env(); +- set_var("TERM_PROGRAM", "iTerm.app"); +- assert_eq!(detect_color_mode(0), ColorMode::EightBit); +- } +- +- #[test] +- fn detect_color_mode_term_program_env_other() { +- clear_env(); +- set_var("TERM_PROGRAM", "other"); +- assert_eq!(detect_color_mode(0), ColorMode::TwoTone); +- } +- +- #[test] +- fn detect_color_mode_vte_version_0_36_00() { +- clear_env(); +- set_var("VTE_VERSION", "3600"); +- assert_eq!(detect_color_mode(0), ColorMode::TrueColor); +- } +- +- #[test] +- fn detect_color_mode_vte_version_greater_0_36_00() { +- clear_env(); +- set_var("VTE_VERSION", "3601"); +- assert_eq!(detect_color_mode(0), ColorMode::TrueColor); +- } +- +- #[test] +- fn detect_color_mode_vte_version_less_0_36_00() { +- clear_env(); +- set_var("VTE_VERSION", "1"); +- assert_eq!(detect_color_mode(0), ColorMode::EightBit); +- } +- +- #[test] +- fn detect_color_mode_vte_version_0() { +- clear_env(); +- set_var("VTE_VERSION", "0"); +- assert_eq!(detect_color_mode(0), ColorMode::TwoTone); +- } +- #[test] +- fn detect_color_mode_vte_version_invalid() { +- clear_env(); +- set_var("VTE_VERSION", "invalid"); +- assert_eq!(detect_color_mode(0), ColorMode::TwoTone); +- } +- +- #[test] +- fn detect_color_mode_colorterm_env_is_truecolor() { +- clear_env(); +- set_var("COLORTERM", "truecolor"); +- assert_eq!(detect_color_mode(0), ColorMode::TrueColor); +- } +- +- #[test] +- fn detect_color_mode_colorterm_env_is_24bit() { +- clear_env(); +- set_var("COLORTERM", "24bit"); +- assert_eq!(detect_color_mode(0), ColorMode::TrueColor); +- } +- +- #[test] +- fn detect_color_mode_colorterm_env_is_other() { +- clear_env(); +- set_var("COLORTERM", "other"); +- assert_eq!(detect_color_mode(0), ColorMode::TwoTone); +- } +-} diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix new file mode 100644 index 0000000000000..81b4486d569f1 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -0,0 +1,27 @@ +{ lib, ncurses5, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "git-interactive-rebase-tool"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "MitMaro"; + repo = pname; + rev = version; + sha256 = "10z3di2qypgsmg2z7xfs9nlrf9vng5i7l8dvqadv1l4lb9zz7i8q"; + }; + + patches = [ ./01-terminaltests.patch ]; + + cargoSha256 = "002kr52vlpv1rhnxki29xflpmgk6bszrw0dsxcc34kyal0593ajk"; + + buildInputs = [ ncurses5 ]; + + meta = with lib; { + homepage = "https://github.com/MitMaro/git-interactive-rebase-tool"; + description = "Native cross platform full feature terminal based sequence editor for git interactive rebase"; + changelog = "https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ masaeedu ]; + }; +} -- cgit 1.4.1 From 2f220a6672bb34c06fc83ef446c6a47caeaf480e Mon Sep 17 00:00:00 2001 From: Kristian Brucaj Date: Sun, 2 Feb 2020 18:59:54 -0500 Subject: maintainers: add kristian-brucaj --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fe887b9d7cee7..8a806baf98430 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3878,6 +3878,12 @@ githubId = 17659803; name = "Matthias Axel Kröll"; }; + kristian-brucaj = { + email = "kbrucaj@gmail.com"; + github = "kristian-brucaj"; + githubID = "8893110"; + name = "Kristian Brucaj"; + }; kristoff3r = { email = "k.soeholm@gmail.com"; github = "kristoff3r"; -- cgit 1.4.1 From 07ccc6f753bb458340ba03df2ac20dff0aa62f31 Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 7 Feb 2020 14:32:38 +0100 Subject: maintainers: Add Atemu to the list Glad to be contributing to such a great project :) --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8a806baf98430..4bb59d9c49e3d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -682,6 +682,12 @@ githubId = 192147; name = "aszlig"; }; + atemu = { + name = "Atemu"; + email = "atemu.main+nixpkgs@gmail.com"; + github = "Atemu"; + githubId = 18599032; + }; athas = { email = "athas@sigkill.dk"; github = "athas"; -- cgit 1.4.1 From d1508cb819cea16167e613894c7cbc8202b23148 Mon Sep 17 00:00:00 2001 From: Lucio Delelis Date: Sun, 9 Feb 2020 06:25:08 -0300 Subject: pythonPackages.pyfcm: init at 1.4.7 (#67321) * pythonPackages.pyfcm: init at 1.4.7 * pythonPackages.pyfcm: build from github, rather than Pypi * pythonPackages.pyfcm: adds ldelelis as package maintainer --- maintainers/maintainer-list.nix | 6 +++++ pkgs/development/python-modules/pyfcm/default.nix | 29 +++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pyfcm/default.nix (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4bb59d9c49e3d..2505cf9533018 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3991,6 +3991,12 @@ githubId = 32152; name = "Luka Blaskovic"; }; + ldelelis = { + email = "ldelelis@est.frba.utn.edu.ar"; + github = "ldelelis"; + githubId = 20250323; + name = "Lucio Delelis"; + }; ldesgoui = { email = "ldesgoui@gmail.com"; github = "ldesgoui"; diff --git a/pkgs/development/python-modules/pyfcm/default.nix b/pkgs/development/python-modules/pyfcm/default.nix new file mode 100644 index 0000000000000..22afc793cde9d --- /dev/null +++ b/pkgs/development/python-modules/pyfcm/default.nix @@ -0,0 +1,29 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, requests +}: + +buildPythonPackage rec { + pname = "pyfcm"; + version = "1.4.7"; + + src = fetchFromGitHub { + owner = "olucurious"; + repo = "pyfcm"; + rev = "${version}"; + sha256 = "0aj10yvjsc04j15zbn403i83j7ra5yg35pi3ywkyakk8n1s0s3qg"; + }; + + propagatedBuildInputs = [ requests ]; + + # pyfcm's unit testing suite requires network access + doCheck = false; + + meta = with lib; { + description = "Python client for FCM - Firebase Cloud Messaging (Android, iOS and Web)"; + homepage = "https://github.com/olucurious/pyfcm"; + license = licenses.mit; + maintainers = with maintainers; [ ldelelis ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ae4b5e54e580..988f1ec38f781 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1082,6 +1082,8 @@ in { pyfaidx = callPackage ../development/python-modules/pyfaidx { }; + pyfcm = callPackage ../development/python-modules/pyfcm { }; + pyfttt = callPackage ../development/python-modules/pyfttt { }; pyftdi = callPackage ../development/python-modules/pyftdi { }; -- cgit 1.4.1 From e7d80e3e15623ec0fb3eac8fd621882ab8a5d3e5 Mon Sep 17 00:00:00 2001 From: talkara <51232929+talkara@users.noreply.github.com> Date: Sun, 9 Feb 2020 11:27:45 +0200 Subject: pythonPackages.robotframework-databaselibrary: init at 1.2.4 (#67339) * pythonPackages.robotframework-databaselibrary: init at 1.2.4 * maintainers: add talkara * pythonPackages.robotframework-databaselibrary: add meta.maintainers: talkara --- maintainers/maintainer-list.nix | 6 +++++ .../robotframework-databaselibrary/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/robotframework-databaselibrary/default.nix (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2505cf9533018..8d5447654eef2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6951,6 +6951,12 @@ githubId = 870673; name = "Takuo Yonezawa"; }; + talkara = { + email = "taito.horiuchi@relexsolutions.com"; + github = "talkara"; + githubId = 51232929; + name = "Taito Horiuchi"; + }; talyz = { email = "kim.lindberger@gmail.com"; github = "talyz"; diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix new file mode 100644 index 0000000000000..6af58312523e3 --- /dev/null +++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, robotframework +}: + +buildPythonPackage rec { + version = "1.2.4"; + pname = "robotframework-databaselibrary"; + + src = fetchPypi { + inherit pname version; + sha256 = "627d872b3dda6a308a650ac9e676dadedf9c294e4ef70ad207cbb86b78eb8847"; + }; + + # unit tests are impure + doCheck = false; + + propagatedBuildInputs = [ robotframework ]; + + meta = with stdenv.lib; { + description = "Database Library contains utilities meant for Robot Framework"; + homepage = https://github.com/franz-see/Robotframework-Database-Library; + license = licenses.asl20; + maintainers = with maintainers; [ talkara ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4259c908cd703..91158efd0186c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5301,6 +5301,8 @@ in { robotframework = callPackage ../development/python-modules/robotframework { }; + robotframework-databaselibrary = callPackage ../development/python-modules/robotframework-databaselibrary { }; + robotframework-requests = callPackage ../development/python-modules/robotframework-requests { }; robotframework-ride = callPackage ../development/python-modules/robotframework-ride { }; -- cgit 1.4.1