diff options
| author | J08nY | 2024-08-12 22:41:22 +0200 |
|---|---|---|
| committer | J08nY | 2024-08-12 22:41:22 +0200 |
| commit | e0bc60f3257039e9cfcbaa9312c6e40664989646 (patch) | |
| tree | 0c819985713b68e612a22d83621dc74fb9d75216 /flake.nix | |
| parent | b170ce52826b8e82c6278de980772ed73cb3ea6e (diff) | |
| download | ECTester-e0bc60f3257039e9cfcbaa9312c6e40664989646.tar.gz ECTester-e0bc60f3257039e9cfcbaa9312c6e40664989646.tar.zst ECTester-e0bc60f3257039e9cfcbaa9312c6e40664989646.zip | |
Diffstat (limited to 'flake.nix')
| -rw-r--r-- | flake.nix | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -156,6 +156,7 @@ { version ? null, hash ? null, + tag ? null, }: if version == null then pkgs.mbedtls @@ -163,10 +164,11 @@ pkgs.mbedtls.overrideAttrs ( final: prev: { inherit version; + inherit tag; src = pkgs.fetchFromGitHub { owner = "Mbed-TLS"; repo = "mbedtls"; - rev = "mbedtls-${version}"; + rev = tag; inherit hash; # mbedtls >= 3.6.0 uses git submodules fetchSubmodules = true; @@ -465,10 +467,10 @@ libgcrypt = libgcryptBuilder { inherit version hash; }; }; mbedtlsShimBuilder = - { version, hash }: + { version, hash, tag }: import ./nix/mbedtlsshim.nix { inherit pkgs; - mbedtls = (mbedtlsBuilder { inherit version hash; }); + mbedtls = (mbedtlsBuilder { inherit version hash tag; }); }; ippcpShimBuilder = { version, hash }: @@ -529,6 +531,7 @@ mbedtls ? { version = null; hash = null; + tag = null; }, ippcp ? { version = null; @@ -557,7 +560,7 @@ cryptoppShim = cryptoppShimBuilder { inherit (cryptopp) version hash; }; boringsslShim = boringsslShimBuilder { inherit (boringssl) rev hash; }; gcryptShim = gcryptShimBuilder { inherit (gcrypt) version hash; }; - mbedtlsShim = mbedtlsShimBuilder { inherit (mbedtls) version hash; }; + mbedtlsShim = mbedtlsShimBuilder { inherit (mbedtls) version hash tag; }; ippcpShim = ippcpShimBuilder { inherit (ippcp) version hash; }; nettleShim = nettleShimBuilder { inherit (nettle) version tag hash; }; libresslShim = libresslShimBuilder { inherit (libressl) version hash; }; |
