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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2020-08-04 21:38:08 +02:00
parent ccedb29f4b 8bbc202208
commit 01c2ba8575
249 changed files with 8187 additions and 5893 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/gambit/unstable.nix
+4 -4
View File
@@ -1,13 +1,13 @@
{ callPackage, fetchFromGitHub, gambit-support }:
callPackage ./build.nix {
version = "unstable-2020-05-15";
git-version = "4.9.3-1109-g3c4d40de";
version = "unstable-2020-07-29";
git-version = "4.9.3-1232-gbba388b8";
src = fetchFromGitHub {
owner = "feeley";
repo = "gambit";
rev = "3c4d40de908ae03ca0e3d854edc2234ef401b36c";
sha256 = "1c9a6rys2kiiqb79gvw29nv3dwwk6hmi1q4jk1whcx7mds7q5dvr";
rev = "bba388b80ca62a77883a8936d64b03316808696a";
sha256 = "0iqlp1mvxz8g32kqrqm0phnnp1i5c4jrapqh2wqwa8fh1vgnizg1";
};
gambit-params = gambit-support.unstable-params;
}
pkgs/development/compilers/gerbil/gerbil-crypto.nix
+27
View File
@@ -0,0 +1,27 @@
{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }:
gerbil-support.gerbilPackage {
pname = "gerbil-crypto";
version = "unstable-2020-08-01";
git-version = "0.0-6-ga228862";
gerbil-package = "clan/crypto";
gerbil = gerbil-unstable;
gerbilInputs = [gerbil-support.gerbilPackages-unstable.gerbil-utils];
buildInputs = [pkgs.secp256k1 pkgs.pkg-config];
gambit-params = gambit-support.unstable-params;
version-path = "version";
softwareName = "Gerbil-crypto";
src = fetchFromGitHub {
owner = "fare";
repo = "gerbil-crypto";
rev = "a22886260849ec92c3a34bfeedc1574e41e49e33";
sha256 = "0qbanw2vnw2ymmr4pr1jap29cyc3icbhyq0apibpfnj2znns7w47";
};
meta = {
description = "Gerbil Crypto: Extra Cryptographic Primitives for Gerbil";
homepage = "https://github.com/fare/gerbil-crypto";
license = lib.licenses.asl20;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ fare ];
};
}
pkgs/development/compilers/gerbil/gerbil-ethereum.nix
+28
View File
@@ -0,0 +1,28 @@
{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }:
gerbil-support.gerbilPackage {
pname = "gerbil-ethereum";
version = "unstable-2020-08-02";
git-version = "0.0-15-g7cd2dd7";
gerbil-package = "mukn/ethereum";
gerbil = gerbil-unstable;
gerbilInputs = with gerbil-support.gerbilPackages-unstable;
[gerbil-utils gerbil-crypto gerbil-poo gerbil-persist];
buildInputs = [];
gambit-params = gambit-support.unstable-params;
version-path = "version";
softwareName = "Gerbil-ethereum";
src = fetchFromGitHub {
owner = "fare";
repo = "gerbil-ethereum";
rev = "7cd2dd7436b11917d0729dbafe087cfa8ec38f86";
sha256 = "0qq3ch2dg735yrj3l2c9pb9qlvz98x3vjfi2xyr4fwr78smpqgb5";
};
meta = {
description = "Gerbil Ethereum: a Scheme alternative to web3.js";
homepage = "https://github.com/fare/gerbil-ethereum";
license = lib.licenses.asl20;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ fare ];
};
}
pkgs/development/compilers/gerbil/gerbil-persist.nix
+27
View File
@@ -0,0 +1,27 @@
{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }:
gerbil-support.gerbilPackage {
pname = "gerbil-persist";
version = "unstable-2020-08-02";
git-version = "0.0-4-ga3b2bd1";
gerbil-package = "clan/persist";
gerbil = gerbil-unstable;
gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto gerbil-poo];
buildInputs = [];
gambit-params = gambit-support.unstable-params;
version-path = "version";
softwareName = "Gerbil-persist";
src = fetchFromGitHub {
owner = "fare";
repo = "gerbil-persist";
rev = "a3b2bd104612db0e4492737f09f72adea6684483";
sha256 = "0mc01wva26ww1i7n8naa95mfw7i6lj8qg0bwsik7gb3dsj2acjvh";
};
meta = {
description = "Gerbil Persist: Persistent data and activities";
homepage = "https://github.com/fare/gerbil-persist";
license = lib.licenses.asl20;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ fare ];
};
}
pkgs/development/compilers/gerbil/gerbil-poo.nix
+27
View File
@@ -0,0 +1,27 @@
{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }:
gerbil-support.gerbilPackage {
pname = "gerbil-ethereum";
version = "unstable-2020-08-02";
git-version = "0.0-13-g1014154";
gerbil-package = "clan/poo";
gerbil = gerbil-unstable;
gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto];
buildInputs = [];
gambit-params = gambit-support.unstable-params;
version-path = "version";
softwareName = "Gerbil-POO";
src = fetchFromGitHub {
owner = "fare";
repo = "gerbil-poo";
rev = "1014154fe4943dfbec7524666c831b601ba88559";
sha256 = "0g8l5mi007n07qs79m9h3h3am1p7h0kzq7yb49h562b8frh5gp97";
};
meta = {
description = "Gerbil POO: Prototype Object Orientation for Gerbil Scheme";
homepage = "https://github.com/fare/gerbil-poo";
license = lib.licenses.asl20;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ fare ];
};
}
pkgs/development/compilers/gerbil/gerbil-support.nix
+14 -5
View File
@@ -5,6 +5,10 @@ rec {
# Gerbil libraries
gerbilPackages-unstable = {
gerbil-utils = callPackage ./gerbil-utils.nix { };
gerbil-crypto = callPackage ./gerbil-crypto.nix { };
gerbil-poo = callPackage ./gerbil-poo.nix { };
gerbil-persist = callPackage ./gerbil-persist.nix { };
gerbil-ethereum = callPackage ./gerbil-ethereum.nix { };
};
# Use this function in any package that uses Gerbil libraries, to define the GERBIL_LOADPATH.
@@ -13,21 +17,26 @@ rec {
# Use this function to create a Gerbil library. See gerbil-utils as an example.
gerbilPackage = {
pname, version, src, meta, package,
git-version ? "", version-path ? "config/version.ss",
pname, version, src, meta, gerbil-package,
git-version ? "", version-path ? "",
gerbil ? pkgs.gerbil-unstable,
gambit-params ? pkgs.gambit-support.stable-params,
gerbilInputs ? [],
buildInputs ? [],
softwareName ? "" } :
softwareName ? ""} :
let buildInputs_ = buildInputs; in
gccStdenv.mkDerivation rec {
inherit src meta pname version;
passthru = { inherit gerbil-package version-path ;};
buildInputs = [ gerbil ] ++ gerbilInputs ++ buildInputs_;
postPatch = ''
set -e ;
if [ -n "${version-path}" ] ; then
echo '(import :clan/utils/version)\n(register-software "${softwareName}" "${git-version}")\n' > "${version-path}"
if [ -n "${version-path}.ss" ] ; then
echo -e '(import :clan/versioning${builtins.concatStringsSep ""
(map (x : if x.passthru.version-path != ""
then " :${x.passthru.gerbil-package}/${x.passthru.version-path}" else "")
gerbilInputs)
})\n(register-software "${softwareName}" "v${git-version}")\n' > "${passthru.version-path}.ss"
fi
patchShebangs . ;
'';
pkgs/development/compilers/gerbil/gerbil-utils.nix
+7 -6
View File
@@ -2,17 +2,18 @@
gerbil-support.gerbilPackage {
pname = "gerbil-utils";
version = "unstable-2020-05-17";
git-version = "33ef720";
package = "clan";
version = "unstable-2020-08-02";
git-version = "0.2-21-g7e7d053";
gerbil-package = "clan";
gerbil = gerbil-unstable;
gambit-params = gambit-support.unstable-params;
version-path = "";
version-path = "version";
softwareName = "Gerbil-utils";
src = fetchFromGitHub {
owner = "fare";
repo = "gerbil-utils";
rev = "33ef720799ba98dc9eec773c662f070af4bac016";
sha256 = "0dsb97magbxzjqqfzwq4qwf7i80llv0s1dsy9nkzkvkq8drxlmqf";
rev = "7e7d053ec5e78cc58d38cb03baf554d83b31b0c6";
sha256 = "078vqdcddfavqq0d9pw430iz1562cgx1ck3fw6dpwxjkyc6m4bms";
};
meta = {
description = "Gerbil Clan: Community curated Collection of Common Utilities";
pkgs/development/compilers/gerbil/unstable.nix
+4 -4
View File
@@ -1,13 +1,13 @@
{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support }:
callPackage ./build.nix rec {
version = "unstable-2020-05-17";
git-version = "0.16-1-g36a31050";
version = "unstable-2020-08-02";
git-version = "0.16-120-g3f248e13";
src = fetchFromGitHub {
owner = "vyzo";
repo = "gerbil";
rev = "36a31050f6c80e7e1a49dfae96a57b2ad0260698";
sha256 = "0k3fypam9qx110sjxgzxa1mdf5b631w16s9p5v37cb8ll26vqfiv";
rev = "3f248e139dfa11be74284fc812253fbecafbaf31";
sha256 = "18v192cypj0nbmfcyflm8qnwp27qwy65m0a19ggs47wwbzhgvgqh";
};
inherit gambit-support;
gambit = gambit-unstable;
pkgs/development/compilers/ocaml/4.11.nix
+2 -2
View File
@@ -1,6 +1,6 @@
import ./generic.nix {
major_version = "4";
minor_version = "11";
patch_version = "0+beta2";
sha256 = "1n39qfwvpwlhp9m73zi9hrk9ny9g6spy9apc36n2ydpf5dn7pg75";
patch_version = "0+beta3";
sha256 = "18lpgirxil00pgy805cyi97v6ycmg93sdvbkc60i35ili030v1f7";
}
pkgs/development/compilers/openjdk/11.nix
+5 -4
View File
@@ -10,16 +10,17 @@
let
major = "11";
update = ".0.7";
build = "ga";
minor = "0";
update = "8";
build = "10";
openjdk = stdenv.mkDerivation rec {
pname = "openjdk" + lib.optionalString headless "-headless";
version = "${major}${update}-${build}";
version = "${major}.${minor}.${update}+${build}";
src = fetchurl {
url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
sha256 = "14daacng9ndxf4kmvsn7nracwfiwwmw5rha8rkk3723pfk9g8q7p";
sha256 = "1sdncn1bk4h8xxfnmrl1125maqy6mc0v0y1dyifwsa04wasj9hbz";
};
nativeBuildInputs = [ pkgconfig autoconf ];
pkgs/development/compilers/openjdk/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
let
major = "14";
update = ".0.1";
update = ".0.2";
build = "-ga";
openjdk = stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ let
src = fetchurl {
url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
sha256 = "0ic7dcrzk62jc65yrshs6xlclmsha7z52bia5s2bkllw1zpmdmip";
sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3";
};
nativeBuildInputs = [ pkgconfig autoconf ];
pkgs/development/compilers/oraclejdk/jdk8-linux.nix
+1 -1
View File
@@ -6,5 +6,5 @@ import ./jdk-linux-base.nix {
sha256.armv7l-linux = "13dih7zyfgj90bkhnfxhpm88d9kqqrj6w5rzpidmxrjwrsnlndp9";
sha256.aarch64-linux = "0zzhs4pcnjss2561b8zrrnacpkb8p49ca0lpdw7hzgsjjj1y146n";
jceName = "jce_policy-8.zip";
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
sha256JCE = "19n5wadargg3v8x76r7ayag6p2xz1bwhrgdzjs9f4i6fvxz9jr4w";
}
pkgs/development/compilers/swift/default.nix
+2 -2
View File
@@ -261,8 +261,8 @@ stdenv.mkDerivation {
'';
buildPhase = ''
# gcc-6.4.0/include/c++/6.4.0/cstdlib:75:15: fatal error: 'stdlib.h' file not found
export NIX_CFLAGS_COMPILE="$(< $NIX_CC/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE"
# explicitly include C++ headers to prevent errors where stdlib.h is not found from cstdlib
export NIX_CFLAGS_COMPILE="$(< ${clang}/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE"
# During the Swift build, a full local LLVM build is performed and the resulting clang is invoked.
# This compiler is not using the Nix wrappers, so it needs some help to find things.
export NIX_LDFLAGS_BEFORE="-rpath ${gccForLibs.lib}/lib -L${gccForLibs.lib}/lib $NIX_LDFLAGS_BEFORE"
pkgs/development/compilers/zig/default.nix
-7
View File
@@ -20,13 +20,6 @@ llvmPackages.stdenv.mkDerivation rec {
zlib
];
patches = [
(substituteAll {
src = ./llvm10_polly.patch;
llvm_extras = "-Wl,${llvmPackages.llvm}/lib/LLVMPolly.so";
})
];
preBuild = ''
export HOME=$TMPDIR;
'';
pkgs/development/compilers/zig/llvm10_polly.patch
-10
View File
@@ -1,10 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97608cddf..e451c0711 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -369,4 +369,5 @@ target_link_libraries(zig_cpp LINK_PUBLIC
${CLANG_LIBRARIES}
${LLD_LIBRARIES}
${LLVM_LIBRARIES}
+ @llvm_extras@
)