Unverified Commit 644ecf0f authored by Michael Daniels's avatar Michael Daniels
Browse files

Merge branch 'master' into staging-next

parents 69ed3ca1 2467be5e

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -6084,6 +6084,12 @@ 
    githubId = 10701143;

    name = "David Crompton";

  };

  davidlghellin = {

    email = "hola@devel0pez.com";

    github = "davidlghellin";

    githubId = 1321512;

    name = "David López";

  };

  davidrusu = {

    email = "davidrusu.me@gmail.com";

    github = "davidrusu";

pkgs/applications/blockchains/groestlcoin/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { 


    install -Dm644 ${desktop} $out/share/applications/groestlcoin-qt.desktop

    substituteInPlace $out/share/applications/groestlcoin-qt.desktop --replace "Icon=groestlcoin128" "Icon=groestlcoin"

    install -Dm644 share/pixmaps/groestlcoin256.png $out/share/pixmaps/groestlcoin.png

    install -Dm644 share/pixmaps/groestlcoin256.png $out/share/icons/hicolor/256x256/apps/groestlcoin.png

  '';



  cmakeFlags = [

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

+4 −4
Original line number Diff line number Diff line
@@ -497,8 +497,8 @@ let 
        mktplcRef = {

          publisher = "banacorn";

          name = "agda-mode";

          version = "0.6.7";

          hash = "sha256-G8zAFEMM+fsndBjySkQpRlEj9+EGmMNTTI9AUIoMWR0=";

          version = "0.6.8";

          hash = "sha256-rMRajooaU3W2tHhM3rBsRS0i5Ppp137m9yW9eIqLPos=";

        };

        meta = {

          changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog";
@@ -675,8 +675,8 @@ let 
        mktplcRef = {

          name = "markdown-mermaid";

          publisher = "bierner";

          version = "1.31.1";

          hash = "sha256-K3UXNT3MpGlhyHcx0AYAkCPEJIbYIu3e/ucIAQLwoEQ=";

          version = "1.32.0";

          hash = "sha256-1LlRTkskBAlYV+fq3GVyOUGYXbILvKIByBu2uKwTUUc=";

        };

        meta = {

          changelog = "https://marketplace.visualstudio.com/items/bierner.markdown-mermaid/changelog";

pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension { 
    name = "harper";

    publisher = "elijah-potter";

    version = harper.version;

    hash = "sha256-rN8aQXDoUje5flRA1T4rw+CVWW9RQRNKtj6ktaAyJQ0=";

    hash = "sha256-7WneJ4RNJ02SaceEp3su8be/jkZMIy1dSEH1Ay31wLM=";

  };



  nativeBuildInputs = [

pkgs/applications/emulators/libretro/cores/snes9x.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 
}:

mkLibretroCore {

  core = "snes9x";

  version = "0-unstable-2026-02-03";

  version = "0-unstable-2026-02-10";



  src = fetchFromGitHub {

    owner = "snes9xgit";

    repo = "snes9x";

    rev = "02f642cdadfaa8f9fa7ec674382d6c70a8b534d6";

    hash = "sha256-4BqWxchxdq8pbWw3Iql786Iu/OY5VMT1pF8wowI26h0=";

    rev = "5110899f86b0facb67ebd84200e3d43e4f7f4e01";

    hash = "sha256-DniWaYte0N7xZq8w294CVxMWYeQO3wK91ECJp+LOv3k=";

  };



  makefile = "Makefile";