Unverified Commit 8d4e0861 authored by Emily's avatar Emily Committed by GitHub
Browse files

nheko: clean up (#341831)

parents 659f95ed 4312e5a9

pkgs/development/libraries/coeurl/default.nix→pkgs/by-name/co/coeurl/package.nix

+47 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitLab

, fetchpatch

, ninja

, pkg-config

, meson

, libevent

, curl

, spdlog

{

  lib,

  stdenv,

  fetchFromGitLab,

  ninja,

  pkg-config,

  meson,

  libevent,

  curl,

  spdlog,

}:



stdenv.mkDerivation rec {

  pname = "coeurl";

  version = "0.3.0";

  version = "0.3.1";



  src = fetchFromGitLab {

    domain = "nheko.im";

    owner = "nheko-reborn";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-sN+YSddUOdnJLcnHyWdjNm1PpxCwnkwiqSvyrwUrg6w=";

    hash = "sha256-NGplM5c/dMGSQbhKeuPOTWL8KsqvMd/76YuwCxnqNNE=";

  };

  patches = [

    # Fix compatibility issues with curl > 7.85, see:

    # https://nheko.im/nheko-reborn/coeurl/-/commit/d926893007c353fbc149d8538a5762ca8384273a

    # PATCH CAN BE REMOVED AFTER 0.3.0

    (fetchpatch {

      url = "https://nheko.im/nheko-reborn/coeurl/-/commit/d926893007c353fbc149d8538a5762ca8384273a.patch";

      hash = "sha256-hOBk7riuVI7k7qe/SMq3XJnFzyZ0gB9kVG7dKvWOsPY=";

    })

    # Fix error when building with fmt >= 10, see:

    # https://nheko.im/nheko-reborn/coeurl/-/commit/831e2ee8e9cf08ea1ee9736cde8370f9d0312abc

    # PATCH CAN BE REMOVED AFTER 0.3.0

    (fetchpatch {

      url = "https://nheko.im/nheko-reborn/coeurl/-/commit/831e2ee8e9cf08ea1ee9736cde8370f9d0312abc.patch";

      hash = "sha256-a52Id7Nm3Mmmwv7eL58j6xovjlkpAO4KahVM/Q3H65w=";

    })

  ];

  postPatch = ''

    substituteInPlace subprojects/curl.wrap --replace '[provides]' '[provide]'

  '';



  nativeBuildInputs = [ ninja pkg-config meson ];

  nativeBuildInputs = [

    ninja

    pkg-config

    meson

  ];



  buildInputs = [ libevent curl spdlog ];

  buildInputs = [

    libevent

    curl

    spdlog

  ];



  meta = with lib; {

    description = "Simple async wrapper around CURL for C++";

pkgs/development/libraries/mtxclient/default.nix→pkgs/by-name/mt/mtxclient/package.nix

+19 −14
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, cmake

, pkg-config

, coeurl

, curl

, libevent

, nlohmann_json

, olm

, openssl

, re2

, spdlog

{

  lib,

  stdenv,

  fetchFromGitHub,

  cmake,

  pkg-config,

  coeurl,

  curl,

  libevent,

  nlohmann_json,

  olm,

  openssl,

  re2,

  spdlog,

}:



stdenv.mkDerivation rec {
@@ -56,7 +57,11 @@ stdenv.mkDerivation rec { 
    description = "Client API library for the Matrix protocol";

    homepage = "https://github.com/Nheko-Reborn/mtxclient";

    license = licenses.mit;

    maintainers = with maintainers; [ fpletz pstn ];

    maintainers = with maintainers; [

      fpletz

      pstn

      rnhmjoj

    ];

    platforms = platforms.all;

    # Should be fixable if a higher clang version is used, see:

    # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177

pkgs/applications/networking/instant-messengers/nheko/default.nix→pkgs/by-name/nh/nheko/package.nix

+59 −59
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, cmake

, asciidoc

, pkg-config

, boost179

, cmark

, coeurl

, curl

, kdsingleapplication

, libevent

, libsecret

, lmdb

, lmdbxx

, mtxclient

, nlohmann_json

, olm

, qtbase

, qtimageformats

, qtkeychain

, qtmultimedia

, qttools

, qtwayland

, re2

, spdlog

, wrapQtAppsHook

, gst_all_1

, libnice

{

  lib,

  stdenv,

  fetchFromGitHub,

  cmake,

  asciidoc,

  pkg-config,

  boost179,

  cmark,

  coeurl,

  curl,

  kdsingleapplication,

  libevent,

  libsecret,

  lmdb,

  lmdbxx,

  mtxclient,

  nlohmann_json,

  olm,

  re2,

  spdlog,

  gst_all_1,

  libnice,

  qt6Packages,

}:



stdenv.mkDerivation rec {
@@ -45,10 +40,11 @@ stdenv.mkDerivation rec { 
    cmake

    lmdbxx

    pkg-config

    wrapQtAppsHook

    qt6Packages.wrapQtAppsHook

  ];



  buildInputs = [

  buildInputs =

    [

      boost179

      cmark

      coeurl
@@ -60,12 +56,12 @@ stdenv.mkDerivation rec { 
      mtxclient

      nlohmann_json

      olm

    qtbase

    qtimageformats

    qtkeychain

    qtmultimedia

    qttools

    qtwayland

      qt6Packages.qtbase

      qt6Packages.qtimageformats

      qt6Packages.qtkeychain

      qt6Packages.qtmultimedia

      qt6Packages.qttools

      qt6Packages.qtwayland

      re2

      spdlog

    ]
@@ -91,7 +87,11 @@ stdenv.mkDerivation rec { 
    homepage = "https://github.com/Nheko-Reborn/nheko";

    license = licenses.gpl3Plus;

    mainProgram = "nheko";

    maintainers = with maintainers; [ ekleog fpletz ];

    maintainers = with maintainers; [

      ekleog

      fpletz

      rnhmjoj

    ];

    platforms = platforms.all;

    # Should be fixable if a higher clang version is used, see:

    # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177

pkgs/top-level/all-packages.nix

+0 −6
Original line number Diff line number Diff line
@@ -19180,8 +19180,6 @@ with pkgs; 
    protobuf = protobuf_21;

  };













  coeurl = callPackage ../development/libraries/coeurl { };



























  coercer = callPackage ../tools/security/coercer { };





























  cogl = callPackage ../development/libraries/cogl {










@@ -22162,8 +22160,6 @@ with pkgs;



























  mtpfs = callPackage ../tools/filesystems/mtpfs { };



























  mtxclient = callPackage ../development/libraries/mtxclient { };



























  mu = callPackage ../tools/networking/mu { };





























  mueval = callPackage ../development/tools/haskell/mueval { };










@@ -31593,8 +31589,6 @@ with pkgs;



























  ngt = callPackage ../development/libraries/ngt { };



























  nheko = qt6Packages.callPackage ../applications/networking/instant-messengers/nheko { };



























  notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { };





























  notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { };