Unverified Commit 44e14e09 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #324577 from linsui/jami 

jami: 20240529.0 -> 20240627.0
parents d0e033dc 37a00568

pkgs/applications/networking/instant-messengers/jami/default.nix

+78 −84
Original line number Diff line number Diff line 
{ stdenv

, lib

, pkg-config

, fetchFromGitLab

, gitUpdater

, ffmpeg_6

{

  stdenv,

  lib,

  pkg-config,

  fetchFromGitLab,

  gitUpdater,

  ffmpeg_6,



  # for daemon

, autoreconfHook

, perl # for pod2man

, alsa-lib

, asio

, dbus

, sdbus-cpp

, fmt

, gmp

, gnutls

, http-parser

, jack

, jsoncpp

, libarchive

, libgit2

, libnatpmp

, libpulseaudio

, libupnp

, yaml-cpp

, msgpack-cxx

, openssl

, restinio

, secp256k1

, speex

, udev

, webrtc-audio-processing

, zlib

  autoreconfHook,

  perl, # for pod2man

  alsa-lib,

  asio,

  dbus,

  sdbus-cpp,

  fmt,

  gmp,

  gnutls,

  llhttp,

  jack,

  jsoncpp,

  libarchive,

  libgit2,

  libnatpmp,

  libpulseaudio,

  libupnp,

  yaml-cpp,

  msgpack-cxx,

  openssl,

  restinio,

  secp256k1,

  speex,

  udev,

  webrtc-audio-processing,

  zlib,



  # for client

, cmake

, git

, networkmanager # for libnm

, python3

, qttools # for translations

, wrapQtAppsHook

, libnotify

, qt5compat

, qtbase

, qtdeclarative

, qrencode

, qtmultimedia

, qtnetworkauth

, qtpositioning

, qtsvg

, qtwebengine

, qtwebchannel

, wrapGAppsHook3

, withWebengine ? true

  cmake,

  git,

  networkmanager, # for libnm

  python3,

  qttools, # for translations

  wrapQtAppsHook,

  libnotify,

  qt5compat,

  qtbase,

  qtdeclarative,

  qrencode,

  qtmultimedia,

  qtnetworkauth,

  qtpositioning,

  qtsvg,

  qtwebengine,

  qtwebchannel,

  wrapGAppsHook3,

  withWebengine ? true,



  # for pjsip

, fetchFromGitHub

, pjsip

  fetchFromGitHub,

  pjsip,



  # for opendht

, opendht

  opendht,

}:



stdenv.mkDerivation rec {

  pname = "jami";

  version = "20240529.0";

  version = "20240627.0";



  src = fetchFromGitLab {

    domain = "git.jami.net";

    owner = "savoirfairelinux";

    repo = "jami-client-qt";

    rev = "stable/${version}";

    hash = "sha256-v2GFvgHHJ2EMoayZ+//OZ0U+P1fh5Mgp5fAoqtZts7U=";

    hash = "sha256-aePF1c99ju9y7JEgC+F2BPfpSAZlLd5OI5Jm6i9VlQQ=";

    fetchSubmodules = true;

  };



  pjsip-jami = pjsip.overrideAttrs (old: rec {

    version = "797f1a38cc1066acc4adc9561aa1288afabe72d5";

    version = "8fc165b833eea6e3c88d67a541385424b129fd3f";



    src = fetchFromGitHub {

      owner = "savoirfairelinux";

      repo = "pjproject";

      rev = version;

      hash = "sha256-lTDbJF09R2G+EIkMj1YyKa4XokH9LlcIG+RhRJhzUes=";

      hash = "sha256-uA6ZJYUgAu3cK4CKCGtqaI0KPM/0szExPS2pCOflz5A=";

    };



    configureFlags = [
@@ -106,22 +107,21 @@ stdenv.mkDerivation rec { 
      "--disable-resample"

      "--disable-libwebrtc"

      "--with-gnutls=yes"

    ]

    ++ lib.optionals stdenv.isLinux [

      "--enable-epoll"

    ];

    ] ++ lib.optionals stdenv.isLinux [ "--enable-epoll" ];



    buildInputs = old.buildInputs ++ [ gnutls ];

  });



  opendht-jami = (opendht.overrideAttrs {

  opendht-jami =

    (opendht.overrideAttrs {

      src = fetchFromGitHub {

        owner = "savoirfairelinux";

        repo = "opendht";

      rev = "f2cee8e9ce24746caa7dee1847829c526d340284";

      hash = "sha256-ZnIrlybF3MCiXxxv80tRzCJ5CJ54S42prGUjq1suJNA=";

        rev = "074e05cc3254d5d73b0d96ee772a6e01bb3113e5";

        hash = "sha256-WuaURlC7eDDxvnM3YuyU9CNrwnE4WBQUIEw3z/0zjN8=";

      };

  }).override {

    }).override

      {

        enableProxyServerAndClient = true;

        enablePushNotifications = true;

      };
@@ -147,7 +147,7 @@ stdenv.mkDerivation rec { 
      asio

      fmt

      gnutls

      http-parser

      llhttp

      jsoncpp

      libupnp

      msgpack-cxx
@@ -194,7 +194,7 @@ stdenv.mkDerivation rec { 
      ffmpeg_6

      gmp

      gnutls

      http-parser

      llhttp

      jack

      jsoncpp

      libarchive
@@ -265,13 +265,9 @@ stdenv.mkDerivation rec { 
    qtpositioning

    qtsvg

    qtwebchannel

  ] ++ lib.optionals withWebengine [

    qtwebengine

  ];

  ] ++ lib.optionals withWebengine [ qtwebengine ];



  cmakeFlags = lib.optionals (!withWebengine) [

    "-DWITH_WEBENGINE=false"

  ];

  cmakeFlags = lib.optionals (!withWebengine) [ "-DWITH_WEBENGINE=false" ];



  qtWrapperArgs = [

    # With wayland the titlebar is not themed and the wmclass is wrong.
@@ -282,9 +278,7 @@ stdenv.mkDerivation rec { 
    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")

  '';



  passthru.updateScript = gitUpdater {

    rev-prefix = "stable/";

  };

  passthru.updateScript = gitUpdater { rev-prefix = "stable/"; };



  meta = with lib; {

    homepage = "https://jami.net/";

pkgs/by-name/re/restinio_0_6/package.nix

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
{ lib, stdenvNoCC, fetchurl }:



stdenvNoCC.mkDerivation rec {

  pname = "restinio";

  version = "0.6.19";



  src = fetchurl {

    url = "https://github.com/Stiffstream/restinio/releases/download/v.${version}/${pname}-${version}.tar.bz2";

    hash = "sha256-fyHuvrlm4XDWq1TpsZiskn1DkJASFzngN8D6O7NnskA=";

  };



  sourceRoot = ".";



  installPhase = ''

    runHook preInstall



    mkdir -p $out/include

    mv restinio-*/dev/restinio $out/include



    runHook postInstall

  '';



  meta = with lib; {

    description = "Cross-platform, efficient, customizable, and robust asynchronous HTTP/WebSocket server C++14 library";

    homepage = "https://github.com/Stiffstream/restinio";

    changelog = "https://github.com/Stiffstream/restinio/releases/tag/v.${version}";

    license = licenses.bsd3;

    platforms = platforms.all;

  };

}

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -1190,6 +1190,7 @@ mapAliases ({ 
  redocly-cli = redocly; # Added 2024-04-14

  redpanda = redpanda-client; # Added 2023-10-14

  redpanda-server = throw "'redpanda-server' has been removed because it was broken for a long time"; # Added 2024-06-10

  restinio_0_6 = throw "restinio_0_6 has been removed from nixpkgs as it's not needed by downstream packages"; # Added 2024-07-04

  restya-board = throw "'restya-board' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-01-22

  retdec-full = throw "'retdec-full' is no longer needed, please use 'retdec'"; # Added 2024-02-05

  retroshare06 = retroshare;

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -11136,7 +11136,6 @@ with pkgs; 














  opendht = callPackage ../development/libraries/opendht  {















    inherit (darwin.apple_sdk.frameworks) Security;













    restinio = restinio_0_6;















  };





























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










@@ -40393,7 +40392,6 @@ with pkgs;













    # TODO: remove once `udev` is `systemdMinimal` everywhere.















    udev = systemdMinimal;















    jack = libjack2;













    restinio = restinio_0_6;















  };





























  jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { };