Unverified Commit ef01295e authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents 8c510d91 83f109e1

pkgs/applications/editors/vscode/vscodium.nix

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


  hash =

    {

      x86_64-linux = "sha256-+aMcRAM1mOu2rLCVGtkygGgM/8VNeteM66BOlmQCIpA=";

      x86_64-darwin = "sha256-A/5l3LZn7SYNLkixNAfcb0HJlXY9dN9tjDT/KJ4Ycqk=";

      aarch64-linux = "sha256-LxVKn5ld2mhsV9ya2V9zXEjtEZRAUWupMgkWXSgrL+8=";

      aarch64-darwin = "sha256-jF18swYLWCtT0GerSLkT01M1sGZmkAb6bRZlRL5Bna4=";

      armv7l-linux = "sha256-MlN22vWh0FiqgYQqZ1YjhAEtPRGaGv4Rz3J3LF6udts=";

      x86_64-linux = "sha256-lteOBRRmAQbY1zlPaBU8wKdmtpCP4vkk5+YuQ0B5RXg=";

      x86_64-darwin = "sha256-1AVMMMEVadg5NpV+xr9kyoX6bNB2uJjBbtXDJ878DvM=";

      aarch64-linux = "sha256-XrY+WyRaEvczbtZWRdRhtOOzIOubM+2zvNQ8XMF8bQk=";

      aarch64-darwin = "sha256-qgZTf8tWtpf1lRZL9hz3y1AAOn7zElAaCJRo4wUNYeQ=";

      armv7l-linux = "sha256-mZof3m9FQrByZoUy7VtS56ePTzbSXmu2Uo1QC0Ay+nM=";

    }

    .${system} or throwSystem;
@@ -41,7 +41,7 @@ callPackage ./generic.nix rec { 


  # Please backport all compatible updates to the stable release.

  # This is important for the extension ecosystem.

  version = "1.105.17075";

  version = "1.106.27818";

  pname = "vscodium";



  executableName = "codium";

pkgs/applications/video/kodi/addons/youtube/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 
buildKodiAddon rec {

  pname = "youtube";

  namespace = "plugin.video.youtube";

  version = "7.2.0.3";

  version = "7.3.0";



  src = fetchFromGitHub {

    owner = "anxdpanic";

    repo = "plugin.video.youtube";

    rev = "v${version}";

    hash = "sha256-Igw4F/6+Ewrxsz1RI4csYsHmB12bkbW+764fQvqCx+0=";

    hash = "sha256-JVlIe63oyA8Re8nqLte4y5kyRENzyNg8ZJKdn9wJFwg=";

  };



  propagatedBuildInputs = [

pkgs/applications/video/mpv/scripts/buildLua.nix

+5 −5
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ lib.makeOverridable ( 
    extendedBy (if lib.isFunction args then args else (_: args)) (

      {

        pname,

        extraScripts ? [ ],

        extraScriptsToCopy ? [ ],

        runtime-dependencies ? [ ],

        ...

      }@args:
@@ -59,8 +59,8 @@ lib.makeOverridable ( 
              echo "Script directory '${scriptPath}' does not contain 'main.lua'" >&2

              exit 1

            }

            [ ${with builtins; toString (length extraScripts)} -eq 0 ] || {

              echo "mpvScripts.buildLua does not support 'extraScripts'" \

            [ ${with builtins; toString (length extraScriptsToCopy)} -eq 0 ] || {

              echo "mpvScripts.buildLua does not support 'extraScriptsToCopy'" \

                   "when 'scriptPath' is a directory" >&2

              exit 1

            }
@@ -69,8 +69,8 @@ lib.makeOverridable ( 
          else

            install -m644 -Dt "${scriptsDir}" ${escaped scriptPath}

            ${lib.optionalString (

              extraScripts != [ ]

            ) ''cp -at "${scriptsDir}/" ${escapedList extraScripts}''}

              extraScriptsToCopy != [ ]

            ) ''cp -at "${scriptsDir}/" ${escapedList extraScriptsToCopy}''}

          fi



          runHook postInstall

pkgs/applications/video/mpv/scripts/cutter.nix

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ buildLua { 
  '';



  passthru.scriptName = "cutter.lua";

  extraScripts = [ "c_concat.sh" ];

  extraScriptsToCopy = [ "c_concat.sh" ];



  postInstall = ''

    wrapProgram $out/share/mpv/scripts/c_concat.sh \

pkgs/applications/video/mpv/scripts/mpv-osc-tethys.nix

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ buildLua (finalAttrs: { 
  version = "0-unstable-2024-08-19";



  scriptPath = "osc_tethys.lua";

  extraScripts = [ "mpv_thumbnail_script_server.lua" ];

  extraScriptsToCopy = [ "mpv_thumbnail_script_server.lua" ];

  extraScriptsToLoad = [ "mpv_thumbnail_script_server.lua" ];



  src = fetchFromGitHub {

    owner = "Zren";