Commit f8e9996d authored by Peter Hoeg's avatar Peter Hoeg
Browse files

xca: 2.4.0 -> 2.6.0

parent bbc8ea19

pkgs/applications/misc/xca/default.nix

+30 −22
Original line number Diff line number Diff line 
{ stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config

, libtool, openssl, qtbase, qttools, sphinx }:



mkDerivation rec {

{ stdenv

, lib

, fetchFromGitHub

, wrapQtAppsHook

, cmake

, pkg-config

, openssl

, qtbase

, qttools

, sphinx

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "xca";

  version = "2.4.0";

  version = "2.6.0";



  src = fetchFromGitHub {

    owner = "chris2511";

    repo = "xca";

    rev    = "RELEASE.${version}";

    sha256 = "04z0mmjsry72nvib4icmwh1717y4q9pf2gr68ljrzln4vv4ckpwk";

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

    hash = "sha256-E0Ap+JDK/oYTG+uaRHsdOxyLIywlYJ01T4ANQhNH220=";

  };



  # Adaptions to stay OpenSSL 3.0 compatible

  patches = [ (fetchpatch {

    url = "https://github.com/chris2511/xca/commit/f5ac099e948ea354deac75ff9fa09d51453476e1.patch";

    hash = "sha256-4rRO2y9hZq879HTsgBgbXGRYEcgfG4niJKyK3l3PMZ8=";

  }) ];



  buildInputs = [ libtool openssl qtbase ];

  buildInputs = [ openssl qtbase ];



  nativeBuildInputs = [ autoreconfHook pkg-config qttools sphinx ];

  nativeBuildInputs = [

    cmake

    pkg-config

    qttools

    sphinx

    wrapQtAppsHook

  ];



  # Needed for qcollectiongenerator (see https://github.com/NixOS/nixpkgs/pull/92710)

  QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
@@ -28,12 +37,11 @@ mkDerivation rec { 
  enableParallelBuilding = true;



  meta = with lib; {

    broken = stdenv.isDarwin;

    description = "An x509 certificate generation tool, handling RSA, DSA and EC keys, certificate signing requests (PKCS#10) and CRLs";

    mainProgram = "xca";

    homepage = "https://hohnstaedt.de/xca/";

    license = licenses.bsd3;

    maintainers = with maintainers; [ offline peterhoeg ];

    platforms   = platforms.all;

    inherit (qtbase.meta) platforms;

  };

}
 
})

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -35954,7 +35954,7 @@ with pkgs; 














  kodi-cli = callPackage ../tools/misc/kodi-cli { };



























  xca = libsForQt5.callPackage ../applications/misc/xca { };













  xca = qt6Packages.callPackage ../applications/misc/xca { };





























  xcalib = callPackage ../tools/X11/xcalib { };