Merge pull request #184588 from leungbk/arpa

pkgs/development/libraries/arpa2common/default.nix

@@ -6,6 +6,7 @@
 , arpa2cm
 , doxygen
 , e2fsprogs
+, graphviz
 , lmdb
 , openssl
 , pkg-config
@@ -14,19 +15,20 @@
 
 stdenv.mkDerivation rec {
   pname = "arpa2common";
-  version = "2.2.14";
+  version = "2.2.18";
 
   src = fetchFromGitLab {
     owner = "arpa2";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-LWsWoHRdLWRSF9JaEwrw+CXm5Azgh7zNeq0a8Z/hijQ=";
+    sha256 = "sha256-UpAVyDXCe07ZwjD307t6G9f/Nny4QYXxGxft1KsiYYg=";
   };
 
   nativeBuildInputs = [
     cmake
     arpa2cm
     doxygen
+    graphviz
     pkg-config
   ];
 

pkgs/development/libraries/quickder/default.nix

@@ -1,50 +1,57 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages, hexio
-, cmake, bash, arpa2cm, git, asn2quickder }:
+{ lib
+, stdenv
+, fetchFromGitLab
+, python3
+, cmake
+, doxygen
+, graphviz
+, quickmem
+, arpa2common
+, arpa2cm
+, ensureNewerSourcesForZipFilesHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "quickder";
-  version = "1.3.0";
+  version = "1.7.1";
 
-  src = fetchFromGitHub {
-    sha256 = "15lxv8vcjnsjxg7ywcac5p6mj5vf5pxq1219yap653ci4f1liqfr";
-    rev = "version-${version}";
-    owner = "vanrein";
+  src = fetchFromGitLab {
+    owner = "arpa2";
     repo = "quick-der";
+    rev = "v${version}";
+    sha256 = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk=";
   };
 
-  nativeBuildInputs = [ cmake ];
-
-  buildInputs = with python3Packages; [
-    arpa2cm
-    asn1ate
-    hexio
-    pyparsing
-    python
-    six
-    asn1ate
-    asn2quickder
+  nativeBuildInputs = [
+    cmake
+    doxygen
+    graphviz
+    ensureNewerSourcesForZipFilesHook
   ];
 
+  buildInputs = [
+    arpa2cm
+    arpa2common
+    (python3.withPackages (ps: with ps; [
+      asn1ate
+      colored
+      pyparsing
+      setuptools
+      six
+    ]))
+    quickmem
+  ];
+
+
   postPatch = ''
-    substituteInPlace ./CMakeLists.txt \
-      --replace "get_version_from_git" "set (Quick-DER_VERSION 1.2) #"
-    substituteInPlace ./CMakeLists.txt \
-      --replace \$\{ARPA2CM_TOOLCHAIN_DIR} "$out/share/ARPA2CM/toolchain/"
-    patchShebangs python/scripts/
+    substituteInPlace setup.py --replace 'pyparsing==' 'pyparsing>='
   '';
 
-  cmakeFlags = [
-    "-DNO_TESTING=ON"
-    "-DARPA2CM_TOOLCHAIN_DIR=$out/share/ARPA2CM/toolchain/"
-  ];
-
-  preConfigure = ''
-    export PREFIX=$out
-  '';
+  doCheck = true;
 
   meta = with lib; {
     description = "Quick (and Easy) DER, a Library for parsing ASN.1";
-    homepage = "https://github.com/vanrein/quick-der";
+    homepage = "https://gitlab.com/arpa2/quick-der/";
     license = licenses.bsd2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ leenaars ];

pkgs/development/libraries/quickmem/default.nix

@@ -0,0 +1,42 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, cmake
+, doxygen
+, graphviz
+, arpa2common
+, arpa2cm
+}:
+
+stdenv.mkDerivation rec {
+  pname = "quickmem";
+  version = "0.3.0";
+
+  src = fetchFromGitLab {
+    owner = "arpa2";
+    repo = "Quick-MEM";
+    rev = "v${version}";
+    sha256 = "sha256-cqg8QN4/I+zql7lVDDAgFA05Dmg4ylBTvPSPP7WATdc=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    doxygen
+    graphviz
+  ];
+
+  buildInputs = [
+    arpa2cm
+    arpa2common
+  ];
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "Memory pooling for ARPA2 projects";
+    homepage = "https://gitlab.com/arpa2/Quick-MEM/";
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ leungbk ];
+  };
+}

pkgs/development/tools/build-managers/arpa2cm/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "arpa2cm";
-  version = "0.9.0";
+  version = "1.0.4";
 
   src = fetchFromGitLab {
-    sha256 = "sha256-1z0fH8vZJiPkY/C654us9s2BULM1tlvvYcszNqk34yI=";
-    rev = "v${version}";
-    repo = pname;
     owner = "arpa2";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-2vb/7UL+uWGrQNh8yOZ3gih5G1/eOp064hF78SDsPGk=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/top-level/all-packages.nix

@@ -20813,6 +20813,8 @@ with pkgs;
 
   quickder = callPackage ../development/libraries/quickder {};
 
+  quickmem = callPackage ../development/libraries/quickmem {};
+
   quicksynergy = callPackage ../applications/misc/quicksynergy { };
 
   quill = callPackage ../tools/security/quill {