Commit ff2cabd2 authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents 38948b07 14e601b1

maintainers/maintainer-list.nix

+5 −0
Original line number Diff line number Diff line
@@ -21651,6 +21651,11 @@ 
    githubId = 77415970;

    name = "Redhawk";

  };

  redianthus = {

    github = "redianthus";

    githubId = 16472988;

    name = "redianthus";

  };

  redlonghead = {

    email = "git@beardit.net";

    github = "Redlonghead";

nixos/modules/services/desktops/linyaps.nix

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ in 
      package = lib.mkPackageOption pkgs "linyaps" { };



      boxPackage = lib.mkPackageOption pkgs "linyaps-box" { };



      webStoreInstallerPackage = lib.mkPackageOption pkgs "linyaps-web-store-installer" { };

    };

  };
@@ -33,6 +35,7 @@ in 
      systemPackages = [

        cfg.package

        cfg.boxPackage

        cfg.webStoreInstallerPackage

      ];

    };

pkgs/by-name/li/linyaps-web-store-installer/package.nix

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

  lib,

  stdenv,

  fetchFromGitHub,

  cmake,

  qt6,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "linyaps-web-store-installer";

  version = "1.6.8";



  src = fetchFromGitHub {

    owner = "OpenAtom-Linyaps";

    repo = "linyaps-web-store-installer";

    rev = finalAttrs.version;

    hash = "sha256-KbtGoXzxZmo6x1bvzDZbwp/wl+dBojB6E+K87CAkI7g=";

  };



  postPatch = ''

    substituteInPlace ll-installer/space.linglong.Installer.desktop \

      --replace-fail "Exec=/usr/bin/ll-installer" "Exec=$out/bin/ll-installer"

  '';



  nativeBuildInputs = [

    cmake

    qt6.wrapQtAppsHook

  ];



  buildInputs = [

    qt6.qtbase

  ];



  meta = {

    description = "URI Handler for Linyaps Web Store";

    homepage = "https://github.com/OpenAtom-Linyaps/linyaps-web-store-installer";

    changelog = "https://github.com/OpenAtom-Linyaps/linyaps-web-store-installer/releases/tag/${finalAttrs.version}";

    license = lib.licenses.lgpl3Plus;

    maintainers = with lib.maintainers; [ hhr2020 ];

    mainProgram = "ll-installer";

    platforms = lib.platforms.linux;

  };

})

pkgs/by-name/ll/lldpd/package.nix

+5 −0
Original line number Diff line number Diff line
@@ -43,6 +43,11 @@ stdenv.mkDerivation rec { 
    openssl

  ];



  preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''

    # Yes, this works and is required for cross :'/

    export PATH=$PATH:${net-snmp.dev}/bin

  '';



  enableParallelBuilding = true;



  outputs = [

pkgs/by-name/mu/mupdf/package.nix

+14 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  lib,

  fetchurl,

  fetchFromGitHub,

  fetchpatch,

  copyDesktopItems,

  makeDesktopItem,

  desktopToDarwinBundle,
@@ -85,6 +86,19 @@ stdenv.mkDerivation rec { 
    # Upstream C++ wrap script only defines fixed-sized integers on macOS but

    # this is required on aarch64-linux too.

    ./fix-cpp-build.patch

  ]

  # fix compatibility with Clang >= 20

  ++ lib.optionals enableCxx [

    (fetchpatch {

      name = "scripts-wrap-parse.py-get_args-improve-caching-of-re.patch";

      url = "https://github.com/ArtifexSoftware/mupdf/commit/559e45ac8c134712cd8eaee01536ea3841e3a449.patch";

      hash = "sha256-gI3hzrNo6jj9eqQ9E/BJ3jxXi/sl1C5WRyYlkG3Gkfg=";

    })

    (fetchpatch {

      name = "scripts-wrap-parse.py-get_args-fix-for-libclang-20.patch";

      url = "https://github.com/ArtifexSoftware/mupdf/commit/4bbf411898341d3ba30f521a6c137a788793cd45.patch";

      hash = "sha256-cxKNziAGjpDwEw/9ZQHslMeJbiqYo80899BDkUOIX8g=";

    })

  ];



  postPatch = ''