diff --git a/pkgs/by-name/qu/quickder/package.nix b/pkgs/by-name/qu/quickder/package.nix new file mode 100644 index 000000000000..981fa635a30b --- /dev/null +++ b/pkgs/by-name/qu/quickder/package.nix @@ -0,0 +1,82 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchFromGitLab, + python3, + cmake, + doxygen, + graphviz, + quickmem, + arpa2common, + arpa2cm, + ensureNewerSourcesForZipFilesHook, +}: + +let + python = + let + packageOverrides = self: super: { + pyparsing = super.pyparsing.overridePythonAttrs (old: rec { + version = "3.1.2"; + src = fetchFromGitHub { + owner = "pyparsing"; + repo = "pyparsing"; + rev = "refs/tags/${version}"; + hash = "sha256-0B8DjO4kLgvt4sYsk8CZI+5icdKy73XE2tWeqVLqO5A="; + }; + }); + }; + in + python3.override { + inherit packageOverrides; + self = python; + }; +in +stdenv.mkDerivation rec { + pname = "quickder"; + version = "1.7.1"; + + src = fetchFromGitLab { + owner = "arpa2"; + repo = "quick-der"; + rev = "v${version}"; + hash = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk="; + }; + + nativeBuildInputs = [ + cmake + doxygen + graphviz + ensureNewerSourcesForZipFilesHook + ]; + + buildInputs = [ + arpa2cm + arpa2common + (python.withPackages ( + ps: with ps; [ + asn1ate + colored + pyparsing + setuptools + six + ] + )) + quickmem + ]; + + postPatch = '' + substituteInPlace setup.py --replace 'pyparsing==' 'pyparsing>=' + ''; + + doCheck = true; + + meta = with lib; { + description = "Quick (and Easy) DER, a Library for parsing ASN.1"; + homepage = "https://gitlab.com/arpa2/quick-der/"; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix deleted file mode 100644 index c3de38398084..000000000000 --- a/pkgs/development/libraries/quickder/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, python3 -, cmake -, doxygen -, graphviz -, quickmem -, arpa2common -, arpa2cm -, ensureNewerSourcesForZipFilesHook -}: - -stdenv.mkDerivation rec { - pname = "quickder"; - version = "1.7.1"; - - src = fetchFromGitLab { - owner = "arpa2"; - repo = "quick-der"; - rev = "v${version}"; - hash = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk="; - }; - - nativeBuildInputs = [ - cmake - doxygen - graphviz - ensureNewerSourcesForZipFilesHook - ]; - - buildInputs = [ - arpa2cm - arpa2common - (python3.withPackages (ps: with ps; [ - asn1ate - colored - pyparsing - setuptools - six - ])) - quickmem - ]; - - - postPatch = '' - substituteInPlace setup.py --replace 'pyparsing==' 'pyparsing>=' - ''; - - doCheck = true; - - meta = with lib; { - description = "Quick (and Easy) DER, a Library for parsing ASN.1"; - homepage = "https://gitlab.com/arpa2/quick-der/"; - license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ leenaars ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4797e656961..6063e994bb90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22454,8 +22454,6 @@ with pkgs; quesoglc = callPackage ../development/libraries/quesoglc { }; - quickder = callPackage ../development/libraries/quickder { }; - quickmem = callPackage ../development/libraries/quickmem { }; quicksynergy = callPackage ../applications/misc/quicksynergy { };