diff options
| author | Robert Schütz <dev@schuetz-co.de> | 2021-01-25 17:38:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-25 17:38:04 +0100 |
| commit | 67fabbc7c3371ecfa4c32d9160976a5f129b4ede (patch) | |
| tree | 8d2bac753409a0d6b2ae7e435cde81a70d043e6f /pkgs | |
| parent | 3322db8e36d0b32700737d8de7315bd9e9c2b21a (diff) | |
| parent | eefdd0983997458528f78445d04066b6d3fc147d (diff) | |
| download | nixpkgs-67fabbc7c3371ecfa4c32d9160976a5f129b4ede.tar nixpkgs-67fabbc7c3371ecfa4c32d9160976a5f129b4ede.tar.gz nixpkgs-67fabbc7c3371ecfa4c32d9160976a5f129b4ede.tar.bz2 nixpkgs-67fabbc7c3371ecfa4c32d9160976a5f129b4ede.tar.lz nixpkgs-67fabbc7c3371ecfa4c32d9160976a5f129b4ede.tar.xz nixpkgs-67fabbc7c3371ecfa4c32d9160976a5f129b4ede.tar.zst nixpkgs-67fabbc7c3371ecfa4c32d9160976a5f129b4ede.zip | |
Merge pull request #110555 from LeSuisse/cryptopp-8.4.0
cryptopp: 8.2.0 -> 8.4.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/crypto++/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/servers/scylladb/default.nix | 1 |
2 files changed, 11 insertions, 14 deletions
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 041e7d49d50..b2232907db7 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -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 ]; }; } diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix index b0793d5e42a..ecc79acfbe7 100644 --- a/pkgs/servers/scylladb/default.nix +++ b/pkgs/servers/scylladb/default.nix @@ -98,5 +98,6 @@ gcc8Stdenv.mkDerivation { platforms = lib.platforms.linux; hydraPlatforms = []; # It's huge ATM, about 18 GB. maintainers = [ lib.maintainers.farlion ]; + broken = true; }; } |