From 3925fa19434f2d3677e579d334b829be8aeaa630 Mon Sep 17 00:00:00 2001 From: Jens Getreu Date: Mon, 11 Mar 2024 12:47:51 +0200 Subject: maintainer: add getreu --- 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 f174f302c323d..28752cb195116 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7048,6 +7048,12 @@ github = "getpsyched"; githubId = 43472218; }; + getreu = { + email = "getreu@web.de"; + github = "getreu"; + githubId = 579082; + name = "Jens Getreu"; + }; gfrascadorio = { email = "gfrascadorio@tutanota.com"; github = "gfrascadorio"; -- cgit 1.4.1 From e0d2c123b9da07549e913028870862d4aa9d3916 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 13 Mar 2024 18:54:41 +0900 Subject: luaPackages.tiktoken_core: init at 0.2.1-1 --- maintainers/scripts/luarocks-packages.csv | 1 + .../development/lua-modules/generated-packages.nix | 33 ++++++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 8 ++++++ 3 files changed, 42 insertions(+) (limited to 'maintainers') diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 939905ab81d9d..325b2f30f0473 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -116,6 +116,7 @@ stdlib,,,,41.2.2,,vyp teal-language-server,,,http://luarocks.org/dev,,, telescope.nvim,,,,,5.1, telescope-manix,,,,,, +tiktoken_core,,,,,,natsukium tl,,,,,,mephistophiles toml,,,,,,mrcjkb toml-edit,,,,,5.1,mrcjkb diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 3bc58c29ff964..785de9eafe44a 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -3297,6 +3297,39 @@ buildLuarocksPackage { }; }) {}; +tiktoken_core = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luarocks-build-rust-mlua }: +buildLuarocksPackage { + pname = "tiktoken_core"; + version = "0.2.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/tiktoken_core-0.2.1-1.rockspec"; + sha256 = "0mdmrpg82vmk0cqiqdayyk4vvl299z0xqrg58q18dfs5nc27wkla"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/gptlang/lua-tiktoken", + "rev": "61d831a81a01ba095f8c94e148b721b3aa7b1e45", + "date": "2024-03-03T23:24:06+00:00", + "path": "/nix/store/5ik17k726wl8hpz295n7dqq3438k8ddj-lua-tiktoken", + "sha256": "11lpzxmmb4zglkp9czlzggd8i46r7whpq021b5d3fx7bc5a81d3n", + "hash": "sha256-drSAVGHrdDdaWUEAfCE/2ZCI2nuffpbupO+TVWv/l4Y=", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path" "sha256"]) ; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua luarocks-build-rust-mlua ]; + + meta = { + homepage = "https://github.com/gptlang/lua-tiktoken"; + description = "An experimental port of OpenAI's Tokenizer to lua"; + maintainers = with lib.maintainers; [ natsukium ]; + license.fullName = "MIT"; + }; +}) {}; + tl = callPackage({ argparse, buildLuarocksPackage, compat53, fetchgit, fetchurl, luafilesystem }: buildLuarocksPackage { pname = "tl"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index a0ad250439208..a828ffaa800ab 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -642,6 +642,14 @@ with prev; ''; }); + tiktoken_core = prev.tiktoken_core.overrideAttrs (oa: { + cargoDeps = rustPlatform.fetchCargoTarball { + src = oa.src; + hash = "sha256-YApsOGfAw34zp069lyGR6FGjxty1bE23+Tic07f8zI4="; + }; + nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ]; + }); + toml = prev.toml.overrideAttrs (oa: { patches = [ ./toml.patch ]; -- cgit 1.4.1 From 91a2510d05a3747ec575d2f5e203a60926ef72cc Mon Sep 17 00:00:00 2001 From: Federico Damián Schonborn Date: Wed, 13 Mar 2024 16:21:10 -0300 Subject: maintainers: drop federicoschonborn MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- maintainers/maintainer-list.nix | 10 ---------- nixos/tests/budgie.nix | 2 +- pkgs/applications/misc/valent/default.nix | 2 +- pkgs/by-name/wa/waycheck/package.nix | 2 +- pkgs/desktops/budgie/budgie-backgrounds/default.nix | 2 +- pkgs/desktops/budgie/budgie-control-center/default.nix | 2 +- pkgs/desktops/budgie/budgie-desktop-view/default.nix | 2 +- pkgs/desktops/budgie/budgie-desktop/default.nix | 2 +- pkgs/desktops/budgie/budgie-screensaver/default.nix | 2 +- pkgs/desktops/budgie/budgie-session/default.nix | 2 +- pkgs/desktops/budgie/magpie/default.nix | 2 +- .../budgie/plugins/budgie-analogue-clock-applet/default.nix | 2 +- .../budgie/plugins/budgie-media-player-applet/default.nix | 2 +- .../budgie/plugins/budgie-user-indicator-redux/default.nix | 2 +- pkgs/desktops/gnome/extensions/valent/default.nix | 2 +- pkgs/desktops/xfce/core/libxfce4windowing/default.nix | 2 +- pkgs/development/libraries/yyjson/default.nix | 2 +- pkgs/tools/misc/fastfetch/default.nix | 2 +- 18 files changed, 17 insertions(+), 27 deletions(-) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1cba31c18d0b9..0b3ffab2c4afb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6249,16 +6249,6 @@ githubId = 541748; name = "Felipe Espinoza"; }; - federicoschonborn = { - name = "Federico Damián Schonborn"; - email = "fdschonborn@gmail.com"; - github = "FedericoSchonborn"; - githubId = 62166915; - matrix = "@FedericoDSchonborn:matrix.org"; - keys = [ - { fingerprint = "517A 8A6A 09CA A11C 9667 CEE3 193F 70F1 5C9A B0A0"; } - ]; - }; fedx-sudo = { email = "fedx-sudo@pm.me"; github = "FedX-sudo"; diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix index fe0ed2cf80edf..89f6ed6656355 100644 --- a/nixos/tests/budgie.nix +++ b/nixos/tests/budgie.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "budgie"; - meta.maintainers = [ lib.maintainers.federicoschonborn ]; + meta.maintainers = [ ]; nodes.machine = { ... }: { imports = [ diff --git a/pkgs/applications/misc/valent/default.nix b/pkgs/applications/misc/valent/default.nix index 09ec8609712d5..fbd93fe504cce 100644 --- a/pkgs/applications/misc/valent/default.nix +++ b/pkgs/applications/misc/valent/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { homepage = "https://valent.andyholmes.ca"; changelog = "https://github.com/andyholmes/valent/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ gpl3Plus cc0 cc-by-sa-30 ]; - maintainers = with maintainers; [ federicoschonborn aleksana ]; + maintainers = with maintainers; [ aleksana ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/wa/waycheck/package.nix b/pkgs/by-name/wa/waycheck/package.nix index cb78db2d6e38c..1c4077c9ecb6e 100644 --- a/pkgs/by-name/wa/waycheck/package.nix +++ b/pkgs/by-name/wa/waycheck/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Simple GUI that displays the protocols implemented by a Wayland compositor"; homepage = "https://gitlab.freedesktop.org/serebit/waycheck"; license = licenses.asl20; - maintainers = with maintainers; [ julienmalka federicoschonborn ]; + maintainers = with maintainers; [ julienmalka ]; mainProgram = "waycheck"; platforms = platforms.linux; }; diff --git a/pkgs/desktops/budgie/budgie-backgrounds/default.nix b/pkgs/desktops/budgie/budgie-backgrounds/default.nix index fc51474af340e..6ef178a4f3412 100644 --- a/pkgs/desktops/budgie/budgie-backgrounds/default.nix +++ b/pkgs/desktops/budgie/budgie-backgrounds/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "The default background set for the Budgie Desktop"; homepage = "https://github.com/BuddiesOfBudgie/budgie-backgrounds"; platforms = platforms.linux; - maintainers = [ maintainers.federicoschonborn ]; + maintainers = [ ]; license = licenses.cc0; }; } diff --git a/pkgs/desktops/budgie/budgie-control-center/default.nix b/pkgs/desktops/budgie/budgie-control-center/default.nix index 1b39949115085..f2582434f295b 100644 --- a/pkgs/desktops/budgie/budgie-control-center/default.nix +++ b/pkgs/desktops/budgie/budgie-control-center/default.nix @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/BuddiesOfBudgie/budgie-control-center"; mainProgram = "budgie-control-center"; platforms = platforms.linux; - maintainers = [ maintainers.federicoschonborn ]; + maintainers = [ ]; license = licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/budgie/budgie-desktop-view/default.nix b/pkgs/desktops/budgie/budgie-desktop-view/default.nix index 2614db09c87f6..27c2a016f3ad6 100644 --- a/pkgs/desktops/budgie/budgie-desktop-view/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop-view/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "org.buddiesofbudgie.budgie-desktop-view"; license = lib.licenses.asl20; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ federicoschonborn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/desktops/budgie/budgie-desktop/default.nix b/pkgs/desktops/budgie/budgie-desktop/default.nix index 7dc23cf10f504..c89e2be046a34 100644 --- a/pkgs/desktops/budgie/budgie-desktop/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop/default.nix @@ -102,6 +102,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop"; license = with lib.licenses; [ gpl2Plus lgpl21Plus cc-by-sa-30 ]; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ federicoschonborn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/desktops/budgie/budgie-screensaver/default.nix b/pkgs/desktops/budgie/budgie-screensaver/default.nix index ef7a0f3d762c8..2ca4320ca5657 100644 --- a/pkgs/desktops/budgie/budgie-screensaver/default.nix +++ b/pkgs/desktops/budgie/budgie-screensaver/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/BuddiesOfBudgie/budgie-screensaver"; mainProgram = "budgie-screensaver"; platforms = platforms.linux; - maintainers = [ maintainers.federicoschonborn ]; + maintainers = [ ]; license = licenses.gpl2Only; }; } diff --git a/pkgs/desktops/budgie/budgie-session/default.nix b/pkgs/desktops/budgie/budgie-session/default.nix index 70b49080cb68f..8eb5b0056c586 100644 --- a/pkgs/desktops/budgie/budgie-session/default.nix +++ b/pkgs/desktops/budgie/budgie-session/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Session manager for Budgie"; homepage = "https://github.com/BuddiesOfBudgie/budgie-session"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [federicoschonborn]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/desktops/budgie/magpie/default.nix b/pkgs/desktops/budgie/magpie/default.nix index 827948d244013..8332c97c177be 100644 --- a/pkgs/desktops/budgie/magpie/default.nix +++ b/pkgs/desktops/budgie/magpie/default.nix @@ -160,7 +160,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Softish fork of Mutter 43.x"; homepage = "https://github.com/BuddiesOfBudgie/magpie"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ federicoschonborn ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; }) diff --git a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix index c443cb72dd49f..49738d3e3e097 100644 --- a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Analogue Clock Applet for the Budgie desktop"; homepage = "https://github.com/samlane-ma/analogue-clock-applet"; license = licenses.gpl3Plus; - maintainers = [ maintainers.federicoschonborn ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix b/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix index ae3a44f22fd03..8bb05f869e500 100644 --- a/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation { homepage = "https://github.com/zalesyc/budgie-media-player-applet"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ federicoschonborn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix index 0d031dbaeb5a6..12df683711214 100644 --- a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/EbonJaeger/budgie-user-indicator-redux/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.federicoschonborn ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/gnome/extensions/valent/default.nix b/pkgs/desktops/gnome/extensions/valent/default.nix index 7bb529b743bbb..7148fc8d8bd0d 100644 --- a/pkgs/desktops/gnome/extensions/valent/default.nix +++ b/pkgs/desktops/gnome/extensions/valent/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = "https://valent.andyholmes.ca/"; changelog = "https://github.com/andyholmes/gnome-shell-extension-valent/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Plus; - maintainers = [ maintainers.federicoschonborn ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/libxfce4windowing/default.nix b/pkgs/desktops/xfce/core/libxfce4windowing/default.nix index 6395497fccdae..4ae9d9ca1b65d 100644 --- a/pkgs/desktops/xfce/core/libxfce4windowing/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4windowing/default.nix @@ -13,6 +13,6 @@ mkXfceDerivation { meta = { description = "Windowing concept abstraction library for X11 and Wayland"; license = lib.licenses.lgpl21Plus; - maintainers = with lib; [ maintainers.federicoschonborn ] ++ teams.xfce.members; + maintainers = lib.teams.xfce.members; }; } diff --git a/pkgs/development/libraries/yyjson/default.nix b/pkgs/development/libraries/yyjson/default.nix index 7fe1633628646..b0e17fffad2a0 100644 --- a/pkgs/development/libraries/yyjson/default.nix +++ b/pkgs/development/libraries/yyjson/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ibireme/yyjson"; changelog = "https://github.com/ibireme/yyjson/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ federicoschonborn ]; + maintainers = with maintainers; [ ]; }; }) diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index 2e727896905dd..b718452c37359 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Like neofetch, but much faster because written in C"; homepage = "https://github.com/fastfetch-cli/fastfetch"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ gerg-l khaneliman federicoschonborn ]; + maintainers = with lib.maintainers; [ gerg-l khaneliman ]; platforms = lib.platforms.all; mainProgram = "fastfetch"; }; -- cgit 1.4.1 From 1d3d0d6a89d84ecda3755ed46204d596621bb8bd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 14 Mar 2024 12:28:41 +0800 Subject: budgie: add myself (bobby285271) as maintainer Let's hope this package set is not too hard to maintain. --- maintainers/team-list.nix | 8 ++++++++ nixos/tests/budgie.nix | 2 +- pkgs/desktops/budgie/budgie-backgrounds/default.nix | 2 +- pkgs/desktops/budgie/budgie-control-center/default.nix | 2 +- pkgs/desktops/budgie/budgie-desktop-view/default.nix | 2 +- pkgs/desktops/budgie/budgie-desktop/default.nix | 2 +- pkgs/desktops/budgie/budgie-screensaver/default.nix | 2 +- pkgs/desktops/budgie/budgie-session/default.nix | 2 +- pkgs/desktops/budgie/magpie/default.nix | 2 +- .../budgie/plugins/budgie-analogue-clock-applet/default.nix | 2 +- .../budgie/plugins/budgie-media-player-applet/default.nix | 2 +- .../budgie/plugins/budgie-user-indicator-redux/default.nix | 2 +- 12 files changed, 19 insertions(+), 11 deletions(-) (limited to 'maintainers') diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 000b1300ac462..8e9194fd6371b 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -96,6 +96,14 @@ with lib.maintainers; { shortName = "Blockchains"; }; + budgie = { + members = [ + bobby285271 + ]; + scope = "Maintain Budgie desktop environment"; + shortName = "Budgie"; + }; + buildbot = { members = [ lopsided98 diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix index 89f6ed6656355..ca898bba1bc4a 100644 --- a/nixos/tests/budgie.nix +++ b/nixos/tests/budgie.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "budgie"; - meta.maintainers = [ ]; + meta.maintainers = lib.teams.budgie.members; nodes.machine = { ... }: { imports = [ diff --git a/pkgs/desktops/budgie/budgie-backgrounds/default.nix b/pkgs/desktops/budgie/budgie-backgrounds/default.nix index 6ef178a4f3412..b554cda38aaf0 100644 --- a/pkgs/desktops/budgie/budgie-backgrounds/default.nix +++ b/pkgs/desktops/budgie/budgie-backgrounds/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "The default background set for the Budgie Desktop"; homepage = "https://github.com/BuddiesOfBudgie/budgie-backgrounds"; platforms = platforms.linux; - maintainers = [ ]; + maintainers = teams.budgie.members; license = licenses.cc0; }; } diff --git a/pkgs/desktops/budgie/budgie-control-center/default.nix b/pkgs/desktops/budgie/budgie-control-center/default.nix index f2582434f295b..cc5a0c0b70610 100644 --- a/pkgs/desktops/budgie/budgie-control-center/default.nix +++ b/pkgs/desktops/budgie/budgie-control-center/default.nix @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/BuddiesOfBudgie/budgie-control-center"; mainProgram = "budgie-control-center"; platforms = platforms.linux; - maintainers = [ ]; + maintainers = teams.budgie.members; license = licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/budgie/budgie-desktop-view/default.nix b/pkgs/desktops/budgie/budgie-desktop-view/default.nix index 27c2a016f3ad6..99d90b8ab8882 100644 --- a/pkgs/desktops/budgie/budgie-desktop-view/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop-view/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "org.buddiesofbudgie.budgie-desktop-view"; license = lib.licenses.asl20; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + maintainers = lib.teams.budgie.members; }; }) diff --git a/pkgs/desktops/budgie/budgie-desktop/default.nix b/pkgs/desktops/budgie/budgie-desktop/default.nix index c89e2be046a34..26c2231870b0a 100644 --- a/pkgs/desktops/budgie/budgie-desktop/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop/default.nix @@ -102,6 +102,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop"; license = with lib.licenses; [ gpl2Plus lgpl21Plus cc-by-sa-30 ]; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + maintainers = lib.teams.budgie.members; }; }) diff --git a/pkgs/desktops/budgie/budgie-screensaver/default.nix b/pkgs/desktops/budgie/budgie-screensaver/default.nix index 2ca4320ca5657..f4139cbbe2e60 100644 --- a/pkgs/desktops/budgie/budgie-screensaver/default.nix +++ b/pkgs/desktops/budgie/budgie-screensaver/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/BuddiesOfBudgie/budgie-screensaver"; mainProgram = "budgie-screensaver"; platforms = platforms.linux; - maintainers = [ ]; + maintainers = teams.budgie.members; license = licenses.gpl2Only; }; } diff --git a/pkgs/desktops/budgie/budgie-session/default.nix b/pkgs/desktops/budgie/budgie-session/default.nix index 8eb5b0056c586..90185f85b1f09 100644 --- a/pkgs/desktops/budgie/budgie-session/default.nix +++ b/pkgs/desktops/budgie/budgie-session/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Session manager for Budgie"; homepage = "https://github.com/BuddiesOfBudgie/budgie-session"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ]; + maintainers = lib.teams.budgie.members; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/desktops/budgie/magpie/default.nix b/pkgs/desktops/budgie/magpie/default.nix index 8332c97c177be..7793fdf4df3d5 100644 --- a/pkgs/desktops/budgie/magpie/default.nix +++ b/pkgs/desktops/budgie/magpie/default.nix @@ -160,7 +160,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Softish fork of Mutter 43.x"; homepage = "https://github.com/BuddiesOfBudgie/magpie"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = teams.budgie.members; platforms = platforms.linux; }; }) diff --git a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix index 49738d3e3e097..4b89b0889c298 100644 --- a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Analogue Clock Applet for the Budgie desktop"; homepage = "https://github.com/samlane-ma/analogue-clock-applet"; license = licenses.gpl3Plus; - maintainers = [ ]; + maintainers = teams.budgie.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix b/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix index 8bb05f869e500..6b9057e1567a3 100644 --- a/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation { homepage = "https://github.com/zalesyc/budgie-media-player-applet"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + maintainers = lib.teams.budgie.members; }; } diff --git a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix index 12df683711214..aff5d0328085a 100644 --- a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/EbonJaeger/budgie-user-indicator-redux/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ ]; + maintainers = teams.budgie.members; }; } -- cgit 1.4.1 From ea3c2e26d3f954038edc0f0d05f62770679ae84c Mon Sep 17 00:00:00 2001 From: Shane Sveller Date: Thu, 14 Mar 2024 12:09:10 -0500 Subject: maintainers: remove shanesveller --- maintainers/maintainer-list.nix | 9 --------- pkgs/applications/version-management/gfold/default.nix | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3db0b7ef655a9..a05c01bc9df90 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17621,15 +17621,6 @@ matrix = "@shamrocklee:matrix.org"; name = "Yueh-Shun Li"; }; - shanesveller = { - email = "shane@sveller.dev"; - github = "shanesveller"; - githubId = 831; - keys = [{ - fingerprint = "F83C 407C ADC4 5A0F 1F2F 44E8 9210 C218 023C 15CD"; - }]; - name = "Shane Sveller"; - }; shard7 = { email = "sh7user@gmail.com"; github = "shard77"; diff --git a/pkgs/applications/version-management/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix index 0acd75d202ffa..1459e2f18e803 100644 --- a/pkgs/applications/version-management/gfold/default.nix +++ b/pkgs/applications/version-management/gfold/default.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage { "CLI tool to help keep track of your Git repositories, written in Rust"; homepage = "https://github.com/nickgerace/gfold"; license = licenses.asl20; - maintainers = [ maintainers.shanesveller ]; + maintainers = []; platforms = platforms.unix; mainProgram = "gfold"; }; -- cgit 1.4.1 From cb9af7651e05cad63268c3438b519e6069977a03 Mon Sep 17 00:00:00 2001 From: twitchy0 Date: Thu, 14 Mar 2024 19:48:27 -0400 Subject: orgparse: init at 0.4.20231004 --- maintainers/maintainer-list.nix | 6 ++++++ .../python-modules/orgparse/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/orgparse/default.nix (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a05c01bc9df90..ef3ce19da9c82 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19945,6 +19945,12 @@ fingerprint = "E631 8869 586F 99B4 F6E6 D785 5942 58F0 389D 2802"; }]; }; + twitchy0 = { + email = "code@nitinpassa.com"; + github = "twitchy0"; + githubId = 131159000; + name = "Nitin Passa"; + }; twitchyliquid64 = { name = "Tom"; email = "twitchyliquid64@ciphersink.net"; diff --git a/pkgs/development/python-modules/orgparse/default.nix b/pkgs/development/python-modules/orgparse/default.nix new file mode 100644 index 0000000000000..67988d5529ff9 --- /dev/null +++ b/pkgs/development/python-modules/orgparse/default.nix @@ -0,0 +1,22 @@ +{ lib, python3Packages, fetchPypi }: + +python3Packages.buildPythonPackage rec { + pname = "orgparse"; + version = "0.4.20231004"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-pOOK6tq/mYiw9npmrNCCedGCILy8QioSkGDCiQu6kaA="; + }; + + nativeBuildInputs = [ python3Packages.setuptools-scm ]; + + pyproject = true; + + meta = with lib; { + homepage = "https://github.com/karlicoss/orgparse"; + description = "orgparse - Emacs org-mode parser in Python"; + license = licenses.bsd2; + maintainers = with maintainers; [ twitchy0 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 545fe4a7dae37..afdb1adf6b43a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9054,6 +9054,8 @@ self: super: with self; { orderedset = callPackage ../development/python-modules/orderedset { }; + orgparse = callPackage ../development/python-modules/orgparse { }; + orjson = callPackage ../development/python-modules/orjson { }; orm = callPackage ../development/python-modules/orm { }; -- cgit 1.4.1