diff options
author | Emily Trau <13267947+emilytrau@users.noreply.github.com> | 2023-11-29 18:46:20 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-29 18:46:20 +1100 |
commit | a5aea79fbf621131c2b9a5d14573e5014e606513 (patch) | |
tree | b262736a647d29ad900d58769fe6e732097b9290 | |
parent | c2fc886d844d38af0831a648bf34545dcd6f5c81 (diff) | |
parent | 4e00e07e63d1dbc35437f09b5f201650099745eb (diff) |
Merge pull request #270852 from NixOS/backport-269642-to-release-23.11
[Backport release-23.11] remnote: 1.12.64 -> 1.13.0
-rw-r--r-- | maintainers/maintainer-list.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/misc/get_iplayer/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/remnote/default.nix | 6 | ||||
-rw-r--r-- | pkgs/by-name/cl/clamtk/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/on/onedrivegui/package.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/package-management/apx/default.nix | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ff5721e55b369..6be293f2f2b17 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3153,6 +3153,11 @@ githubId = 18648043; name = "Daniel Cartwright"; }; + chewblacka = { + github = "chewblacka"; + githubId = 18430320; + name = "John Garcia"; + }; Chili-Man = { email = "dr.elhombrechile@gmail.com"; name = "Diego Rodriguez"; @@ -8389,11 +8394,6 @@ githubId = 31008330; name = "Jann Marc Villablanca"; }; - jgarcia = { - github = "chewblacka"; - githubId = 18430320; - name = "John Garcia"; - }; jgart = { email = "jgart@dismail.de"; github = "jgarte"; diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 240370297d10b..35a39918b1654 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -49,7 +49,7 @@ perlPackages.buildPerlPackage rec { license = licenses.gpl3Plus; homepage = "https://github.com/get-iplayer/get_iplayer"; platforms = platforms.all; - maintainers = with maintainers; [ rika jgarcia ]; + maintainers = with maintainers; [ rika chewblacka ]; }; } diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix index 5ffc383f14f88..c564e42ec4259 100644 --- a/pkgs/applications/misc/remnote/default.nix +++ b/pkgs/applications/misc/remnote/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "remnote"; - version = "1.12.64"; + version = "1.13.0"; src = fetchurl { url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage"; - hash = "sha256-Pvz3bBpv4wN2NXxuKNNraCuOqvvtYOyg5PTSwMpL3cw="; + hash = "sha256-ovM7MnRqzy/mgz+h87hqIuvquODIfmxjdJG1NZYobbk="; }; appexec = appimageTools.wrapType2 { inherit pname version src; @@ -44,7 +44,7 @@ in meta = with lib; { description = "A note-taking application focused on learning and productivity"; homepage = "https://remnote.com/"; - maintainers = with maintainers; [ max-niederman jgarcia ]; + maintainers = with maintainers; [ max-niederman chewblacka ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; mainProgram = "remnote"; diff --git a/pkgs/by-name/cl/clamtk/package.nix b/pkgs/by-name/cl/clamtk/package.nix index c0a62923d224a..a3304ffcd0b0e 100644 --- a/pkgs/by-name/cl/clamtk/package.nix +++ b/pkgs/by-name/cl/clamtk/package.nix @@ -69,7 +69,7 @@ perlPackages.buildPerlPackage rec { license = licenses.gpl1Plus; homepage = "https://github.com/dave-theunsub/clamtk"; platforms = platforms.linux; - maintainers = with maintainers; [ jgarcia ShamrockLee ]; + maintainers = with maintainers; [ chewblacka ShamrockLee ]; }; } diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix index 6ffd81584f3e7..f2db95e7dbc2e 100644 --- a/pkgs/by-name/on/onedrivegui/package.nix +++ b/pkgs/by-name/on/onedrivegui/package.nix @@ -81,7 +81,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/bpozdena/OneDriveGUI"; description = "A simple GUI for Linux OneDrive Client, with multi-account support"; license = licenses.gpl3Only; - maintainers = with maintainers; [ jgarcia ]; + maintainers = with maintainers; [ chewblacka ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/package-management/apx/default.nix b/pkgs/tools/package-management/apx/default.nix index aa46c772c2b34..20f77dbfe442e 100644 --- a/pkgs/tools/package-management/apx/default.nix +++ b/pkgs/tools/package-management/apx/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { homepage = "https://github.com/Vanilla-OS/apx"; changelog = "https://github.com/Vanilla-OS/apx/releases/tag/v${version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ dit7ya jgarcia ]; + maintainers = with maintainers; [ dit7ya chewblacka ]; mainProgram = "apx"; }; } |