nix: upgrade nixpkgs to latest nixos-22.11

Notable upgrades: * Bash `5.1` to `5.2` * Git `2.37.3` to `2.40.1` * Curl `7.85.0` to `8.0.1` * OpenSSL `3.0.5` to `3.0.8` * Go `1.18.6` to `1.18.9` * NodeJS `18.9.1` to `18.16.0` * Java `1.8.0_322` to `11.0.11` * Ruby `3.1.2` to `3.1.4` * Python `2.7.18` to `3.10.11` * Clojure `1.11.1.1165` to `1.11.1.1273` * Clj-kondo `v2022.10.05` to `v2023.04.14` * Zprint `1.2.5` to `1.2.6` * Bundler `2.3.22` to `2.4.13` * Gradle `6.9.2` to `6.9.4` * Android Platform Tools `33.0.2` to `33.0.3` * Android SDK Tools to Android SDK Command-Line Tools Removals: * Zprint since the version in `nixpkgs` was newer than in overlay. * Xcode wrapper definition was removed since my fixes were merged: - NixOS/nixpkgs#204278 - NixOS/nixpkgs#228696 Signed-off-by: Jakub Sokołowski <jakub@status.im>
status-im · Jun 16, 2023 · 451a08b · 451a08b
1 parent 2cbc943
commit 451a08b
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 70 deletions.
diff --git a/nix/overlay.nix b/nix/overlay.nix
@@ -32,18 +32,6 @@ in {
   # For parsing gradle.properties into an attrset
   gradlePropParser = callPackage ./tools/gradlePropParser.nix { };
 
-  # Clojure formatting tool
-  zprint = super.zprint.override rec {
-    buildGraalvmNativeImage = args: super.buildGraalvmNativeImage ( args // rec {
-      inherit (args) pname;
-      version = "1.2.5";
-      src = self.fetchurl {
-        url = "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}";
-        sha256 = "sha256-PWdR5jqyzvTk9HoxqDldwtZNik34dmebBtZZ5vtva4A=";
-      };
-    });
-  };
-
   # Fix for missing libarclite_macosx.a in Xcode 14.3.
   # https://github.com/ios-control/ios-deploy/issues/580
   ios-deploy = super.darwin.ios-deploy.overrideAttrs (old: rec {
@@ -61,7 +49,7 @@ in {
   nodejs = super.nodejs-18_x;
   yarn = super.yarn.override { nodejs = super.nodejs-18_x; };
   openjdk = super.openjdk11_headless;
-  xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } {
+  xcodeWrapper = super.xcodeenv.composeXcodeWrapper {
     version = "14.0";
     allowHigher = true;
   };

diff --git a/nix/pkgs.nix b/nix/pkgs.nix
@@ -11,11 +11,10 @@ let
   # We follow the master branch of official nixpkgs.
   nixpkgsSrc = fetchFromGitHub {
     name = "nixpkgs-source";
-    # FIXME: Fork used to get Cocoapods 1.12.0 and apksigner macOS build.
-    owner = "status-im";
+    owner = "NixOS";
     repo = "nixpkgs";
-    rev = "d0c06fa3d3982a91aa01bd63ed84020cbde3d3ab";
-    sha256 = "sha256-8blvuUHnuf0hFr/PpBxVohJp5CaGXIXhgJlFN/cv7us=";
+    rev = "e7603eba51f2c7820c0a182c6bbb351181caa8e7";
+    sha256 = "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=";
     # To get the compressed Nix sha256, use:
     # nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz
   };

diff --git a/nix/pkgs/android-sdk/compose.nix b/nix/pkgs/android-sdk/compose.nix
@@ -8,8 +8,9 @@
 # The "android-sdk-license" license is accepted
 # by setting android_sdk.accept_license = true.
 androidenv.composeAndroidPackages {
+  cmdLineToolsVersion = "9.0";
   toolsVersion = "26.1.1";
-  platformToolsVersion = "33.0.2";
+  platformToolsVersion = "33.0.3";
   buildToolsVersions = [ "31.0.0" ];
   platformVersions = [ "31" ];
   cmakeVersions = [ "3.18.1" ];

diff --git a/nix/pkgs/android-sdk/shell.nix b/nix/pkgs/android-sdk/shell.nix
@@ -1,17 +1,18 @@
-{ mkShell, androidPkgs }:
+{ mkShell, openjdk, androidPkgs }:
 
 mkShell {
   name = "android-sdk-shell";
+  buildInputs = [ openjdk ];
+
   shellHook = ''
     export ANDROID_HOME="${androidPkgs.sdk}"
     export ANDROID_NDK_ROOT="${androidPkgs.ndk}"
     export ANDROID_SDK_ROOT="$ANDROID_HOME"
 
-    export PATH="$ANDROID_HOME/bin:$PATH"
     export PATH="$ANDROID_NDK_ROOT:$PATH"
     export PATH="$ANDROID_SDK_ROOT/tools:$PATH"
     export PATH="$ANDROID_SDK_ROOT/tools/bin:$PATH"
+    export PATH="$(echo $ANDROID_SDK_ROOT/cmdline-tools/*/bin):$PATH"
     export PATH="$ANDROID_SDK_ROOT/platform-tools:$PATH"
-    export PATH="$ANDROID_SDK_ROOT/build-tools:$PATH"
   '';
 }
diff --git a/nix/pkgs/xcodeenv/compose-xcodewrapper.nix b/nix/pkgs/xcodeenv/compose-xcodewrapper.nix
diff --git a/nix/shell.nix b/nix/shell.nix
@@ -20,7 +20,7 @@ in mkShell {
     # lint specific utilities
     clj-kondo zprint
     # other nice to have stuff
-    yarn nodejs python27
+    yarn nodejs python310
   ] # and some special cases
     ++ lib.optionals stdenv.isDarwin [ cocoapods clang tcl ]
     ++ lib.optionals (!stdenv.isDarwin) [ gcc8 ]

diff --git a/nix/shells.nix b/nix/shells.nix
@@ -57,7 +57,7 @@ let
 
     # for 'scripts/generate-keystore.sh'
     keytool = mkShell {
-      buildInputs = with pkgs; [ openjdk11 apksigner ];
+      buildInputs = with pkgs; [ openjdk apksigner ];
     };
 
     # for targets needing 'adb', 'apkanalyzer' and other SDK/NDK tools

diff --git a/src/quo2/components/inputs/title_input/view.cljs b/src/quo2/components/inputs/title_input/view.cljs
@@ -42,8 +42,8 @@
           :default-value default-value
           :accessibility-label :profile-title-input
           :keyboard-appearance (theme/theme-value :light :dark override-theme)
-          :on-focus #(swap! focused? (fn [] true))
-          :on-blur #(swap! focused? (fn [] false))
+          :on-focus #(swap! focused? (constantly true))
+          :on-blur #(swap! focused? (constantly false))
           :auto-focus auto-focus
           :input-mode :text
           :on-change-text on-change

diff --git a/src/status_im2/contexts/communities/discover/view.cljs b/src/status_im2/contexts/communities/discover/view.cljs
@@ -96,7 +96,7 @@
       [rn/view
        {:style     style/featured-list-container
         :on-layout #(swap! view-size
-                      (fn []
+                      (fn [_]
                         (- (oops/oget % "nativeEvent.layout.width") 40)))}
        (when-not (= @view-size 0)
          [rn/flat-list