Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake: 3.18.4 -> 3.19.0 #104637

Merged
merged 3 commits into from
Nov 26, 2020
Merged

cmake: 3.18.4 -> 3.19.0 #104637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3444e2e
cmake: 3.18.4 -> 3.19.0
r-ryantm Nov 22, 2020
ddae600
aws-c-common: fix build with cmake 3.19
jonringer Nov 26, 2020
305a9b4
aws-checksums: fix build with cmake 3.19
jonringer Nov 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion pkgs/development/libraries/aws-c-common/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }:

stdenv.mkDerivation rec {
pname = "aws-c-common";
Expand All @@ -13,6 +13,15 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ cmake ];

# can be removed once https://github.com/awslabs/aws-c-common/pull/735 gets merged, and version bumped
patches = [
(fetchpatch {
name = "fix-re-export-of-target.patch";
url = "https://github.com/awslabs/aws-c-common/pull/735/commits/3fca5c629ce0c4d66f50f7152685f3fe73941cb4.patch";
sha256 = "056f9kyg1c4lwjq8n0r28w1n3zbwrwpi1wbqabk99gaayg46x35a";
})
];

NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
"-Wno-nullability-extension -Wno-typedef-redefinition";

Expand Down
10 changes: 9 additions & 1 deletion pkgs/development/libraries/aws-checksums/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }:

stdenv.mkDerivation rec {
pname = "aws-checksums";
Expand All @@ -13,6 +13,14 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ cmake ];

# can be removed once https://github.com/awslabs/aws-checksums/pull/40 gets merged, and version bumped
patches = [
(fetchpatch {
url = "https://github.com/awslabs/aws-checksums/pull/40/commits/fb5a57b3c072bd88e45de76fbb76bdc89c67b193.patch";
sha256 = "056f9kyg1c4lwjq8n0r28w1n3zbwrwpi1wbqabk99gaayg46x35a";
})
];

cmakeFlags = [ "-DBUILD_SHARED_LIBS:BOOL=ON" ];

meta = with lib; {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/tools/build-managers/cmake/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
+ lib.optionalString useNcurses "-cursesUI"
+ lib.optionalString withQt5 "-qt5UI"
+ lib.optionalString useQt4 "-qt4UI";
version = "3.18.4";
version = "3.19.0";

src = fetchurl {
url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
# compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
sha256 = "0xsg5lw3i4bw610q987cwz3iz06x3lrbbaa2mnzyr4kaiqsn2z2r";
sha256 = "14zlrb7awiazxc5wlvgah9rw1dm4ziczbxiyqsvp4zmaan0ninpx";
};

patches = [
Expand Down