Merge pull request #110555 from LeSuisse/cryptopp-8.4.0

cryptopp: 8.2.0 -> 8.4.0

authored by Robert Schütz and committed by GitHub 67fabbc7 3322db8e

+11 -14
+10 -14
pkgs/development/libraries/crypto++/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, nasm, which }: 1 + { lib, stdenv, fetchFromGitHub, }: 2 2 3 - with lib; 4 3 stdenv.mkDerivation rec { 5 4 pname = "crypto++"; 6 - version = "8.2.0"; 7 - underscoredVersion = strings.replaceStrings ["."] ["_"] version; 5 + version = "8.4.0"; 6 + underscoredVersion = lib.strings.replaceStrings ["."] ["_"] version; 8 7 9 8 src = fetchFromGitHub { 10 9 owner = "weidai11"; 11 10 repo = "cryptopp"; 12 11 rev = "CRYPTOPP_${underscoredVersion}"; 13 - sha256 = "01zrrzjn14yhkb9fzzl57vmh7ig9a6n6fka45f8za0gf7jpcq3mj"; 12 + sha256 = "1gwn8yh1mh41hkh6sgnhb9c3ygrdazd7645msl20i0zdvcp7f5w3"; 14 13 }; 15 14 16 15 postPatch = '' ··· 19 18 --replace "ARFLAGS = -static -o" "ARFLAGS = -cru" 20 19 ''; 21 20 22 - nativeBuildInputs = optionals stdenv.hostPlatform.isx86 [ nasm which ]; 23 - 24 - preBuild = optionalString stdenv.hostPlatform.isx86 "${stdenv.shell} rdrand-nasm.sh"; 25 21 makeFlags = [ "PREFIX=${placeholder "out"}" ]; 26 22 buildFlags = [ "shared" "libcryptopp.pc" ]; 27 23 enableParallelBuilding = true; ··· 31 27 preInstall = "rm libcryptopp.a"; # built for checks but we don't install static lib into the nix store 32 28 installTargets = [ "install-lib" ]; 33 29 installFlags = [ "LDCONF=true" ]; 34 - postInstall = optionalString (!stdenv.hostPlatform.isDarwin) '' 35 - ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${versions.majorMinor version} 36 - ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${versions.major version} 30 + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' 31 + ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${lib.versions.majorMinor version} 32 + ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${lib.versions.major version} 37 33 ''; 38 34 39 35 meta = { 40 36 description = "Crypto++, a free C++ class library of cryptographic schemes"; 41 37 homepage = "https://cryptopp.com/"; 42 38 changelog = "https://raw.githubusercontent.com/weidai11/cryptopp/CRYPTOPP_${underscoredVersion}/History.txt"; 43 - license = with licenses; [ boost publicDomain ]; 44 - platforms = platforms.all; 45 - maintainers = with maintainers; [ c0bw3b ]; 39 + license = with lib.licenses; [ boost publicDomain ]; 40 + platforms = lib.platforms.all; 41 + maintainers = with lib.maintainers; [ c0bw3b ]; 46 42 }; 47 43 }
+1
pkgs/servers/scylladb/default.nix
··· 98 98 platforms = lib.platforms.linux; 99 99 hydraPlatforms = []; # It's huge ATM, about 18 GB. 100 100 maintainers = [ lib.maintainers.farlion ]; 101 + broken = true; 101 102 }; 102 103 }