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

Merge master into staging-next

parents 52a6557e c2bdda7b

pkgs/by-name/ga/gapless/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -15,14 +15,14 @@ 
}:

stdenv.mkDerivation (finalAttrs: {

  pname = "gapless";

  version = "3.8.1";

  version = "4.0";



  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";

    owner = "neithern";

    repo = "g4music";

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

    hash = "sha256-pABiz7AIfkuB2Z0ErZoHfIrgdllO83ucbUFNjZ9wc+o=";

    hash = "sha256-t9YthW8HZz2kXYPvidVRy7GVB2cRGEOCrXZtIpW65MA=";

  };



  nativeBuildInputs = [

pkgs/by-name/ni/nimdow/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ 
buildNimPackage (finalAttrs: {

  pname = "nimdow";



  version = "0.7.38";

  version = "0.7.39";



  src = fetchFromGitHub {

    owner = "avahe-kellenberger";

    repo = "nimdow";

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

    hash = "sha256-GPu3Z63rFBgCCV7bdBg9cJh5thv2xrv/nSMa5Q/zp48=";

    hash = "sha256-9gYlVuKDHCs6yaY1b6dJgwQUJdko6npjom4ab7nKZ7w=";

  };



  lockFile = ./lock.json;

pkgs/by-name/sh/shadps4/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -35,13 +35,13 @@ 


stdenv.mkDerivation {

  pname = "shadps4";

  version = "0.3.0-unstable-2024-10-13";

  version = "0.3.0-unstable-2024-10-14";



  src = fetchFromGitHub {

    owner = "shadps4-emu";

    repo = "shadPS4";

    rev = "bd9f82df94847b4a5f3d2676ae938f064505c992";

    hash = "sha256-Z4+hHq2VI4wA1D72dBI7Lt++Rm3q0svjF6AialXxM0k=";

    rev = "09725bd921088b73746605e672abf6ff40171880";

    hash = "sha256-NtIiqmiZ1iCciMjT1cL7ONWxNHRO/0bci/thLrcORjo=";

    fetchSubmodules = true;

  };

pkgs/applications/audio/soundwireserver/default.nix→pkgs/by-name/so/soundwireserver/package.nix

+6 −7
Original line number Diff line number Diff line 
{ lib

, qt5

, autoPatchelfHook

, unzip

, fetchzip

, portaudio

{

  lib,

  qt5,

  autoPatchelfHook,

  fetchzip,

  portaudio,

}:



qt5.mkDerivation {
@@ -16,7 +16,6 @@ qt5.mkDerivation { 
  };



  nativeBuildInputs = [

    unzip

    autoPatchelfHook

  ];

pkgs/development/interpreters/perl/interpreter.nix

+4 −3
Original line number Diff line number Diff line
@@ -106,12 +106,11 @@ stdenv.mkDerivation (rec { 
      "-Dman1dir=${placeholder "out"}/share/man/man1"

      "-Dman3dir=${placeholder "out"}/share/man/man3"

    ] ++

    (if stdenv.hostPlatform.isStatic

    (if (stdenv.cc.targetPrefix != "")

    then [

      "-Dcc=${stdenv.cc.targetPrefix}cc"

      "-Dnm=${stdenv.cc.targetPrefix}nm"

      "-Dar=${stdenv.cc.targetPrefix}ar"

      "-Uusedl"

    ]

    else [

      "-Dcc=cc"
@@ -123,6 +122,7 @@ stdenv.mkDerivation (rec { 
      "-Dlocincpth=${libcInc}/include"

      "-Dloclibpth=${libcLib}/lib"

    ]

    ++ lib.optional stdenv.hostPlatform.isStatic "-Uusedl"

    ++ lib.optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ]

    ++ lib.optional stdenv.hostPlatform.isSunOS "-Dcc=gcc"

    ++ lib.optional enableThreading "-Dusethreads"
@@ -135,7 +135,8 @@ stdenv.mkDerivation (rec { 


  configureScript = lib.optionalString (!crossCompiling) "${stdenv.shell} ./Configure";



  postConfigure = lib.optionalString stdenv.hostPlatform.isStatic ''

  # !canExecute cross uses miniperl which doesn't have this

  postConfigure = lib.optionalString (!crossCompiling && stdenv.cc.targetPrefix != "") ''

    substituteInPlace Makefile \

      --replace-fail "AR = ar" "AR = ${stdenv.cc.targetPrefix}ar"

  '';