Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3322db8e36d0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 67fabbc7c337
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 25, 2021

  1. scylladb: mark as broken 

    The package does not build due to changes in Boost.
    @LeSuisse
    LeSuisse committed Jan 25, 2021
    2
    Copy the full SHA
    88033a4 View commit details

  2. cryptopp: 8.2.0 -> 8.4.0 

    Fixes CVE-2019-14318.
    @LeSuisse
    LeSuisse committed Jan 25, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    eefdd09 View commit details

  3. Merge pull request #110555 from LeSuisse/cryptopp-8.4.0 

    cryptopp: 8.2.0 -> 8.4.0
    @dotlambda
    dotlambda authored Jan 25, 2021
    Copy the full SHA
    67fabbc View commit details
Showing with 11 additions and 14 deletions.
  1. +10 −14 pkgs/development/libraries/crypto++/default.nix
  2. +1 −0 pkgs/servers/scylladb/default.nix
24 changes: 10 additions & 14 deletions pkgs/development/libraries/crypto++/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions pkgs/servers/scylladb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -98,5 +98,6 @@ gcc8Stdenv.mkDerivation {
platforms = lib.platforms.linux;
hydraPlatforms = []; # It's huge ATM, about 18 GB.
maintainers = [ lib.maintainers.farlion ];
broken = true;
};
}