Unverified Commit 1d72880e authored by Anderson Torres's avatar Anderson Torres Committed by GitHub
Browse files

Merge pull request #211387 from ovlach/datovka 

datovka 4.15.6 -> 4.21.1
parents 8eabb500 f51c543b

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -10776,6 +10776,12 @@ 
    githubId = 15930073;

    name = "Moritz Scheuren";

  };

  ovlach = {

    email = "ondrej@vlach.xyz";

    name = "Ondrej Vlach";

    github = "ovlach";

    githubId = 4405107;

  };

  ozkutuk = {

    email = "ozkutuk@protonmail.com";

    github = "ozkutuk";

pkgs/applications/networking/datovka/default.nix

+7 −6
Original line number Diff line number Diff line
@@ -2,30 +2,31 @@ 
, mkDerivation

, fetchurl

, libxml2

, libisds

, libdatovka

, qmake

, qtbase

, qtwebsockets

, qtsvg

, pkg-config

}:



mkDerivation rec {

  pname = "datovka";

  version = "4.15.6";

  version = "4.21.1";



  src = fetchurl {

    url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz";

    sha256 = "1qs1yd9qqsf56jm9w6sffkqb2l8s3i9qgi2q8vd59ss19ym6yky2";

    url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz";

    sha256 = "sha256-mzCtZE4mira/ZeyfujBh+cONq1YbCyLIypiIX0kTVJg=";

  };



  buildInputs = [ libisds qmake qtbase qtsvg libxml2 ];

  buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ];



  nativeBuildInputs = [ pkg-config ];



  meta = with lib; {

    description = "Client application for operating Czech government-provided Databox infomation system";

    homepage = "https://www.datovka.cz/";

    license = licenses.lgpl3;

    license = licenses.gpl3Plus;

    maintainers = [ maintainers.mmahut ];

    platforms = platforms.linux;

  };

pkgs/development/libraries/libdatovka/default.nix

0 → 100644
+42 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, autoreconfHook

, pkg-config

, fetchurl

, expat

, gpgme

, libgcrypt

, libxml2

, libxslt

, gnutls

, curl

, docbook_xsl

}:



stdenv.mkDerivation rec {

  pname = "libdatovka";

  version = "0.2.1";



  src = fetchurl {

    url = "https://gitlab.nic.cz/datovka/libdatovka/-/archive/v${version}/libdatovka-v${version}.tar.gz";

    sha256 = "sha256-687d8ZD9zfMeo62YWCW5Kc0CXkKClxtbbwXR51pPwBE=";

  };



  patches = [

    ./libdatovka-deprecated-fn-curl.patch

  ];



  configureFlags = [

    "--with-docbook-xsl-stylesheets=${docbook_xsl}/xml/xsl/docbook"

  ];



  buildInputs = [ pkg-config autoreconfHook expat gpgme libgcrypt libxml2 libxslt gnutls curl docbook_xsl ];



  meta = with lib; {

    description = "Client library for accessing SOAP services of Czech government-provided Databox infomation system";

    homepage = "https://gitlab.nic.cz/datovka/libdatovka";

    license = licenses.gpl3Plus;

    maintainers = [ maintainers.ovlach ];

    platforms = platforms.linux;

  };

}

pkgs/development/libraries/libdatovka/libdatovka-deprecated-fn-curl.patch

0 → 100644
+11 −0
Original line number Diff line number Diff line 
--- libdatovka-v0.2.1/configure.ac	2021-11-03 13:33:03.000000000 +0100

+++ libdatovka-v0.2.1-patched/configure.ac	2023-01-18 11:44:25.647566474 +0100

@@ -46,6 +46,8 @@

                 [Define if you want include debugging code])

       )

 

+CFLAGS="${CFLAGS} -Wno-error=deprecated-declarations"

+

 AC_CHECK_DECL([_WIN32])

 AM_CONDITIONAL([WIN32], [test "$ac_cv_have_decl__WIN32" = "yes"])

pkgs/top-level/all-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -20604,6 +20604,8 @@ with pkgs; 














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



























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



























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





























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