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

Merge master into staging-next

parents e49468c2 a0eb0aa8

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -18857,6 +18857,12 @@ 
    githubId = 7038383;

    name = "Vojta Káně";

  };

  volfyd = {

    email = "lb.nix@lisbethmail.com";

    github = "volfyd";

    githubId = 3578382;

    name = "Leif Huhn";

  };

  volhovm = {

    email = "volhovm.cs@gmail.com";

    github = "volhovm";

pkgs/applications/audio/munt/libmt32emu.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ 


stdenv.mkDerivation rec {

  pname = "libmt32emu";

  version = "2.7.0";

  version = "2.7.1";



  src = fetchFromGitHub {

    owner = "munt";

    repo = "munt";

    rev = "${pname}_${lib.replaceStrings [ "." ] [ "_" ] version}";

    sha256 = "sha256-XGds9lDfSiY0D8RhYG4TGyjYEVvVYuAfNSv9+VxiJEs=";

    sha256 = "sha256-zY1AFcm8uvFkrKUZHsqtKY2CYTY4bWmkTJ7bZPqXoxk=";

  };



  outputs = [ "out" "dev" ];

pkgs/applications/misc/jrnl/default.nix

+9 −3
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, python3

, testers

, jrnl

}:



python3.pkgs.buildPythonApplication rec {

  pname = "jrnl";

  version = "4.0.1";

  version = "4.1";

  format = "pyproject";



  src = fetchFromGitHub {

    owner = "jrnl-org";

    repo = pname;

    rev = "refs/tags/v${version}";

    hash = "sha256-NpI19NQxfDiqcfFI9kMqfMboI4fQTqCG7AoG9o8YoEI=";

    hash = "sha256-DtujXSDJWnOrHjVgJEJNKJMhSrNBHlR2hvHeHLSIF2o=";

  };



  nativeBuildInputs = with python3.pkgs; [
@@ -20,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { 
  ];



  propagatedBuildInputs = with python3.pkgs; [

    ansiwrap

    asteval

    colorama

    cryptography
@@ -51,6 +52,11 @@ python3.pkgs.buildPythonApplication rec { 
    "jrnl"

  ];



  passthru.tests.version = testers.testVersion {

    package = jrnl;

    version = "v${version}";

  };



  meta = with lib; {

    changelog = "https://github.com/jrnl-org/jrnl/releases/tag/v${version}";

    description = "Simple command line journal application that stores your journal in a plain text file";

pkgs/applications/misc/spicetify-cli/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


buildGoModule rec {

  pname = "spicetify-cli";

  version = "2.26.0";

  version = "2.27.0";



  src = fetchFromGitHub {

    owner = "spicetify";

    repo = "spicetify-cli";

    rev = "v${version}";

    hash = "sha256-3u55Pcd4VNgWGyu/IVsrMqm8E4H9y4Bvt3JMyIL/KXo=";

    hash = "sha256-5WIITzm9yZWB847WHL+okwpULdwHegtZfvsVrAzwTO0=";

  };



  vendorHash = "sha256-VktAO3yKCdm5yz/RRLeLv6zzyGrwuHC/i8WdJtqZoYc=";

pkgs/applications/networking/cluster/helm/default.nix

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


buildGoModule rec {

  pname = "kubernetes-helm";

  version = "3.13.1";

  version = "3.13.2";



  src = fetchFromGitHub {

    owner = "helm";

    repo = "helm";

    rev = "v${version}";

    sha256 = "sha256-HzamUAqO21RuWLLEfGfrpnlSJslyh4zAppCich5ZzD4=";

    sha256 = "sha256-WXtEXgKco50D1TR775lIm/VuD+MJMbOMQpPC0W4MAYo=";

  };

  vendorHash = "sha256-U4adeMBruUje97rr1hHfiCxMWSXlqv+aAlsHZZ4n5zs=";

  vendorHash = "sha256-kvler6o4On4SbFF7AvPSCF5fRYtPNI5fsOcUbrTGYcQ=";



  subPackages = [ "cmd/helm" ];

  ldflags = [