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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-04-03 21:54:40 +02:00
parent ac46ffbcfc 3420bd63b9
commit 92124ed660
357 changed files with 6567 additions and 4186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "janet";
version = "1.7.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = "janet-lang";
repo = pname;
rev = "v${version}";
sha256 = "1z7r4ddgwxgxy1pp36p2wchcmzjqfyki3a4kicnr23ldflqv9ycc";
sha256 = "1v2kgbx6w1ii83a1c9ridm1i52rmcjb0g1d23fhqn7hya5bwrhr6";
};
nativeBuildInputs = [ meson ninja ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Janet programming language";
homepage = https://janet-lang.org/;
homepage = "https://janet-lang.org/";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ andrewchambers ];

18
pkgs/development/interpreters/ruby/default.nix
View File

@@ -224,26 +224,26 @@ let
in {
ruby_2_5 = generic {
version = rubyVersion "2" "5" "7" "";
version = rubyVersion "2" "5" "8" "";
sha256 = {
src = "1m6nmnj9shifp8g3yh7aimac01vl035bzcc19x2spdji6ig0sb8b";
git = "0wppf82c9ccdbnvj30mppr5a3mc7sxm05diahjdw7hhk29n43knp";
src = "16md4jspjwixjlbhx3pnd5iwpca07p23ghkxkqd82sbchw3xy2vc";
git = "19gkk3q9l33cwkfsp5k8f8fipq7gkyqkqirm9farbvy425519rv2";
};
};
ruby_2_6 = generic {
version = rubyVersion "2" "6" "5" "";
version = rubyVersion "2" "6" "6" "";
sha256 = {
src = "0zgdrgylq6avbblf78kpaf0k2xnkpc3jng3wkd7x67ycdrqnp5v6";
git = "0pay6ic22ag3bnvxffhgwp7z6clkd0p93944a1l4lvc5hxc8v77j";
src = "1492x795qzgp3zhpl580kd1sdp50n5hfsmpbfhdsq2rnxwyi8jrn";
git = "1jr9v99a7awssqmw7531afbx4a8i9x5yfqyffha545g7r4s7kj50";
};
};
ruby_2_7 = generic {
version = rubyVersion "2" "7" "0" "";
version = rubyVersion "2" "7" "1" "";
sha256 = {
src = "1glc3zpnih6h8mrgfcak0aa7cgmi4zyvxfyi6y2brwg2nn9sm6cc";
git = "11iz64k95czs273mb10195d1j75mmbcgddfdx1vay5876ffw81dq";
src = "0674x98f542y02r7n2yv2qhmh97blqhi2mvh2dn5f000vlxlh66l";
git = "0qk729kr5wm67xmwpljpdprwhp5wvn5y4ikqy00p1zcgwlwdcs33";
};
};
}

14
pkgs/development/interpreters/ruby/patchsets.nix
View File

@@ -1,21 +1,19 @@
{ patchSet, useRailsExpress, ops, patchLevel, fetchpatch }:
{
"2.4.9" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
"${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
];
"2.5.7" = ops useRailsExpress [
"2.5.8" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
];
"2.6.5" = ops useRailsExpress [
"2.6.6" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch"
];
"2.7.0" = ops useRailsExpress [ # no patches yet (2019-12-25)
"2.7.1" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch"
];
}

4
pkgs/development/interpreters/ruby/rvm-patchsets.nix
View File

@@ -3,6 +3,6 @@
fetchFromGitHub {
owner = "skaes";
repo = "rvm-patchsets";
rev = "58f72dccc8bb4dc9b1035f6af903d21f2465367a";
sha256 = "00gbrhvnf05g6zmfim472ld0l1lp100dy4pi3lixm6ry9iw9m4ag";
rev = "6d8888d34a321198f7fd9253343b78c209efb046";
sha256 = "0xczl0nng1649km3bcbjn6zrr591l6m2kkwgnknh1fnwmmrdaya7";
}