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: 9350d9de4742
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 61574a09d60d
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 26, 2020

  1. cmake: 3.18.4 -> 3.19.0

    @r-ryantm
    r-ryantm authored and Jonathan Ringer committed Nov 26, 2020
    Copy the full SHA
    91c6eb5 View commit details

  2. aws-c-common: fix build with cmake 3.19

    Jonathan Ringer committed Nov 26, 2020

    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
    42c8929 View commit details

  3. aws-checksums: fix build with cmake 3.19

    Jonathan Ringer committed Nov 26, 2020
    Copy the full SHA
    61574a0 View commit details
11 changes: 10 additions & 1 deletion pkgs/development/libraries/aws-c-common/default.nix
View file
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";
@@ -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";

10 changes: 9 additions & 1 deletion pkgs/development/libraries/aws-checksums/default.nix
View file
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";
@@ -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; {
4 changes: 2 additions & 2 deletions pkgs/development/tools/build-managers/cmake/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = [