mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-29 16:40:18 +02:00
Merge pull request #184588 from leungbk/arpa
This commit is contained in:
commit
34d312e938
|
@ -6,6 +6,7 @@
|
||||||
, arpa2cm
|
, arpa2cm
|
||||||
, doxygen
|
, doxygen
|
||||||
, e2fsprogs
|
, e2fsprogs
|
||||||
|
, graphviz
|
||||||
, lmdb
|
, lmdb
|
||||||
, openssl
|
, openssl
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
@ -14,19 +15,20 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "arpa2common";
|
pname = "arpa2common";
|
||||||
version = "2.2.14";
|
version = "2.2.18";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "arpa2";
|
owner = "arpa2";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-LWsWoHRdLWRSF9JaEwrw+CXm5Azgh7zNeq0a8Z/hijQ=";
|
sha256 = "sha256-UpAVyDXCe07ZwjD307t6G9f/Nny4QYXxGxft1KsiYYg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
arpa2cm
|
arpa2cm
|
||||||
doxygen
|
doxygen
|
||||||
|
graphviz
|
||||||
pkg-config
|
pkg-config
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -1,50 +1,57 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, python3Packages, hexio
|
{ lib
|
||||||
, cmake, bash, arpa2cm, git, asn2quickder }:
|
, stdenv
|
||||||
|
, fetchFromGitLab
|
||||||
|
, python3
|
||||||
|
, cmake
|
||||||
|
, doxygen
|
||||||
|
, graphviz
|
||||||
|
, quickmem
|
||||||
|
, arpa2common
|
||||||
|
, arpa2cm
|
||||||
|
, ensureNewerSourcesForZipFilesHook
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "quickder";
|
pname = "quickder";
|
||||||
version = "1.3.0";
|
version = "1.7.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitLab {
|
||||||
sha256 = "15lxv8vcjnsjxg7ywcac5p6mj5vf5pxq1219yap653ci4f1liqfr";
|
owner = "arpa2";
|
||||||
rev = "version-${version}";
|
|
||||||
owner = "vanrein";
|
|
||||||
repo = "quick-der";
|
repo = "quick-der";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
buildInputs = with python3Packages; [
|
doxygen
|
||||||
arpa2cm
|
graphviz
|
||||||
asn1ate
|
ensureNewerSourcesForZipFilesHook
|
||||||
hexio
|
|
||||||
pyparsing
|
|
||||||
python
|
|
||||||
six
|
|
||||||
asn1ate
|
|
||||||
asn2quickder
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
arpa2cm
|
||||||
|
arpa2common
|
||||||
|
(python3.withPackages (ps: with ps; [
|
||||||
|
asn1ate
|
||||||
|
colored
|
||||||
|
pyparsing
|
||||||
|
setuptools
|
||||||
|
six
|
||||||
|
]))
|
||||||
|
quickmem
|
||||||
|
];
|
||||||
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace ./CMakeLists.txt \
|
substituteInPlace setup.py --replace 'pyparsing==' 'pyparsing>='
|
||||||
--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/
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
cmakeFlags = [
|
doCheck = true;
|
||||||
"-DNO_TESTING=ON"
|
|
||||||
"-DARPA2CM_TOOLCHAIN_DIR=$out/share/ARPA2CM/toolchain/"
|
|
||||||
];
|
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
export PREFIX=$out
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Quick (and Easy) DER, a Library for parsing ASN.1";
|
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;
|
license = licenses.bsd2;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = with maintainers; [ leenaars ];
|
maintainers = with maintainers; [ leenaars ];
|
||||||
|
|
42
pkgs/development/libraries/quickmem/default.nix
Normal file
42
pkgs/development/libraries/quickmem/default.nix
Normal file
|
@ -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 ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "arpa2cm";
|
pname = "arpa2cm";
|
||||||
version = "0.9.0";
|
version = "1.0.4";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
sha256 = "sha256-1z0fH8vZJiPkY/C654us9s2BULM1tlvvYcszNqk34yI=";
|
|
||||||
rev = "v${version}";
|
|
||||||
repo = pname;
|
|
||||||
owner = "arpa2";
|
owner = "arpa2";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-2vb/7UL+uWGrQNh8yOZ3gih5G1/eOp064hF78SDsPGk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
|
@ -20813,6 +20813,8 @@ with pkgs;
|
||||||
|
|
||||||
quickder = callPackage ../development/libraries/quickder {};
|
quickder = callPackage ../development/libraries/quickder {};
|
||||||
|
|
||||||
|
quickmem = callPackage ../development/libraries/quickmem {};
|
||||||
|
|
||||||
quicksynergy = callPackage ../applications/misc/quicksynergy { };
|
quicksynergy = callPackage ../applications/misc/quicksynergy { };
|
||||||
|
|
||||||
quill = callPackage ../tools/security/quill {
|
quill = callPackage ../tools/security/quill {
|
||||||
|
|
Loading…
Reference in a new issue