Skip to content

Commit d31633e

Browse files
nixpkgs: nixos-23.05 -> nixos-23.11 (#99)
Upgrade nixpkgs from nixos-23.05 to the just released nixos-23.11.
2 parents 065106d + 6a8282e commit d31633e

File tree

3 files changed

+34
-11
lines changed

3 files changed

+34
-11
lines changed

flake.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
description = "mkRuby to build a version of Ruby";
33

44
inputs.flake-utils.url = "github:numtide/flake-utils";
5-
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
5+
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
66
inputs.flake-compat.url = "github:edolstra/flake-compat";
77
inputs.flake-compat.flake = false;
88

ruby/overrides.nix

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{ versionComparison
22
, openssl_1_1
3+
, stdenv
34
}:
45
[
6+
# Some of the older versions do not build.
57
{
68
condition = version: with versionComparison version;
79
composeAny hasPrefix [
@@ -24,11 +26,31 @@
2426
];
2527
override = pkg: pkg.overrideAttrs (finalAttrs: previousAttrs: { meta = previousAttrs.meta // { broken = true; }; });
2628
}
29+
# Some of the older versions do not build on OSX. Mark these as broken.
30+
{
31+
condition = version: stdenv.isDarwin && (with versionComparison version;
32+
composeAny hasPrefix [
33+
"2.2.1"
34+
"2.2.2"
35+
"2.2.3"
36+
"2.2.4"
37+
"2.2.5"
38+
"2.2.6"
39+
"2.2.7"
40+
"2.2.8"
41+
"2.2.9"
42+
"2.6.7"
43+
]);
44+
override = pkg: pkg.overrideAttrs (finalAttrs: previousAttrs: { meta = previousAttrs.meta // { broken = true; }; });
45+
}
46+
# Ruby 3.1 introduced support for OpenSSL 3, everything before that uses OpenSSL 1.1.
2747
{
2848
condition = version: with versionComparison version;
2949
lessThan "3.1";
3050
override = pkg: pkg.override { openssl = openssl_1_1; };
3151
}
52+
# Ruby nowadays uses an convention for libDir = MAJOR.MINOR.0.
53+
# This wasn't the case for Ruby < 3.
3254
{
3355
condition = version: with versionComparison version;
3456
hasPrefix "2.0";
@@ -39,6 +61,7 @@
3961
hasPrefix "1.9" && greaterOrEqualTo "1.9.1";
4062
override = pkg: pkg.override { libDir = "1.9.1"; };
4163
}
64+
# yjit support was introduced in Ruby 3.2. Disable it for older versions.
4265
{
4366
condition = version: with versionComparison version;
4467
lessThan "3.2";

0 commit comments

Comments
 (0)