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

Merge master into staging-nixos

parents c3cff660 1a66bde6
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -19899,6 +19899,12 @@
    github = "Noodlesalat";
    githubId = 12748782;
  };
  nuexq = {
    email = "nuexqq@gmail.com";
    github = "nuexq";
    githubId = 145666753;
    name = "nuexq";
  };
  nukaduka = {
    email = "ksgokte@gmail.com";
    github = "NukaDuka";
+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ in
  meta.maintainers = with lib.maintainers; [
    philandstuff
    rawkode
    kaynetik
  ];

  options = {
+3 −3
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
  core = "mgba";
  version = "0-unstable-2026-03-30";
  version = "0-unstable-2026-04-03";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "mgba";
    rev = "6ab29fed1b5139f19ac98c523fd4a6a7f0b30e38";
    hash = "sha256-6cCd2tuj2kXTL1w0DUPodaLU0ivNjPyKGytgxrjlwb0=";
    rev = "6dce57eef127dc4cc292644f38196e0e7c58590c";
    hash = "sha256-sLxQ7NG5ypSQACo1Q/9/FwQKCpZsIU0Y35dLa8uhOVs=";
  };

  meta = {
+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ let
  ];
in
mkDerivation rec {
  version = "3.40.15";
  version = "3.44.8";
  pname = "qgis-ltr-unwrapped";
  outputs = [ "out" ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) "man";

@@ -95,7 +95,7 @@ mkDerivation rec {
    owner = "qgis";
    repo = "QGIS";
    rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
    hash = "sha256-N1ip6lMMpACDCr/Za26LGP455+iZiZe24s2MCkrYm8A=";
    hash = "sha256-FL/JqvcLqKhHsG96o/7Mel8wH8OaL+2LDtq6jngjW50=";
  };

  passthru = {
+2 −2
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@
buildMozillaMach rec {
  pname = "firefox-beta";
  binaryName = "firefox-beta";
  version = "150.0b2";
  version = "150.0b5";
  applicationName = "Firefox Beta";
  src = fetchurl {
    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
    sha512 = "eb9ad8fe2cc763e9b45b602156b86328ea6a679824318023759813ce42c4dc961bea92cac9e3d230fe1346114d7f4fd43bcffbfc6307d6a6d18b4cc9629b0651";
    sha512 = "6ae09ae8a73865a4d9cdfd389f0cfec667fc717e13127ae9927b6fc3bd5e7cf49a83dd5dbbed8bae9b72dddd24e6156bdc483fcb3ccb726b46070d25fd02f86f";
  };

  meta = {
Loading