diff options
| -rw-r--r-- | flake.nix | 26 | ||||
| -rw-r--r-- | nix/boringssl_pkg_versions.nix | 24 |
2 files changed, 37 insertions, 13 deletions
@@ -107,13 +107,12 @@ in rec { makefile = "makefile.unix"; - version = tcVersion; + version = if tcVersion != null then tcVersion else prev.version; - src = pkgs.fetchFromGitHub { + src = if version == prev.version then prev.src else pkgs.fetchFromGitHub { owner = "libtom"; repo = "libtomcrypt"; - rev = "refs/tags/${version}"; - leaveDotGit = true; + rev = if pkgs.lib.hasPrefix "1.18" version then "refs/tags/v${version}" else "refs/tags/${version}" ; hash = tcHash; }; @@ -121,23 +120,24 @@ patches = if pkgs.lib.hasPrefix "1.18" version then ( prev.patches or [] ) ++ [ # NOTE: LibTomCrypt does not expose the lib, when built statically (using `makefile and not `makefile.shared`). # This patch copies the necessary code from `makefile.shared`. - # ./nix/libtomcrypt-pkgconfig-for-static.patch ] + ./nix/libtomcrypt-pkgconfig-for-static.patch ] else []; }); libtommathBuilder = { version, hash }: pkgs.libtommath.overrideAttrs (final: prev: rec { makefile = "makefile.unix"; - inherit version; - # version = "1.3.0"; + # version = if version != null then version else prev.version; + version = "1.3.0"; src = pkgs.fetchurl { url = "https://github.com/libtom/libtommath/releases/download/v${version}/ltm-${version}.tar.xz"; - inherit hash; + # hash = if hash != null then hash else prev.hash; + hash = "sha256-KWJy2TQ1mRMI63NgdgDANLVYgHoH6CnnURQuZcz6nQg"; }; - # patches = ( prev.patches or [] ) ++ [ - # # NOTE: LibTomMath does not expose the lib, when built statically (using `makefile and not `makefile.shared`). - # # This patch copies the necessary code from `makefile.shared`. - # ./nix/libtommath-pkgconfig-for-static-build.patch - # ]; + patches = ( prev.patches or [] ) ++ [ + # NOTE: LibTomMath does not expose the lib, when built statically (using `makefile and not `makefile.shared`). + # This patch copies the necessary code from `makefile.shared`. + ./nix/libtommath-pkgconfig-for-static-build.patch + ]; }); nettle = pkgs.nettle.overrideAttrs (final: prev: { configureFlags = ( prev.configureFlags or [] ) ++ [ "--enable-static" ]; diff --git a/nix/boringssl_pkg_versions.nix b/nix/boringssl_pkg_versions.nix new file mode 100644 index 0000000..0c4ab10 --- /dev/null +++ b/nix/boringssl_pkg_versions.nix @@ -0,0 +1,24 @@ +{ + buildECTesterStandalone +}: +{ +# "version_for_cocoapods_10.0", + +# "version_for_cocoapods_9.0", +# "version_for_cocoapods_8.0", +# "version_for_cocoapods_7.0", +# "version_for_cocoapods_6.0", +# "version_for_cocoapods_5.0", +# "version_for_cocoapods_4.0", +# "version_for_cocoapods_3.0", +# "version_for_cocoapods_2.0", +# "version_for_cocoapods_1.0", +# "fips-android-20191020", +# "fips-20220613", +# "fips-20210429", +# "fips-20190808", +# "fips-20180730", + fips-20170615 = buildECTesterStandalone { + boringssl = { rev = "refs/tags/fips-20170615"; hash = ""; }; + }; +} |