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

Merge staging-next into staging

parents ecbbd310 e3d9654f

maintainers/maintainer-list.nix

+11 −0
Original line number Diff line number Diff line
@@ -8139,6 +8139,11 @@ 
    githubId = 12160;

    name = "Kirill Radzikhovskyy";

  };

  kiskae = {

    github = "Kiskae";

    githubId = 546681;

    name = "Jeroen van Leusen";

  };

  kisonecat = {

    email = "kisonecat@gmail.com";

    github = "kisonecat";
@@ -12557,6 +12562,12 @@ 
    githubId = 4579165;

    name = "Danny Bautista";

  };

  pyxels = {

    email = "pyxels.dev@gmail.com";

    github = "Pyxels";

    githubId = 39232833;

    name = "Jonas";

  };

  q3k = {

    email = "q3k@q3k.org";

    github = "q3k";

pkgs/applications/editors/vscode/extensions/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2714,8 +2714,8 @@ let 
        mktplcRef = {

          name = "code-spell-checker";

          publisher = "streetsidesoftware";

          version = "2.20.3";

          sha256 = "sha256-28ybNBobXoq194d9VGD9kOq/OWscJkSlgSZ7ViaNQtw=";

          version = "2.20.4";

          sha256 = "sha256-GOXKXZPEynyqRUUY0pdNwt+141kJleg74IbCP4/34R8=";

        };

        meta = {

          changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";

pkgs/applications/graphics/feh/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec { 


  outputs = [ "out" "man" "doc" ];



  nativeBuildInputs = [ makeWrapper xorg.libXt ];

  nativeBuildInputs = [ makeWrapper ];



  buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ];

  buildInputs = [ xorg.libXt xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ];



  makeFlags = [

    "PREFIX=${placeholder "out"}" "exif=1"

pkgs/applications/misc/kickoff/default.nix

0 → 100644
+43 −0
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, rustPlatform

, fontconfig

, pkg-config

, wayland

, libxkbcommon

, makeWrapper

}:



rustPlatform.buildRustPackage rec {

  pname = "kickoff";

  version = "0.7.0";



  src = fetchFromGitHub {

    owner = "j0ru";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-AolJXFolMEwoK3AtC93naphZetytzRl1yI10SP9Rnzo=";

  };



  cargoHash = "sha256-Twg2C29OwXfCK/rYXnyjbhmCClnsFHz8le9h4AmzXfA=";



  libPath = lib.makeLibraryPath [

    wayland

    libxkbcommon

  ];



  buildInputs = [ fontconfig ];

  nativeBuildInputs = [ makeWrapper pkg-config ];



  postInstall = ''

    wrapProgram "$out/bin/kickoff" --prefix LD_LIBRARY_PATH : "${libPath}"

  '';



  meta = with lib; {

    description = "Minimalistic program launcher";

    homepage = "https://github.com/j0ru/kickoff";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ pyxels ];

    platforms = platforms.linux;

  };

}

pkgs/applications/networking/instant-messengers/session-desktop/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,12 +8,12 @@ 
}:



let

  version = "1.10.4";

  version = "1.10.8";

  pname = "session-desktop";



  src = fetchurl {

    url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";

    sha256 = "sha256-pSVTfZvjqWVgx3FAbIJO6e26GHZbhZBppxEptEuozQo=";

    sha256 = "sha256-r/MQlZ3dmQmQZ/FCYIIF2sh9+VXwG97PFfTIXIQijx8=";

  };

  appimage = appimageTools.wrapType2 {

    inherit version pname src;