public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-08-25 07:37:14 +02:00
parent f4745bef6c 7f8b1dd32f
commit 8fbe3a484a
165 changed files with 4542 additions and 1573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/analysis/frama-c/default.nix
View File

@@ -9,17 +9,17 @@ in
stdenv.mkDerivation rec {
name = "frama-c-${version}";
version = "20171101";
slang = "Sulfur";
version = "20180502";
slang = "Chlorine";
src = fetchurl {
url = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz";
sha256 = "1vwjfqmm1r36gkybsy3a7m89q5zicf4rnz5vlsn9imnpjpl9gjw1";
sha256 = "1m4r8h8n1z957pylyf9b0kjblh59imnqm1bkb4s6rdwl4a1gbjgc";
};
why2 = fetchurl {
url = "http://why.lri.fr/download/why-2.39.tar.gz";
sha256 = "0nf17jl00s7q9z8gkbamnf7mglvxqrm3967c17ic4c9xz8g125a8";
url = "http://why.lri.fr/download/why-2.40.tar.gz";
sha256 = "0h1mbpxsgwvf3pbl0qbg22j6f4v1ffka24ap1ajbjk9b1yb3ali8";
};
nativeBuildInputs = [ autoconf makeWrapper ];

10
pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix
View File

@@ -2,7 +2,7 @@
buildBazelPackage rec {
name = "bazel-deps-${version}";
version = "2018-05-31";
version = "2018-08-16";
meta = with stdenv.lib; {
homepage = "https://github.com/johnynek/bazel-deps";
@@ -15,8 +15,8 @@ buildBazelPackage rec {
src = fetchFromGitHub {
owner = "johnynek";
repo = "bazel-deps";
rev = "dd7d0086d3a61c1d5c3370a0300824d0c75946e4";
sha256 = "1h9ddgk6vn0bhnnkwwz4n1iqv2rcdj521dxhdwj5wwpndbciw855";
rev = "942a0b03cbf159dd6e0f0f40787d6d8e4e832d81";
sha256 = "0ls2jvz9cxa169a8pbbykv2d4dik4ipf7dj1lkqx5g0ss7lgs6q5";
};
bazelTarget = "//src/scala/com/github/johnynek/bazel_deps:parseproject_deploy.jar";
@@ -26,7 +26,7 @@ buildBazelPackage rec {
fetchAttrs = {
preInstall = ''
# Remove all built in external workspaces, Bazel will recreate them when building
rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker,local_*,\@local_*}
rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker,embedded_jdk,\@embedded_jdk.marker,local_*,\@local_*}
# For each external workspace, remove all files that aren't referenced by Bazel
# Many of these files are non-hermetic (for example .git/refs/remotes/origin/HEAD)
files_to_delete=()
@@ -66,7 +66,7 @@ buildBazelPackage rec {
find . -type d -empty -delete
'';
sha256 = "0fh9jjwk3aq0kklhl9zyy8hj8gjm1y1fy4ygjinm0469w9jdgc3g";
sha256 = "0jkzf1hay0h8ksk9lhfvdliac6c5d7nih934i1xjbrn6zqlivy19";
};
buildAttrs = {

8
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
View File

@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
let
version = "11.1.0";
version = "11.2.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
sha256 = "0l7j69isnp6wlix3ysjxcr9dgcx5a0j9z2k0bsl714ff339js6j5";
sha256 = "1dphrws6118l0ryvgny0z5h9fsdbwckm4x21bh8hwb6bxdbqr0yn";
};
docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
sha256 = "16x9wbyd90jgyn7x45j9cyrdfz4hg8qav132schqrrdfrgjyrb4x";
sha256 = "162lzbi7z9afp470w0qkcja728jyb48s7krzinmvg45fb3fb0lfn";
};
in
buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "0b632jnqbj74nx27nlpiia6nq8668gf41lcb4s24gw9jnfmrwhym";
sha256 = "1y4fb5jbks6xab7zim10s112h11bq04hh3lddmhm4f2nyqcmlrqh";
};
patches = [ ./fix-shell-path.patch ];

4
pkgs/development/tools/flatpak-builder/default.nix
View File

@@ -36,7 +36,7 @@
}:
let
version = "0.99.3";
version = "1.0.0";
in stdenv.mkDerivation rec {
name = "flatpak-builder-${version}";
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz";
sha256 = "0sq3rcy3vwa36p6wq63wdvkk0hrs3qj1ngk26j9947nc14z39plk";
sha256 = "0ysnz0dwc8wfd31afwssg9prvaqdga7z4mybnrzy8sgm0hi5p2l5";
};
nativeBuildInputs = [

6
pkgs/development/tools/ocaml/camlp5/default.nix
View File

@@ -6,11 +6,11 @@ in
stdenv.mkDerivation {
name = "camlp5${if transitional then "_transitional" else ""}-7.05";
name = "camlp5${if transitional then "_transitional" else ""}-7.06";
src = fetchzip {
url = https://github.com/camlp5/camlp5/archive/rel705.tar.gz;
sha256 = "16igfyjl2jja4f1mibjfzk0c2jr09nxsz6lb63x1jkccmy6430q2";
url = https://github.com/camlp5/camlp5/archive/rel706.tar.gz;
sha256 = "02zg6qjkzx58zmp79364s5jyqhh56nclcz1jzhh53hk37g9f96qf";
};
buildInputs = [ ocaml ];

4
pkgs/development/tools/packer/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "packer-${version}";
version = "1.2.4";
version = "1.2.5";
goPackagePath = "github.com/hashicorp/packer";
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "hashicorp";
repo = "packer";
rev = "v${version}";
sha256 = "06prn2mq199476zlxi5hxk5yn21mqzbqk8v0fy8s6h91g8h6205n";
sha256 = "0wbf0iqfqphwy2snspf34j16ar4ghk0f1zsw8n8vj8gviiivlr7p";
};
meta = with stdenv.lib; {

94
pkgs/development/tools/qtcreator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch Normal file
View File

@@ -0,0 +1,94 @@
From c6d02dba2911d93e2379cfb5e550b93558dd51bf Mon Sep 17 00:00:00 2001
From: Greg Nietsky <gregory@distrotech.co.za>
Date: Tue, 4 Mar 2014 11:33:40 +0200
Subject: [PATCH] Fix: Allow qt-creator to build on arm aarch32 and aarch64
Botan is imported hardwired for x86 this small patch allows it
too operate on arm other platforms could be added.
Task-number: QTCREATORBUG-8107
Change-Id: Iddea28f21c9fa1afd2fdd5d16a44e6c96a516a7a
---
src/libs/3rdparty/botan/botan.cpp | 16 +++++++++++++++-
src/libs/3rdparty/botan/botan.h | 2 ++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp
index 917c385..4364a2e 100644
--- a/src/libs/3rdparty/botan/botan.cpp
+++ b/src/libs/3rdparty/botan/botan.cpp
@@ -1101,6 +1101,8 @@ class Montgomery_Exponentiator : public Modular_Exponentiator
#if (BOTAN_MP_WORD_BITS != 32)
#error The mp_x86_32 module requires that BOTAN_MP_WORD_BITS == 32
+#elif !defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
+typedef Botan::u64bit dword;
#endif
#ifdef Q_OS_UNIX
@@ -1118,6 +1120,7 @@ extern "C" {
*/
inline word word_madd2(word a, word b, word* c)
{
+#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
asm(
ASM("mull %[b]")
ASM("addl %[c],%[a]")
@@ -1127,6 +1130,11 @@ inline word word_madd2(word a, word b, word* c)
: "0"(a), "1"(b), [c]"g"(*c) : "cc");
return a;
+#else
+ dword z = (dword)a * b + *c;
+ *c = (word)(z >> BOTAN_MP_WORD_BITS);
+ return (word)z;
+#endif
}
/*
@@ -1134,6 +1142,7 @@ inline word word_madd2(word a, word b, word* c)
*/
inline word word_madd3(word a, word b, word c, word* d)
{
+#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
asm(
ASM("mull %[b]")
@@ -1147,6 +1156,11 @@ inline word word_madd3(word a, word b, word c, word* d)
: "0"(a), "1"(b), [c]"g"(c), [d]"g"(*d) : "cc");
return a;
+#else
+ dword z = (dword)a * b + c + *d;
+ *d = (word)(z >> BOTAN_MP_WORD_BITS);
+ return (word)z;
+#endif
}
}
@@ -2315,7 +2329,7 @@ namespace Botan {
extern "C" {
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
/*
* Helper Macros for x86 Assembly
*/
diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h
index 6a9cbe0..3bfdbc2 100644
--- a/src/libs/3rdparty/botan/botan.h
+++ b/src/libs/3rdparty/botan/botan.h
@@ -81,7 +81,9 @@
#endif
#define BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN
+#if !defined(__arm__) && !defined(__aarch64__)
#define BOTAN_TARGET_CPU_IS_X86_FAMILY
+#endif
#define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 1
#if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) || \
--
2.3.0

4
pkgs/development/tools/qtcreator/default.nix
View File

@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ qmake makeWrapper ];
patches = optional (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) ./0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch;
doCheck = true;
enableParallelBuilding = true;
@@ -55,6 +57,6 @@ stdenv.mkDerivation rec {
homepage = https://wiki.qt.io/Category:Tools::QtCreator;
license = "LGPL";
maintainers = [ maintainers.akaWolf ];
platforms = [ "i686-linux" "x86_64-linux" ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" ];
};
}

41
pkgs/development/tools/wabt/default.nix Normal file
View File

@@ -0,0 +1,41 @@
{ stdenv, fetchFromGitHub, cmake, python3 }:
stdenv.mkDerivation rec {
name = "wabt-${version}";
version = "1.0.5";
src = fetchFromGitHub {
owner = "WebAssembly";
repo = "wabt";
rev = version;
sha256 = "1cbak3ach7cna98j2r0v3y38c59ih2gv0p6f43qp782pyj07hzfy";
};
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DBUILD_TESTS=OFF" ];
buildInputs = [ python3 ];
meta = with stdenv.lib; {
description = "The WebAssembly Binary Toolkit";
longDescription = ''
WABT (we pronounce it "wabbit") is a suite of tools for WebAssembly,
including:
* wat2wasm: translate from WebAssembly text format to the WebAssembly
binary format
* wasm2wat: the inverse of wat2wasm, translate from the binary format
back to the text format (also known as a .wat)
* wasm-objdump: print information about a wasm binary. Similiar to
objdump.
* wasm-interp: decode and run a WebAssembly binary file using a
stack-based interpreter
* wat-desugar: parse .wat text form as supported by the spec interpreter
(s-expressions, flat syntax, or mixed) and print "canonical" flat
format
* wasm2c: convert a WebAssembly binary file to a C source and header
'';
homepage = https://github.com/WebAssembly/wabt;
license = licenses.asl20;
maintainers = with maintainers; [ ekleog ];
platforms = platforms.linux;
};
}