From 2b930f585171d33ac3b65b06c15cf07280ca562c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 17 Nov 2024 18:03:32 +0000 Subject: [PATCH 1/2] Update nixpkgs to nixos-24.11 --- flake.lock | 8 ++++---- flake.nix | 2 +- template/flake.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 32cb3e4..fb175ac 100644 --- a/flake.lock +++ b/flake.lock @@ -36,16 +36,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717696253, - "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", + "lastModified": 1731755305, + "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b", + "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 89f00de..fbb8b6c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "mkRuby to build a version of Ruby"; inputs.flake-utils.url = "github:numtide/flake-utils"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; inputs.flake-compat.url = "github:edolstra/flake-compat"; inputs.flake-compat.flake = false; diff --git a/template/flake.nix b/template/flake.nix index de0bed4..26a1f93 100644 --- a/template/flake.nix +++ b/template/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-ruby.url = "github:bobvanderlinden/nixpkgs-ruby"; nixpkgs-ruby.inputs.nixpkgs.follows = "nixpkgs"; flake-utils.url = "github:numtide/flake-utils"; From c52350a6ada91d20b871f0351ddad457f0285a45 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Thu, 5 Dec 2024 22:50:20 +0100 Subject: [PATCH 2/2] mark 3.1.{0,1,2,3} as broken on darwin --- ruby/overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ruby/overrides.nix b/ruby/overrides.nix index 2668fa4..1baac20 100644 --- a/ruby/overrides.nix +++ b/ruby/overrides.nix @@ -41,6 +41,10 @@ "2.2.8" "2.2.9" "2.6.7" + "3.1.0" + "3.1.1" + "3.1.2" + "3.1.3" ]); override = pkg: pkg.overrideAttrs (finalAttrs: previousAttrs: { meta = previousAttrs.meta // { broken = true; }; }); }