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

Merge master into staging-next

parents 4bfb61a4 647a8a5b

pkgs/applications/editors/glow/default.nix

+10 −0
Original line number Diff line number Diff line 
{ lib

, buildGoModule

, fetchFromGitHub

, installShellFiles

, stdenv

}:

buildGoModule rec {

  pname = "glow";
@@ -19,6 +21,14 @@ buildGoModule rec { 


  ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];



  nativeBuildInputs = [ installShellFiles ];

  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

    installShellCompletion --cmd glow \

      --bash <($out/bin/glow completion bash) \

      --fish <($out/bin/glow completion fish) \

      --zsh <($out/bin/glow completion zsh)

  '';



  meta = with lib; {

    description = "Render markdown on the CLI, with pizzazz!";

    homepage = "https://github.com/charmbracelet/glow";

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

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


stdenv.mkDerivation rec {

  pname = "helm-secrets";

  version = "4.4.2";

  version = "4.5.0";



  src = fetchFromGitHub {

    owner = "jkroepke";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-GpPgjRqzH4fcnaHs9SWfdaCZimwBleXnxQLjqy8SArs=";

    hash = "sha256-zytorArHhdwF7F9c2QkaX3KxLNlWySKieK2K1b5omFI=";

  };



  nativeBuildInputs = [ makeWrapper ];

pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix

+0 −1
Original line number Diff line number Diff line
@@ -43,6 +43,5 @@ in 


  meta = metaCommon // {

    platforms = [ "x86_64-linux" ];

    mainProgram = "caprine";

  };

})

pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix

+0 −1
Original line number Diff line number Diff line
@@ -30,6 +30,5 @@ stdenvNoCC.mkDerivation { 


  meta = metaCommon // {

    platforms = with lib.platforms; darwin;

    mainProgram = "caprine";

  };

}

pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix

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


(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {

  pname = "signalbackup-tools";

  version = "20230925";

  version = "20230926";



  src = fetchFromGitHub {

    owner = "bepaald";

    repo = pname;

    rev = version;

    hash = "sha256-j1iAFNG6A/u/2OY07At0kobXtlSqoy3jM2rBf96qhHQ=";

    hash = "sha256-OU5jKalS8vbQPMT+/FgXbRjWrgL96oIp2I/eHsRa7Q8=";

  };



  postPatch = ''