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

Merge staging-next into staging

parents b1e6a454 a1ce4507

maintainers/maintainer-list.nix

+1 −1
Original line number Diff line number Diff line
@@ -7081,7 +7081,7 @@ 
  };

  jayesh-bhoot = {

    name = "Jayesh Bhoot";

    email = "jayesh@bhoot.sh";

    email = "jb@jayeshbhoot.com";

    github = "jayeshbhoot";

    githubId = 1915507;

  };

pkgs/applications/audio/plexamp/default.nix

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


let

  pname = "plexamp";

  version = "4.6.2";

  version = "4.7.4";



  src = fetchurl {

    url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";

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

    sha512 = "xGmE/ikL3ez0WTJKiOIcB5QtI7Ta9wq1Qedy9albWVpCS04FTnxQH5S0esTXw6j+iDTD8Lc2JbOhw8tYo/zRXg==";

    sha512 = "TZ7JNSrUtsqnH+fWIcd1v4fY0jPnMV7nqV/QsbD7ZpqIBCkN3R9WQvc/E9gah163Ab40g9CmdghTGo3v8VW2Rw==";

  };



  appimageContents = appimageTools.extractType2 {
@@ -33,7 +33,7 @@ in appimageTools.wrapType2 { 
  meta = with lib; {

    description = "A beautiful Plex music player for audiophiles, curators, and hipsters";

    homepage = "https://plexamp.com/";

    changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/49";

    changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/50";

    license = licenses.unfree;

    maintainers = with maintainers; [ killercup synthetica ];

    platforms = [ "x86_64-linux" ];

pkgs/applications/editors/vscode/generic.nix

+0 −4
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
}:



let

  inherit (stdenv.hostPlatform) system;

  unwrapped = stdenv.mkDerivation {



    inherit pname version src sourceRoot dontFixup;
@@ -135,9 +134,6 @@ let 


      # this fixes bundled ripgrep

      chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg

    '' + lib.optionalString (lib.versionOlder version "1.78.0" && stdenv.isLinux) ''

      # see https://github.com/gentoo/gentoo/commit/4da5959

      chmod +x resources/app/node_modules/node-pty/build/Release/spawn-helper

    '';



    inherit meta;

pkgs/applications/editors/vscode/update-vscodium.sh

+0 −2
Original line number Diff line number Diff line
@@ -36,5 +36,3 @@ update_vscodium $VSCODIUM_VER darwin-x64 x86_64-darwin zip 
update_vscodium $VSCODIUM_VER linux-arm64 aarch64-linux tar.gz



update_vscodium $VSCODIUM_VER darwin-arm64 aarch64-darwin zip
 


update_vscodium $VSCODIUM_VER linux-armhf armv7l-linux tar.gz

pkgs/applications/editors/vscode/vscode.nix

+6 −6
Original line number Diff line number Diff line
@@ -18,17 +18,17 @@ let 
  archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";



  sha256 = {

    x86_64-linux = "11ibgnpcs0qvirgjnk799zkb63zp0nbc8y636l5g9nay6jm8lr8s";

    x86_64-darwin = "0wg2xbvg3v20w4dh9vf27xcf95r5dv2l118vxxjfz2chfxmkk1qw";

    aarch64-linux = "1gff1ildisczwb0dx7a0jvhj8rgn60n93rzcj1d7lihkgd00zjg6";

    aarch64-darwin = "1zmfg1lv6izv1dmhawmnjs108pg99kq37pi6adyqnfw9yssn0ar5";

    armv7l-linux = "10gr9p5vf0wcc9dgyc79p20vip12ja15qas4i3kwdp9lp4hzh1ss";

    x86_64-linux = "0kir1grd150gb7im6yx2l16hi43wwsi8q3dlpgah4m7na064xgyd";

    x86_64-darwin = "1fw73483ja4zav8xd0j03ygib5zbviy3kd02jzmgbbbsac5li96m";

    aarch64-linux = "1w0dxpvrj06m1d15q45xi4sl4g3fk0nf04vh2ar956lg67dqj7i6";

    aarch64-darwin = "0i5vj3km6wkdc2mrks2rjbqbn1isg4l4ss6zs7qfra3zcj62bkc2";

    armv7l-linux = "1jx8cz43ac35as414mxsj9abpkr4a7v10fg1msjy2ykcrzv9v3dr";

  }.${system} or throwSystem;

in

  callPackage ./generic.nix rec {

    # Please backport all compatible updates to the stable release.

    # This is important for the extension ecosystem.

    version = "1.78.0";

    version = "1.78.2";

    pname = "vscode";



    executableName = "code" + lib.optionalString isInsiders "-insiders";