From 62c683403df275dc7ac917b632a1fd7568dfd36c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= <kwilczynski@redhat.com>
Date: Fri, 20 Sep 2024 03:20:03 +0900
Subject: [PATCH] Move Nix derivation to use buildGoModule function and pin Go
 to 1.22.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Krzysztof Wilczyński <kwilczynski@redhat.com>
---
 nix/derivation.nix |  3 ++-
 nix/nixpkgs.json   | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/nix/derivation.nix b/nix/derivation.nix
index 9a92d0e4477f..952c71229add 100644
--- a/nix/derivation.nix
+++ b/nix/derivation.nix
@@ -1,7 +1,8 @@
 { stdenv
 , pkgs
 }:
-with pkgs; buildGo122Module {
+with pkgs; buildGoModule {
+  version = "1.22.7";
   name = "cri-o";
   src = ./..;
   vendorHash = null;
diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json
index 73ee0ab248bb..ff8ccaac200a 100644
--- a/nix/nixpkgs.json
+++ b/nix/nixpkgs.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/nixos/nixpkgs",
-  "rev": "953cb16a5e703be81cf2ce4fee32465c83c80b11",
-  "date": "2024-02-27T09:43:41-03:00",
-  "path": "/nix/store/sdwwm4vljzmv99livrir8nn5ivycl1ly-nixpkgs",
-  "sha256": "1jygmskxrg2jb01mp5g79q431pvp3iw30qxrdixj4nj7rh6424in",
-  "hash": "sha256-NhJBDMxHWiJ7bLljMHgcd98wCE7nlVsDWFK83Keuz8s=",
+  "rev": "51666317f496aed4b86dda778f91b8d4a09b209b",
+  "date": "2024-10-10T18:47:24+02:00",
+  "path": "/nix/store/ffphx7yhd3x8ai5f9hj0pks3knjyrpzh-nixpkgs",
+  "sha256": "14pdp02cc508qkvkh2178g0nvq1l5rb570rb727gxw697mlwzk1n",
+  "hash": "sha256-NszPaT3J8P6OOCuDU1YuNOBtwUMnCDj3xAgUxgS47ZI=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,