diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-13 00:02:14 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-13 00:02:14 +0000 |
commit | 6f7d104254289105d8edcd8ea6a590a38e7856b9 (patch) | |
tree | b756f4540d10faf9a1e39e051a074c308d69bcaf /pkgs/development/interpreters | |
parent | 295cda2612d6b8a487f8fced27e7721e64443760 (diff) | |
parent | a41ccc89664c478397ab321c240beced2aadca3e (diff) | |
download | nixlib-6f7d104254289105d8edcd8ea6a590a38e7856b9.tar nixlib-6f7d104254289105d8edcd8ea6a590a38e7856b9.tar.gz nixlib-6f7d104254289105d8edcd8ea6a590a38e7856b9.tar.bz2 nixlib-6f7d104254289105d8edcd8ea6a590a38e7856b9.tar.lz nixlib-6f7d104254289105d8edcd8ea6a590a38e7856b9.tar.xz nixlib-6f7d104254289105d8edcd8ea6a590a38e7856b9.tar.zst nixlib-6f7d104254289105d8edcd8ea6a590a38e7856b9.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/interpreters/ruby/patchsets.nix | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/spidermonkey/91.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index c676a7b05e55..ea31f354d0d7 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -268,10 +268,10 @@ in { }; ruby_3_1 = generic { - version = rubyVersion "3" "1" "0" ""; + version = rubyVersion "3" "1" "1" ""; sha256 = { - src = "sha256-UKBQTG7ctNYc5rjP292qlXBxlfqw7Ne16SZUsqlBKFQ="; - git = "sha256-TcsoWY+zVZeue1/ypV1L0WERp1UVK35WtVtYPYiJh4c="; + src = "sha256-/m5Hgt6XRDl43bqLpL440iKqJNw+PwKmqOdwHA7rYZ0="; + git = "sha256-76t/tGyK5nz7nvcRdHJTjjckU+Kv+/kbTMiNWJ93jU8="; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 2e51670a9f81..b76dc1a23b16 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -10,6 +10,6 @@ "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch" "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch" ]; - "3.1.0" = ops useRailsExpress [ # no patches yet (2021-12-25) + "3.1.1" = ops useRailsExpress [ # no patches yet (2021-12-25) ]; } diff --git a/pkgs/development/interpreters/spidermonkey/91.nix b/pkgs/development/interpreters/spidermonkey/91.nix index 6be61a1210b6..811a0247a57d 100644 --- a/pkgs/development/interpreters/spidermonkey/91.nix +++ b/pkgs/development/interpreters/spidermonkey/91.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "spidermonkey"; - version = "91.6.0"; + version = "91.7.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha512 = "3dd1929f93cdd087a93fc3597f32d9005c986b59832954e01a8c2472b179c92ad611eaa73d3fc000a08b838a0b70da73ff5ba82d6009160655ba6894cf04520e"; + sha512 = "925811989d8a91d826ba356bd46ac54be8153288ec0319c28d2bfbe89191e62e107691159dd7ca247253e2a4952eb59a5b9613e3feea3f5351238d4822e26301"; }; outputs = [ "out" "dev" ]; |