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: a5b611defc3c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 958d6038e32d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 15, 2017

  1. cmocka: 1.0.1 -> 1.1.1

    @stephengroat
    stephengroat committed Nov 15, 2017
    Copy the full SHA
    bec7c22 View commit details

  2. Merge pull request #31712 from stephengroat/patch-1 

    cmocka: 1.0.1 -> 1.1.1
    @c0bw3b
    c0bw3b authored Nov 15, 2017
    Copy the full SHA
    958d603 View commit details
Showing with 5 additions and 16 deletions.
  1. +5 −16 pkgs/development/libraries/cmocka/default.nix
21 changes: 5 additions & 16 deletions pkgs/development/libraries/cmocka/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,15 @@
{ fetchurl, stdenv, cmake, fetchpatch }:
{ fetchurl, stdenv, cmake }:

stdenv.mkDerivation rec {
name = "cmocka-${version}";
version = "1.0.1";
majorVersion = "1.1";
version = "${majorVersion}.1";

src = fetchurl {
url = "https://cmocka.org/files/1.0/cmocka-${version}.tar.xz";
sha256 = "0fvm6rdalqcxckbddch8ycdw6n2ckldblv117n09chi2l7bm0q5k";
url = "https://cmocka.org/files/${majorVersion}/cmocka-${version}.tar.xz";
sha256 = "f02ef48a7039aa77191d525c5b1aee3f13286b77a13615d11bc1148753fc0389";
};

patches = [
# This fixes the build for clang-3.7.0 and thus Darwin.
# See https://open.cryptomilk.org/issues/43 for more info.
#
# The patch is already merged to upstream, so it should be removed
# here on next release.
(fetchpatch {
url = "https://git.cryptomilk.org/projects/cmocka.git/patch/?id=1b595a80934fa95234fb290913cfe533f740d965";
sha256 = "1fg8xwb1mrrmw4dqa65ghnvgfdkpi0lv4j2gq0lm9ayvsi3v00vp";
})
];

nativeBuildInputs = [ cmake ];

meta = with stdenv.lib; {