Commit 7ebe9739 authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents a9028010 50cff47c

maintainers/maintainer-list.nix

+5 −0
Original line number Diff line number Diff line
@@ -5126,6 +5126,11 @@ 
    githubId = 130508846;

    name = "Elliot Cameron";

  };

  deadbaed = {

    name = "Philippe Loctaux";

    github = "deadbaed";

    githubId = 8809909;

  };

  dearrude = {

    name = "Ebrahim Nejati";

    email = "dearrude@tfwno.gf";

pkgs/applications/misc/cotp/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -8,16 +8,16 @@ 


rustPlatform.buildRustPackage rec {

  pname = "cotp";

  version = "1.9.1";

  version = "1.9.2";



  src = fetchFromGitHub {

    owner = "replydev";

    repo = "cotp";

    rev = "v${version}";

    hash = "sha256-U5x8szvouoxJ+DZUlrn5wtXt+6vs62tzcWICQW3B21U=";

    hash = "sha256-5wVIjh16AYwrzjbPgvjsQhihu/vwdQfzU2kZS6eSTWs=";

  };



  cargoHash = "sha256-o9LRXbx77EXXO7rEmpBrx2nommJgG0ikw1YzdeB0Gug=";

  cargoHash = "sha256-DMswC+Qp6w7Dcp5YYV4EGWUylv/ouG0ukAdCdDnOA/8=";



  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ];

pkgs/applications/networking/mailreaders/thunderbird/packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ in rec { 
  thunderbird-esr = thunderbird-128;



  thunderbird-128 = common {

    version = "128.4.0esr";

    sha512 = "ad031b3a9b738598358cead23cf8438435016222cd9a474c31892dc1b3db43d2d5d3a10c9639df770dc76eb3c0bc9db8be8beab84828d54ee50fc1e03f0da0a5";

    version = "128.4.2esr";

    sha512 = "4e37b77eb4652bc36585656bd3fe5416053f6a1a96ed1ca64c17d8d73031c746cb3832fd275d25f1283d20e18aa3e7b1df6d67864ced21b5f73042a42767cb45";



    updateScript = callPackage ./update.nix {

      attrPath = "thunderbirdPackages.thunderbird-128";

pkgs/by-name/ab/ab-av1/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,16 +2,16 @@ 


rustPlatform.buildRustPackage rec {

  pname = "ab-av1";

  version = "0.7.18";

  version = "0.7.19";



  src = fetchFromGitHub {

    owner = "alexheretic";

    repo = "ab-av1";

    rev = "v${version}";

    hash = "sha256-n8yclhjeEkkge9xHuM4ZW+7aubIiLWwxCmmGTI1bE9I=";

    hash = "sha256-5gDPbljvy5Kp3s+oo5LkI0rUR2zSVK2wDh4k2HrsLFc=";

  };



  cargoHash = "sha256-Rn+y1W2Cimt5JrD2dLmvLmZshxyLO7N+oIALwGjxhvM=";

  cargoHash = "sha256-MIZGAlcBeQ03ScleOcM0WxgQEfjpFbRq1dK1/PjZbCQ=";



  nativeBuildInputs = [ installShellFiles ];

pkgs/by-name/bo/bootterm/package.nix

0 → 100644
+41 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitHub,

  testers,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "bootterm";

  version = "0.5";



  src = fetchFromGitHub {

    owner = "wtarreau";

    repo = "bootterm";

    rev = "v${finalAttrs.version}";

    hash = "sha256-AYpO2Xcd51B2qVUWoyI190BV0pIdA3HfuQJPzJ4yT/U=";

  };



  makeFlags = [ "PREFIX=$(out)" ];



  passthru.tests = {

    version = testers.testVersion {

      package = finalAttrs.finalPackage;

      command = "${finalAttrs.meta.mainProgram} -V";

    };

  };



  meta = {

    description = "Simple, reliable and powerful terminal to ease connection to serial ports";

    longDescription = ''

      BootTerm is a simple, reliable and powerful terminal designed to

      ease connection to ephemeral serial ports as found on various SBCs,

      and typically USB-based ones.

    '';

    homepage = "https://github.com/wtarreau/bootterm";

    license = lib.licenses.mit;

    mainProgram = "bt";

    maintainers = with lib.maintainers; [ deadbaed ];

    platforms = lib.platforms.unix;

  };

})