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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-07-09 15:44:08 +02:00
parent 46d91410af 5c8472a2a1
commit 7cf5909fad
339 changed files with 11134 additions and 8903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/interpreters/elixir/1.4.nix
View File

@@ -1,7 +0,0 @@
{ mkDerivation }:
mkDerivation rec {
version = "1.4.5";
sha256 = "18ivcxmh5bak13k3rjy7jjzin57rgb2nffhwnqb2wl7bpi8mrarw";
minimumOTPVersion = "18";
}

7
pkgs/development/interpreters/elixir/1.9.nix Normal file
View File

@@ -0,0 +1,7 @@
{ mkDerivation }:
mkDerivation rec {
version = "1.9.0";
sha256 = "0yfqh07wjgm10v6acn5pw8l8jndjly5kpzgw4harlj81wcaymlsw";
minimumOTPVersion = "20";
}

6
pkgs/development/interpreters/elixir/generic-builder.nix
View File

@@ -22,10 +22,8 @@ in
buildInputs = [ erlang rebar makeWrapper ];
LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux
"${pkgs.glibcLocales}/lib/locale/locale-archive";
LANG = "en_US.UTF-8";
LC_TYPE = "en_US.UTF-8";
LANG = "C.UTF-8";
LC_TYPE = "C.UTF-8";
setupHook = ./setup-hook.sh;

31
pkgs/development/interpreters/hy/default.nix
View File

@@ -1,23 +1,14 @@
{ stdenv, fetchurl, fetchpatch, pythonPackages }:
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec {
name = "hy-${version}";
version = "0.16.0";
pname = "hy";
version = "0.17.0";
src = fetchurl {
url = "mirror://pypi/h/hy/${name}.tar.gz";
sha256 = "00lq38ppikrpyw38fn5iy9iwrsamsv22507cp146dsjbzkwjpzrd";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1gdbqsirsdxj320wnp7my5awzs1kfs6m4fqmkzbd1zd47qzj0zfi";
};
patches = [
(fetchpatch {
name = "bytecode-error-handling.patch";
url = "https://github.com/hylang/hy/commit/57326785b97b7b0a89f6258fe3d04dccdc06cfc0.patch";
sha256 = "1lxxs7mxbh0kaaa25b1pbqs9d8asyjnlf2n86qg8hzsv32jfcq92";
excludes = [ "AUTHORS" "NEWS.rst" ];
})
];
propagatedBuildInputs = with pythonPackages; [
appdirs
astor
@@ -27,11 +18,11 @@ pythonPackages.buildPythonApplication rec {
rply
];
meta = {
meta = with stdenv.lib; {
description = "A LISP dialect embedded in Python";
homepage = http://hylang.org/;
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.nixy ];
platforms = stdenv.lib.platforms.all;
homepage = "http://hylang.org/";
license = licenses.mit;
maintainers = with maintainers; [ nixy ];
platforms = platforms.all;
};
}

16
pkgs/development/interpreters/janet/default.nix
View File

@@ -1,26 +1,26 @@
{ stdenv, fetchFromGitHub }:
{ stdenv, fetchFromGitHub, meson, ninja }:
stdenv.mkDerivation rec {
pname = "janet";
version = "0.6.0";
version = "1.0.0";
src = fetchFromGitHub {
owner = "janet-lang";
repo = "janet";
repo = pname;
rev = "v${version}";
sha256 = "1w6d5a4akd868x89bgyvw3cnadfva7gnyvhmxx5ixxd580n5ba6v";
sha256 = "1n91xsq9c3x99pb3a964873kksavs223hhy62l8yiylbl81b8vix";
};
JANET_BUILD=''\"release\"'';
PREFIX = placeholder "out";
nativeBuildInputs = [ meson ninja ];
mesonFlags = ["-Dgit_hash=release"];
doCheck = true;
meta = with stdenv.lib; {
description = "Janet programming language";
homepage = https://janet-lang.org/;
license = stdenv.lib.licenses.mit;
license = licenses.mit;
platforms = platforms.all;
maintainers = with stdenv.lib.maintainers; [ andrewchambers ];
maintainers = with maintainers; [ andrewchambers ];
};
}

16
pkgs/development/interpreters/php/default.nix
View File

@@ -253,25 +253,17 @@ let
};
in {
php71 = generic {
version = "7.1.30";
sha256 = "1czcf5qwk727sdzx5n4wvsxvl50jx6d5x8ws1dqx46fa9xvm0j36";
# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php71-darwin-isfinite.patch;
};
php72 = generic {
version = "7.2.19";
sha256 = "16d0j0d4563bcrxlw5yysldscxpgyp917hmc4m4ys1zyfprv3l7b";
version = "7.2.20";
sha256 = "116a1m0xjn2yi8d5kwzjk335q4brgl7xplcji2p87i2l9vjjkf4z";
# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
};
php73 = generic {
version = "7.3.6";
sha256 = "0xvgdxmhk0hsx8gh3ircm2s7pf59gm8i9a73204mr0sl05qchnhy";
version = "7.3.7";
sha256 = "065z2q6imjxlbh6w1r7565ygqhigfbzcz70iaic74hj626kqyq63";
# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;

60
pkgs/development/interpreters/php/php71-darwin-isfinite.patch
View File

@@ -1,60 +0,0 @@
diff -ru a/Zend/configure.in b/Zend/configure.in
--- a/Zend/configure.in 2018-11-07 15:35:26.000000000 +0000
+++ b/Zend/configure.in 2018-11-27 00:28:48.000000000 +0000
@@ -70,7 +70,7 @@
#endif
#ifndef zend_isnan
-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
+#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
#define zend_isnan(a) isnan(a)
#elif defined(HAVE_FPCLASS)
#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
@@ -79,7 +79,7 @@
#endif
#endif
-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
+#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
#define zend_isinf(a) isinf(a)
#elif defined(INFINITY)
/* Might not work, but is required by ISO C99 */
@@ -90,7 +90,7 @@
#define zend_isinf(a) 0
#endif
-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
+#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
#define zend_finite(a) isfinite(a)
#elif defined(HAVE_FINITE)
#define zend_finite(a) finite(a)
diff -ru a/configure.in b/configure.in
--- a/configure.in 2018-11-07 15:35:26.000000000 +0000
+++ b/configure.in 2018-11-27 00:28:48.000000000 +0000
@@ -75,7 +75,7 @@
#endif
#ifndef zend_isnan
-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
+#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
#define zend_isnan(a) isnan(a)
#elif defined(HAVE_FPCLASS)
#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
@@ -84,7 +84,7 @@
#endif
#endif
-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
+#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
#define zend_isinf(a) isinf(a)
#elif defined(INFINITY)
/* Might not work, but is required by ISO C99 */
@@ -95,7 +95,7 @@
#define zend_isinf(a) 0
#endif
-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
+#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
#define zend_finite(a) isfinite(a)
#elif defined(HAVE_FINITE)
#define zend_finite(a) finite(a)

4
pkgs/development/interpreters/renpy/default.nix
View File

@@ -7,7 +7,7 @@ with pythonPackages;
stdenv.mkDerivation rec {
name = "renpy-${version}";
version = "7.2.2";
version = "7.3.0";
meta = with stdenv.lib; {
description = "Ren'Py Visual Novel Engine";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2";
sha256 = "0b8pky0npi4gw59cnjicyrc9q1x2zsxa7x68y74dbgjg9r0dgkd7";
sha256 = "18617fgnwnm6kh191h7sqm7nfvrck20llqv2a0dw9am5f08wfvbq";
};
patches = [