Merge pull request #231 from eyJhb/bump-nixpkgs-23.11

Bump nixpkgs to 23.11, android-nixpkgs to latest and remove nixpkgsUnstable

Author: Atemu

flake.lock

@@ -2,8 +2,7 @@
   description = "Build Android (AOSP) using Nix";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";
-    nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
     androidPkgs.url = "github:tadfisher/android-nixpkgs/stable";
   };
 
@@ -38,7 +37,8 @@
         wget
 
         # For chromium updater script
-        python2 cipd git
+        # python2
+        cipd git
 
         cachix
       ];

flake.nix

@@ -299,6 +299,10 @@ in
           inherit name;
           srcs = [];
 
+          # TODO: update in the future, might not be required.
+          # gets permissed denied if not set, in some of our deps
+          dontUpdateAutotoolsGnuConfigScripts = true;
+
           # TODO: Clean this stuff up. unshare / robotnix-build could probably be combined into a single utility.
           builder = pkgs.writeShellScript "builder.sh" ''
             export SAVED_UID=$(${pkgs.coreutils}/bin/id -u)
@@ -437,8 +441,8 @@ in
         name = "ota-tools";
         inherit src;
         sourceRoot = ".";
-        nativeBuildInputs = with pkgs; [ unzip pythonPackages.pytest ];
-        buildInputs = [ (pkgs.python.withPackages (p: [ p.protobuf ])) ];
+        nativeBuildInputs = with pkgs; [ unzip python3Packages.pytest ];
+        buildInputs = [ (pkgs.python3.withPackages (p: [ p.protobuf ])) ];
         postPatch = lib.optionalString (config.androidVersion == 11) ''
           cp bin/debugfs_static bin/debugfs
         '' + lib.optionalString (config.androidVersion <= 10) ''
@@ -514,6 +518,18 @@ in
         name = "robotnix-build";
         targetPkgs = pkgs: config.envPackages;
         multiPkgs = pkgs: with pkgs; [ zlib ];
+
+        # TODO might not be needed in the future, required now because
+        # Android works in mysterious ways. Wasn't needed in the past
+        # because these paths were already a part of LD_LIBRARY_PATH
+        # when using FHS.
+        #
+        # See here for issue when it was introduced https://github.com/NixOS/nixpkgs/issues/262775
+        # Inspiration taken from here https://github.com/NixOS/nixpkgs/pull/278361
+        # More information here as well https://github.com/NixOS/nixpkgs/issues/103648
+        profile = ''
+          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib:/usr/lib32
+        '';
       };
     };
   }];

modules/base.nix

@@ -18,6 +18,7 @@ in
       lsof
       m4
       ncurses5
+      libxcrypt-legacy
       openssl # Used in avbtool
       psmisc # for "fuser", "pstree"
       rsync

modules/envpackages.nix

@@ -11,14 +11,11 @@
   ... }@args:
 
 let
-  inherit (inputs) nixpkgs nixpkgsUnstable androidPkgs;
+  inherit (inputs) nixpkgs androidPkgs;
 in nixpkgs.legacyPackages.x86_64-linux.appendOverlays [
   (self: super: {
     androidPkgs.packages = androidPkgs.packages.x86_64-linux;
     androidPkgs.sdk = androidPkgs.sdk.x86_64-linux;
-
-    inherit (nixpkgsUnstable.legacyPackages.x86_64-linux)
-      diffoscope;
   })
   (import ./overlay.nix)
 ]

pkgs/default.nix

@@ -27,7 +27,10 @@ self: super: {
 
   fetchgerritpatchset = super.callPackage ./fetchgerritpatchset {};
 
-  fetchgit = super.callPackage ./fetchgit {};
+  # TODO cleanup once fetchgit is overridable upstream
+  fetchgit = args: ((super.lib.makeOverridable super.fetchgit) args).overrideAttrs (old: {
+    impureEnvVars = old.impureEnvVars or [ ] ++ [ "ROBOTNIX_GIT_MIRRORS" ];
+  });
   nix-prefetch-git = super.callPackage ./fetchgit/nix-prefetch-git.nix {};
 
   ###