Unverified Commit 6a414c5a authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge master into staging-next

parents 769012e1 9c826022

maintainers/maintainer-list.nix

+11 −0
Original line number Diff line number Diff line
@@ -1067,6 +1067,12 @@ 
    githubId = 1342360;

    name = "Andrew Morgan";

  };

  anomalocaris = {

    email = "duncan@anomalocaris.xyz";

    github = "Anomalocaridid";

    githubId = 29845794;

    name = "Duncan Russell";

  };

  anpin = {

    email = "pavel@anpin.fyi";

    github = "anpin";
@@ -11281,6 +11287,11 @@ 
    github = "NickCao";

    githubId = 15247171;

  };

  nickgerace = {

    name = "Nick Gerace";

    github = "nickgerace";

    githubId = 39320683;

  };

  nickhu = {

    email = "me@nickhu.co.uk";

    github = "NickHu";

pkgs/applications/audio/cider/default.nix

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


appimageTools.wrapType2 rec {

  pname = "cider";

  version = "1.6.0";

  version = "1.6.1";



  src = fetchurl {

    url = "https://github.com/ciderapp/cider-releases/releases/download/v${version}/Cider-${version}.AppImage";

    sha256 = "sha256-fbeUl+vQpEdP17m3koblKv9z4CRpLNYtVQf7bs8ZP1M=";

    url = "https://github.com/ciderapp/Cider/releases/download/v${version}/Cider-${version}.AppImage";

    sha256 = "sha256-t3kslhb6STPemdBN6fXc8jcPgNrlnGzcAUQ3HAUB7Yw=";

  };



  extraInstallCommands =

pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix

+10 −4
Original line number Diff line number Diff line
@@ -41,7 +41,13 @@ let 
      ];

    in



    runCommand "nvim-treesitter-grammar-${name}" { } ''

    runCommand "nvim-treesitter-grammar-${name}"

      {

        meta = {

          platforms = lib.platforms.all;

        } // grammar.meta;

      }

      ''

        mkdir -p $out/parser

        ln -s ${grammar}/parser $out/parser/${name}.so

      '';

pkgs/applications/editors/vim/plugins/overrides.nix

+1 −0
Original line number Diff line number Diff line
@@ -756,6 +756,7 @@ self: super: { 
  nvim-treesitter = super.nvim-treesitter.overrideAttrs (old:

    callPackage ./nvim-treesitter/overrides.nix { } self super

  );

  nvim-treesitter-parsers = lib.recurseIntoAttrs self.nvim-treesitter.grammarPlugins;



  nvim-ufo = super.nvim-ufo.overrideAttrs (old: {

    dependencies = with self; [ promise-async ];

pkgs/applications/emulators/citra/default.nix

+10 −10
Original line number Diff line number Diff line 
{ branch

, libsForQt5

, qt6Packages

, fetchFromGitHub

, fetchurl

}:



let

  # Fetched from https://api.citra-emu.org/gamedb, last updated 2022-05-02

  # Fetched from https://api.citra-emu.org/gamedb

  # Please make sure to update this when updating citra!

  compat-list = fetchurl {

    name = "citra-compat-list";

    url = "https://web.archive.org/web/20220502114622/https://api.citra-emu.org/gamedb/";

    sha256 = "sha256-blIlaYaUQjw7Azgg+Dd7ZPEQf+ddZMO++Yxinwe+VG0=";

    url = "https://web.archive.org/web/20230512234055/https://api.citra-emu.org/gamedb/";

    hash = "sha256-J+zqtWde5NgK2QROvGewtXGRAWUTNSKHNMG6iu9m1fU=";

  };

in {

  nightly = libsForQt5.callPackage ./generic.nix rec {

  nightly = qt6Packages.callPackage ./generic.nix rec {

    pname = "citra-nightly";

    version = "1873";

    version = "1907";



    src = fetchFromGitHub {

      owner = "citra-emu";

      repo = "citra-nightly";

      rev = "nightly-${version}";

      sha256 = "1csn9n1s2mvxwk2mahwm8mc4zgn40im374hcsqgz8gaxjkmnx288";

      sha256 = "l4pqok42/ybnRX90Qwhcgm2JR4/9C5bbCTk3j4QuWtw=";

      fetchSubmodules = true;

    };



    inherit branch compat-list;

  };



  canary = libsForQt5.callPackage ./generic.nix rec {

  canary = qt6Packages.callPackage ./generic.nix rec {

    pname = "citra-canary";

    version = "2440";

    version = "2484";



    src = fetchFromGitHub {

      owner = "citra-emu";

      repo = "citra-canary";

      rev = "canary-${version}";

      sha256 = "06f2qnvywyaf8jc43jrzjhfshj3k21ggk8wdrvd9wjsmrryvqgbz";

      sha256 = "IgCpqt3rKV9IqNstF4QwnJlE3hPH+BkIhaOvEmshh0U=";

      fetchSubmodules = true;

    };