Unverified Commit a5aea79f authored by Emily Trau's avatar Emily Trau Committed by GitHub
Browse files

Merge pull request #270852 from NixOS/backport-269642-to-release-23.11 

[Backport release-23.11] remnote: 1.12.64 -> 1.13.0
parents c2fc886d 4e00e07e

maintainers/maintainer-list.nix

+5 −5
Original line number Diff line number Diff line
@@ -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";

pkgs/applications/misc/get_iplayer/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 ];

  };



}

pkgs/applications/misc/remnote/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -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";

pkgs/by-name/cl/clamtk/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 ];

  };



}

pkgs/by-name/on/onedrivegui/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;

  };

}