JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #110555 from LeSuisse/cryptopp-8.4.0

Browse Source 
cryptopp: 8.2.0 -> 8.4.0
This commit is contained in:
Robert Schütz 2021-01-25 17:38:04 +01:00 committed by GitHub
commit 67fabbc7c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/libraries/crypto++/default.nix
View File

@ -1,16 +1,15 @@
{ lib, stdenv, fetchFromGitHub, nasm, which }:
{ lib, stdenv, fetchFromGitHub, }:
with lib;
stdenv.mkDerivation rec {
pname = "crypto++";
version = "8.2.0";
underscoredVersion = strings.replaceStrings ["."] ["_"] version;
version = "8.4.0";
underscoredVersion = lib.strings.replaceStrings ["."] ["_"] version;
src = fetchFromGitHub {
owner = "weidai11";
repo = "cryptopp";
rev = "CRYPTOPP_${underscoredVersion}";
sha256 = "01zrrzjn14yhkb9fzzl57vmh7ig9a6n6fka45f8za0gf7jpcq3mj";
sha256 = "1gwn8yh1mh41hkh6sgnhb9c3ygrdazd7645msl20i0zdvcp7f5w3";
};
postPatch = ''
@ -19,9 +18,6 @@ stdenv.mkDerivation rec {
--replace "ARFLAGS = -static -o" "ARFLAGS = -cru"
'';
nativeBuildInputs = optionals stdenv.hostPlatform.isx86 [ nasm which ];
preBuild = optionalString stdenv.hostPlatform.isx86 "${stdenv.shell} rdrand-nasm.sh";
makeFlags = [ "PREFIX=${placeholder "out"}" ];
buildFlags = [ "shared" "libcryptopp.pc" ];
enableParallelBuilding = true;
@ -31,17 +27,17 @@ stdenv.mkDerivation rec {
preInstall = "rm libcryptopp.a"; # built for checks but we don't install static lib into the nix store
installTargets = [ "install-lib" ];
installFlags = [ "LDCONF=true" ];
postInstall = optionalString (!stdenv.hostPlatform.isDarwin) ''
ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${versions.majorMinor version}
ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${versions.major version}
postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${lib.versions.majorMinor version}
ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${lib.versions.major version}
'';
meta = {
description = "Crypto++, a free C++ class library of cryptographic schemes";
homepage = "https://cryptopp.com/";
changelog = "https://raw.githubusercontent.com/weidai11/cryptopp/CRYPTOPP_${underscoredVersion}/History.txt";
license = with licenses; [ boost publicDomain ];
platforms = platforms.all;
maintainers = with maintainers; [ c0bw3b ];
license = with lib.licenses; [ boost publicDomain ];
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ c0bw3b ];
};
}

1
pkgs/servers/scylladb/default.nix
View File

@ -98,5 +98,6 @@ gcc8Stdenv.mkDerivation {
platforms = lib.platforms.linux;
hydraPlatforms = []; # It's huge ATM, about 18 GB.
maintainers = [ lib.maintainers.farlion ];
broken = true;
};
}