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

Merge master into staging-next

parents c970ee38 adbbbf0d

pkgs/applications/audio/pt2-clone/default.nix

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


stdenv.mkDerivation rec {

  pname = "pt2-clone";

  version = "1.61";

  version = "1.62.2";



  src = fetchFromGitHub {

    owner = "8bitbubsy";

    repo = "pt2-clone";

    rev = "v${version}";

    sha256 = "sha256-V3i6Bn2urd4l3O0GhOobDutnnXBTjYGYb0Bsa5URbxc=";

    sha256 = "sha256-k2rX5ysV3jgCWn0ffe5xSYo9oO6RLakTapE/SnvOPVI=";

  };



  nativeBuildInputs = [ cmake ];

pkgs/applications/blockchains/lightwalletd/default.nix

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


buildGoModule rec {

  pname = "lightwalletd";

  version = "0.4.15";

  version = "0.4.16";



  src = fetchFromGitHub {

    owner = "zcash";

    repo  = "lightwalletd";

    rev = "v${version}";

    hash = "sha256-tkM9uTmobKXD7Il/uvmLLckPgdkmgwsNsjlARJQiY5A=";

    hash = "sha256-M9xfV2T8L+nssrJj29QmPiErNMpfpT8BY/30Vj8wPjY=";

  };



  vendorHash = "sha256-z5Hs+CkPswWhz+Ya5MyHKA3MZzQkvS7WOxNckElkg6U=";

pkgs/applications/graphics/artem/default.nix

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


rustPlatform.buildRustPackage rec {

  pname = "artem";

  version = "2.0.1_2";

  version = "2.0.2";



  src = fetchFromGitHub {

    owner = "finefindus";

    repo = "artem";

    rev = "v${version}";

    hash = "sha256-R7ouOFeLKnTZI6NbAg8SkkSo4zh9AwPiMPNqhPthpCk=";

    hash = "sha256-t8L1lylaacEHGg3wxVgiB2XmBHDGzql774oHrg/vUC0=";

  };



  cargoHash = "sha256-sbIINbuIbu38NrYr87ljJJD7Y9Px0o6Qv/MGX8N54Rc=";

  cargoHash = "sha256-rsgl8g6AqNmdq2gJ3PHvKMb7eid8ewtheajGWSWbeBw=";



  nativeBuildInputs = [

    installShellFiles
@@ -36,11 +36,6 @@ rustPlatform.buildRustPackage rec { 
    "--skip=full_file_compare_html"

  ];



  # Cargo.lock is outdated

  postConfigure = ''

    cargo metadata --offline

  '';



  postInstall = ''

    installManPage $releaseDir/build/artem-*/out/artem.1

    installShellCompletion $releaseDir/build/artem-*/out/artem.{bash,fish} \

pkgs/applications/graphics/blockbench-electron/default.nix

+4 −4
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_22 }:

{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_25 }:



stdenv.mkDerivation rec {

  pname = "blockbench-electron";

  version = "4.5.2";

  version = "4.8.1";



  src = fetchurl {

    url = "https://github.com/JannisX11/blockbench/releases/download/v${version}/Blockbench_${version}.AppImage";

    sha256 = "sha256-uUgVBdYMCF31+L/FV4ADIpUdEAmnW59KfscQxUStPWM=";

    sha256 = "sha256-CE2wDOt1WBcYmPs4sEyZ3LYvKLequFZH0B3huMYHlwA=";

    name = "${pname}-${version}.AppImage";

  };
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec { 
  '';



  postFixup = ''

    makeWrapper ${electron_22}/bin/electron $out/bin/${pname} \

    makeWrapper ${electron_25}/bin/electron $out/bin/${pname} \

      --add-flags $out/share/${pname}/resources/app.asar \

      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"

  '';

pkgs/applications/misc/mediainfo-gui/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ let 
in

stdenv.mkDerivation rec {

  pname = "mediainfo-gui";

  version = "23.04";

  version = "23.06";



  src = fetchurl {

    url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";

    sha256 = "sha256-Uiut1rHk6LV+giW6e0nvgn35ffTLaLbU/HkQ92xf32k=";

    hash = "sha256-TJd+6wzoN4co5k7yTyf+YrLFEW+/BUHIJKRDCfgP+Io=";

  };



  nativeBuildInputs = [ autoreconfHook pkg-config ];