pyrox.dev
capnproto: 0.5.3 -> 0.6.0
-22
pkgs/development/libraries/capnproto/clang4.patch
-22
pkgs/development/libraries/capnproto/clang4.patch
···
1
-
From 0f1fd1938b19dccdb5dbfe9cb5177c4342a2a5b5 Mon Sep 17 00:00:00 2001
2
-
From: Eric Fiselier <eric@efcs.ca>
3
-
Date: Thu, 29 Dec 2016 14:23:40 -0700
4
-
Subject: [PATCH] Fix conversion build error when building with Clang 4.0
5
-
6
-
---
7
-
c++/src/capnp/layout.h | 2 +-
8
-
1 file changed, 1 insertion(+), 1 deletion(-)
9
-
10
-
diff --git a/c++/src/capnp/layout.h b/c++/src/capnp/layout.h
11
-
index 850925a..b955f08 100644
12
-
--- a/src/capnp/layout.h
13
-
+++ b/src/capnp/layout.h
14
-
@@ -126,7 +126,7 @@template <> struct ElementSizeForType<Void> { static constexpr ElementSize value
15
-
template <> struct ElementSizeForType<bool> { static constexpr ElementSize value = ElementSize::BIT; };
16
-
17
-
// Lists and blobs are pointers, not structs.
18
-
-template <typename T, bool b> struct ElementSizeForType<List<T, b>> {
19
-
+template <typename T, Kind K> struct ElementSizeForType<List<T, K>> {
20
-
static constexpr ElementSize value = ElementSize::POINTER;
21
-
};
22
-
template <> struct ElementSizeForType<Text> {
···
+2
-7
pkgs/development/libraries/capnproto/default.nix
+2
-7
pkgs/development/libraries/capnproto/default.nix
···
2
3
stdenv.mkDerivation rec {
4
name = "capnproto-${version}";
5
-
version = "0.5.3";
6
7
src = fetchurl {
8
url = "https://capnproto.org/capnproto-c++-${version}.tar.gz";
9
-
sha256 = "1yvaadhgakskqq5wpv53hd6fc3pp17mrdldw4i5cvgck4iwprcfd";
10
};
11
-
12
-
patches = [
13
-
# Remove once they release a version above 0.5.3. See https://github.com/sandstorm-io/capnproto/issues/433
14
-
./clang4.patch
15
-
];
16
17
meta = with stdenv.lib; {
18
homepage = "http://kentonv.github.io/capnproto";
···
2
3
stdenv.mkDerivation rec {
4
name = "capnproto-${version}";
5
+
version = "0.6.0";
6
7
src = fetchurl {
8
url = "https://capnproto.org/capnproto-c++-${version}.tar.gz";
9
+
sha256 = "0gpp1cxsb9nfd7qkjjykzknx03y0z0n4bq5q0fmxci7w38ci22g5";
10
};
11
12
meta = with stdenv.lib; {
13
homepage = "http://kentonv.github.io/capnproto";