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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2019-12-25 05:15:06 +01:00
parent d244b77850 760be1f4b2
commit ca39dd3a8a
492 changed files with 22222 additions and 7240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/interpreters/erlang/generic-builder.nix
View File

@@ -121,8 +121,7 @@ in stdenv.mkDerivation ({
tolerance.
'';
# aarch64 is supposed to work but started failing in https://hydra.nixos.org/build/83735973
platforms = subtractLists [ "aarch64-linux" ] platforms.unix;
platforms = platforms.unix;
maintainers = with maintainers; [ the-kenny sjmackenzie couchemar gleber ];
license = licenses.asl20;
} // meta);

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

@@ -263,23 +263,23 @@ let
in {
php72 = generic {
version = "7.2.25";
sha256 = "17kb7b3wpdmdhnlv23qc0vax0lp2gr1v7dxwdgs8g78gxnqkdcvw";
version = "7.2.26";
sha256 = "0yw49v3rk3cd0fb4gsli74pgd4qrykhn9c37dyfr3zsprzp8cvgk";
# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
};
php73 = generic {
version = "7.3.12";
sha256 = "0fccmnrwwyy5zvhj8wbyqqlyqr7pr5v4pfiqriw0ahciz4lv05yk";
version = "7.3.13";
sha256 = "1g376b9caw21mw8738z354llbzb3shzgc60m7naw7wql5038jysw";
# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
};
php74 = generic {
version = "7.4.0";
sha256 = "1h01bahvcm9kgm5jqhm2j9k9d4q4rpfkkpqk00c47rirdblnn85z";
version = "7.4.1";
sha256 = "0klfwhm2935ariwzqdri1fwh4a0vbrk3jis53qzi18isp3qa073b";
};
}

12
pkgs/development/interpreters/python/default.nix
View File

@@ -79,10 +79,10 @@ in {
sourceVersion = {
major = "3";
minor = "6";
patch = "9";
patch = "10";
suffix = "";
};
sha256 = "1nkh70azbv866aw5a9bbxsxarsf40233vrzpjq17z3rz9ramybsy";
sha256 = "1pj0mz1xl27khi250p29c0y99vxg662js8zp71aprkf8i8wkr0qa";
inherit (darwin) CF configd;
inherit passthruFun;
};
@@ -105,10 +105,10 @@ in {
sourceVersion = {
major = "3";
minor = "8";
patch = "0";
patch = "1";
suffix = "";
};
sha256 = "110d0did9rxn7rg85kf2fwli5hqq44xv2d8bi7d92m7v2d728mmk";
sha256 = "1s4lwn5vzsajlc88m6hkghsvnjw4d00l2dsgng0m2w6vyqbl32bm";
inherit (darwin) CF configd;
inherit passthruFun;
};
@@ -119,9 +119,9 @@ in {
major = "3";
minor = "9";
patch = "0";
suffix = "a1";
suffix = "a2";
};
sha256 = "02b337kvzb6ncqab21xnayh562zpz6bqzjmh35iy9l48zgpkvf1n";
sha256 = "02a301bdcldin05ksdg8xw8xr6gdkpf73p0cabvn9rdl6yhkr3q8";
inherit (darwin) CF configd;
inherit passthruFun;
};