From 3f932fa938c7c2be1d819baa2c0db3e5b0421933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Thu, 4 May 2023 13:31:40 +0200
Subject: [PATCH] nix: upgrade nixpkgs to include xcodeWrapper fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes:
- https://github.com/NixOS/nixpkgs/pull/204278
- https://github.com/NixOS/nixpkgs/pull/228696

Other notable upgrades:

- Bash from `5.1` to `5.2`
- Binutils from `2.39` to `2.40`
- GnuAWK from `5.1.1` to `5.2.1`
- GCC  from `11.3.0` to `12.2.0`
- GNU Make from `4.3` to `4.4.1`
- Git from `4.8` to `4.9`
- Go from `1.19.2` to `1.19.8`
- Android SDK tools from `33.0.2` to `33.0.3`

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 shell.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/shell.nix b/shell.nix
index 047dbcad8..d6059c7ca 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/579238da5f431b7833a9f0681663900aaf0dd1e8.zip";
-    sha256 = "sha256:0a77c8fq4145k0zdmsda9cmhfw84ipf9nhvvn0givzhza1500g3h";
+    url = "https://github.com/NixOS/nixpkgs/archive/8fd4097529b4a71e0de000c90c8c4279f534eada.zip";
+    sha256 = "sha256:174p05mzfqk56l4lqvwkbqka4qi5imbd75xaaw4bzmr00bails9f";
   },
   pkgs ? import (source){
     config = {
@@ -13,7 +13,7 @@
       (self: super: {
         androidPkgs = pkgs.androidenv.composeAndroidPackages {
           toolsVersion = "26.1.1";
-          platformToolsVersion = "33.0.2";
+          platformToolsVersion = "33.0.3";
           buildToolsVersions = [ "31.0.0" ];
           platformVersions = [ "31" ];
           cmakeVersions = [ "3.18.1" ];
@@ -35,7 +35,10 @@ let
   /* No Android SDK for Darwin aarch64. */
   isMacM1 = stdenv.isDarwin && stdenv.isAarch64;
   /* Lock requires Xcode verison. */
-  xcodeWrapper = pkgs.xcodeenv.composeXcodeWrapper { version = "14.3"; };
+  xcodeWrapper = pkgs.xcodeenv.composeXcodeWrapper {
+    version = "14.3";
+    allowHigher = true;
+  };
   /* Gomobile also needs the Xcode wrapper. */
   gomobileMod = pkgs.gomobile.override {
     inherit xcodeWrapper;