Unverified Commit 82535bc9 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 72eff9fe 8fa0d873

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -10498,6 +10498,12 @@ 
    githubId = 40720523;

    name = "MangoIV";

  };

  manipuladordedados = {

    email = "manipuladordedados@gmail.com";

    github = "manipuladordedados";

    githubId = 1189862;

    name = "Valter Nazianzeno";

  };

  manojkarthick = {

    email = "smanojkarthick@gmail.com";

    github = "manojkarthick";

pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ trivialBuild { 
    hash = "sha256-JCrmS3FSGDHSR+eAR0X/uO0nAgd3TUmFxwEVH5+KV+4=";

  };



  version = "1.1.2";



  meta = {

    description = "Like caps-lock, but for your control key.  Give your pinky a rest!";

    homepage = "https://www.emacswiki.org/emacs/control-lock.el";

pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ trivialBuild { 
    sha256 = "0x6qsgs4hm87k0z9q3g4p6508kc3y123j5jayll3jf3lcl2vm6ks";

  };



  version = "1.10";



  meta = {

    broken = true;

    description = "Minor mode provides useful features for editing perl codes";

pkgs/applications/editors/focuswriter/default.nix

+23 −10
Original line number Diff line number Diff line 
{ lib, fetchurl, pkg-config, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }:

{ lib

, stdenv

, fetchFromGitHub

, pkg-config

, cmake

, hunspell

, qtbase

, qtmultimedia

, qttools

, qt5compat

, qtwayland

, wrapQtAppsHook

}:



mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "focuswriter";

  version = "1.7.6";

  version = "1.8.5";



  src = fetchurl {

    url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";

    sha256 = "0h85f6cs9zbxv118mjfxqfv41j19zkx2xq36mpnlmrlzkjj7dx9l";

  src = fetchFromGitHub {

    owner = "gottcode";

    repo = "focuswriter";

    rev = "v${version}";

    hash = "sha256-6wvTlC/NCCcN2jpwqtoOsCln3ViY/vj7NpMsbYHBGiI=";

  };



  nativeBuildInputs = [ pkg-config qmake qttools ];

  buildInputs = [ hunspell qtbase qtmultimedia ];

  nativeBuildInputs = [ pkg-config cmake qttools wrapQtAppsHook ];

  buildInputs = [ hunspell qtbase qtmultimedia qt5compat qtwayland ];



  qmakeFlags = [ "PREFIX=/" ];

  installFlags = [ "INSTALL_ROOT=$(out)" ];



  meta = with lib; {

    description = "Simple, distraction-free writing environment";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ madjar ];

    maintainers = with maintainers; [ madjar kashw2 ];

    platforms = platforms.linux;

    homepage = "https://gottcode.org/focuswriter/";

  };

pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix

+3 −3
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ buildGoModule rec { 
    owner = "hypnoglow";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-81Rzqu2fj6xSZbKvAhHzaGnr/3ACZvqJhYe+6Vyc0qk=";

    hash = "sha256-81Rzqu2fj6xSZbKvAhHzaGnr/3ACZvqJhYe+6Vyc0qk=";

  };



  vendorSha256 = "sha256-Jvfl0sdZXV497RIgoZUJD0zK/pXK6yeAnuSdq42nky8=";

  vendorHash = "sha256-Jvfl0sdZXV497RIgoZUJD0zK/pXK6yeAnuSdq42nky8=";



  # NOTE: Remove the install and upgrade hooks.

  postPatch = ''
@@ -34,7 +34,7 @@ buildGoModule rec { 
  '';



  meta = with lib; {

    description = "A Helm plugin that shows a diff";

    description = "A Helm plugin that allows to set up a chart repository using AWS S3";

    homepage = "https://github.com/hypnoglow/helm-s3";

    license = licenses.mit;

    maintainers = with maintainers; [ yurrriq ];