Unverified Commit 380335ad authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

deltachat-desktop: 1.50.0 -> 1.50.1 (#370746)

parents 7cb0f499 3d6c11ae

pkgs/by-name/de/deltachat-desktop/package.nix

+6 −6
Original line number Diff line number Diff line
@@ -19,17 +19,17 @@ 


let

  deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {

    version = "1.152.0";

    version = "1.152.1";

    src = fetchFromGitHub {

      owner = "deltachat";

      repo = "deltachat-core-rust";

      tag = "v${version}";

      hash = "sha256-ncgJGeQXOI/Sc5ZfjEGBOY0qiLQrg4/N6QIStWUuJ7s=";

      hash = "sha256-ty2pZWMZ5ZFwwpLm22ChxVAf2cqmIimk8BWvMBqzmks=";

    };

    cargoDeps = rustPlatform.fetchCargoVendor {

      pname = "deltachat-core-rust";

      inherit version src;

      hash = "sha256-kV42OSvYXzY5lim2MUxDADOIGiCUop7QKV6nl6IsPzs=";

      hash = "sha256-wbk4/yhhIRPD3x8ghAwJ0lQy0k8GQopTBBT1a021FRo=";

    };

  };

  electron = electron_32;
@@ -37,18 +37,18 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "deltachat-desktop";

  version = "1.50.0";

  version = "1.50.1";



  src = fetchFromGitHub {

    owner = "deltachat";

    repo = "deltachat-desktop";

    tag = "v${finalAttrs.version}";

    hash = "sha256-0yVO9uIq70Oogt254+iHJv7p8mUeRpxVlJOcISJrKgo=";

    hash = "sha256-G/qBGyx+vxkJvwmBYG5kpx01OO0C9dPji0Cafna9pyw=";

  };



  pnpmDeps = pnpm.fetchDeps {

    inherit (finalAttrs) pname version src;

    hash = "sha256-07jvAKY5GBrZ6EKY9yHwWESezjQXSjjRzImaG+yUlGc=";

    hash = "sha256-UwfblmCkJOuy2Et5Rjm8ONWLbDmLppazqIk2+rV2RJU=";

  };



  nativeBuildInputs = [

pkgs/by-name/de/deltatouch/package.nix

+4 −6
Original line number Diff line number Diff line
@@ -12,15 +12,14 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "deltatouch";

  version = "1.8.0";

  version = "1.10.2";



  src = fetchFromGitea {

    domain = "codeberg.org";

    owner = "lk108";

    repo = "deltatouch";

    rev = "v${finalAttrs.version}";

    hash = "sha256-HVq6eiy2ufFg96oXwnSpv7fMDL1haWyIelBzFd7pfk0=";

    fetchSubmodules = true;

    hash = "sha256-QcrBo7lrMYkOZGSyS5fLAwNxZwKFrylU5P5my2Jl93k=";

  };



  nativeBuildInputs = [
@@ -36,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: { 
    lomiri.lomiri-ui-toolkit

    lomiri.lomiri-ui-extras

    lomiri.lomiri-api

    lomiri.lomiri-indicator-network # Lomiri.Connectivity module

    lomiri.qqc2-suru-style

  ];
@@ -48,11 +46,11 @@ stdenv.mkDerivation (finalAttrs: { 
      --replace-fail 'assets/logo.svg DESTINATION assets' 'assets/logo.svg DESTINATION ''${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps RENAME deltatouch.svg' \

      --replace-fail "\''${DESKTOP_FILE_NAME} DESTINATION \''${DATA_DIR}" "\''${DESKTOP_FILE_NAME} DESTINATION \''${CMAKE_INSTALL_DATAROOTDIR}/applications"



    substituteInPlace plugins/{DeltaHandler,HtmlMsgEngineProfile,WebxdcEngineProfile}/CMakeLists.txt \

    substituteInPlace plugins/{DeltaHandler,HtmlMsgEngineProfile,WebxdcEngineProfile,XdcPickerEngineProfile}/CMakeLists.txt \

      --replace-fail 'set(QT_IMPORTS_DIR "/lib/''${ARCH_TRIPLET}")' 'set(QT_IMPORTS_DIR "${placeholder "out"}/${qt5.qtbase.qtQmlPrefix}")'



    # Fix import of library dependencies

    substituteInPlace plugins/{DeltaHandler,WebxdcEngineProfile}/CMakeLists.txt \

    substituteInPlace plugins/{DeltaHandler,HtmlMsgEngineProfile,WebxdcEngineProfile,XdcPickerEngineProfile}/CMakeLists.txt \

      --replace-fail 'IMPORTED_LOCATION "''${CMAKE_CURRENT_BINARY_DIR}/libdeltachat.so"' 'IMPORTED_LOCATION "${lib.getLib libdeltachat}/lib/libdeltachat.so"'

    substituteInPlace plugins/DeltaHandler/CMakeLists.txt \

      --replace-fail 'IMPORTED_LOCATION "''${CMAKE_CURRENT_BINARY_DIR}/libquirc.so.1.2"' 'IMPORTED_LOCATION "${lib.getLib quirc}/lib/libquirc.so"'

pkgs/by-name/li/libdeltachat/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ 


stdenv.mkDerivation rec {

  pname = "libdeltachat";

  version = "1.152.0";

  version = "1.152.2";



  src = fetchFromGitHub {

    owner = "deltachat";

    repo = "deltachat-core-rust";

    tag = "v${version}";

    hash = "sha256-ncgJGeQXOI/Sc5ZfjEGBOY0qiLQrg4/N6QIStWUuJ7s=";

    hash = "sha256-NPdUHBge6k2BqWf6SxA35Tqo0xGjFIIU2t5dbdnbMGg=";

  };



  patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec { 
  cargoDeps = rustPlatform.fetchCargoVendor {

    pname = "deltachat-core-rust";

    inherit version src;

    hash = "sha256-kV42OSvYXzY5lim2MUxDADOIGiCUop7QKV6nl6IsPzs=";

    hash = "sha256-AbFtGL63wl2fo4rbxq8Hx8VvEw64sawtLHS8jQ496Vw=";

  };



  nativeBuildInputs = [