From 6f849bc6c65120616a1f526b41a0696f117b02e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Fri, 30 Jun 2023 11:13:16 +0200 Subject: [PATCH] nix: ugprade nixpkgs to match version use in mobile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To match the version we upgrade to in: https://github.com/status-im/status-mobile/pull/14944 I'm upgrading Protobuf to `3.20` since `3.17` is gone: ``` error: protobuf3_17 does not receive updates anymore and has been removed ``` Not sure if that's a big deal. Signed-off-by: Jakub SokoĊ‚owski --- shell.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shell.nix b/shell.nix index d6059c7ca..b034a31d2 100644 --- a/shell.nix +++ b/shell.nix @@ -1,8 +1,8 @@ { /* This should match Nixpkgs commit in status-mobile. */ source ? builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/8fd4097529b4a71e0de000c90c8c4279f534eada.zip"; - sha256 = "sha256:174p05mzfqk56l4lqvwkbqka4qi5imbd75xaaw4bzmr00bails9f"; + url = "https://github.com/NixOS/nixpkgs/archive/e7603eba51f2c7820c0a182c6bbb351181caa8e7.tar.gz"; + sha256 = "sha256:0mwck8jyr74wh1b7g6nac1mxy6a0rkppz8n12andsffybsipz5jw"; }, pkgs ? import (source){ config = { @@ -50,7 +50,7 @@ in pkgs.mkShell { buildInputs = with pkgs; [ git jq which go_1_19 golangci-lint gopls go-bindata gomobileMod - mockgen protobuf3_17 protoc-gen-go + mockgen protobuf3_20 protoc-gen-go ] ++ lib.optional stdenv.isDarwin xcodeWrapper; shellHook = lib.optionalString (!isMacM1) ''