parsav  Diff

Differences From Artifact [e620433c36]:

• File default.nix — part of check-in [8648683aba] at 2022-11-04 04:27:15 on branch trunk — fixes to make parsav build on modern nix (user: lexi, size: 1727) [annotate] [blame] [check-ins using]

To Artifact [552f41e3b4]:

• File default.nix — part of check-in [e7e16156a6] at 2022-11-04 12:45:06 on branch trunk — begin steps to port parsav to mbedtls3 and modern nix. also? fuck mbedtls with a fucking jackhammer i am never using it again holy fuck (user: lexi, size: 2171) [annotate] [blame] [check-ins using]

     1      1   let pkg = import <nixpkgs> {};
     2      2   in {stdenv          ? pkg.stdenv,
     3      3   	fetchFromGitHub ? pkg.fetchFromGitHub,
     4      4   	terra           ? pkg.terra,
     5      5   	pkgconfig       ? pkg.pkgconfig,
     6      6   	json_c          ? pkg.json_c,
     7      7   	postgresql      ? pkg.postgresql.lib,
     8         -	mbedtls         ? pkg.mbedtls,
            8  +	mbedtlsLegacy   ? pkg.mbedtls,
     9      9   	glibc           ? pkg.glibc,
    10     10   	cmark           ? pkg.cmark,
    11     11   	inkscape        ? pkg.inkscape,
    12     12   	mongoose        ? null,
    13         -	lib             ? pkg.lib
           13  +	lib             ? pkg.lib,
           14  +	pypkgs			? pkg.python310Packages,
           15  +	debug           ? true
    14     16   }:
    15     17   let mgsrc = if mongoose != null then mongoose
    16     18   			else fetchFromGitHub {
    17     19   				owner = "cesanta";
    18     20   				repo = "mongoose";
    19     21   				rev = "369f44adfa38e0d8fa9667e9d6bafd7e0e3c6231";
    20     22   				sha256 = "17rkd7ydic39cw9sfh11mcil02vmi6jjyj2ncbxan6psak09xbrc";
    21     23   			};
    22     24   	pkv = val: p: "parsav_pkg_${p}_${val}";
    23     25   	pkp = pkv "prefix";
           26  +	mbedtls = mbedtlsLegacy.overrideAttrs(o: rec{
           27  +		version = "3.0-dev";
           28  +		nativeBuildInputs = o.nativeBuildInputs ++ [pypkgs.jinja2];
           29  +		src = fetchFromGitHub {
           30  +			owner = "ARMmbed"; repo = "mbedtls";
           31  +			rev = "49e9fbd6bc7c970c221be6e35f6872762ddde0bc";
           32  +			sha256 = "1ips4mx8rr0kcqn7vdapx2m9xh4cayb7isbwvr98qp2ybi4pi4ai";
           33  +		};
           34  +	});
    24     35   in stdenv.mkDerivation {
    25     36   	name = "parsav";
    26     37   	version = "dev";
    27     38   	nativeBuildInputs = [terra json_c pkgconfig mbedtls];
    28     39   	buildInputs = [cmark inkscape postgresql postgresql.lib];
    29     40   	src = ./.;
    30     41   
           42  +	dontStrip = debug;
           43  +	dbg = if debug then 1 else null;
           44  +
    31     45   	${pkp "json-c"} = "${json_c}";
    32     46   	${pkp "mbedtls"} = "${mbedtls}";
    33     47   	${pkp "libc"} = "${glibc.out}";
    34     48   	${pkp "cmark"} = "${cmark}";
    35     49   	${pkp "inkscape"} = "${inkscape}";
    36     50   	${pkv "incdir" "libpq"} = "${postgresql.out}/include";
    37     51   	${pkv "libdir" "libpq"} = "${postgresql.lib}/lib";