Update nixpkgs to 21.11

Author: danielfullmer

apks/auditor/gradle-env.nix

@@ -326,15 +326,7 @@ let
 
   mkGradle = gradleSpec:
     gradleGen.gradleGen {
-      inherit (gradleSpec) nativeVersion;
-
-      name = "gradle-${gradleSpec.version}-${gradleSpec.type}";
-
-      src = fetchurl {
-        inherit (gradleSpec) url sha256;
-      };
-    } // {
-      inherit (gradleSpec) version;
+      inherit (gradleSpec) nativeVersion version sha256;
     };
 
   mkProjectEnv = projectSpec: rec {

apks/fdroid/gradle-env.nix

@@ -326,15 +326,7 @@ let
 
   mkGradle = gradleSpec:
     gradleGen.gradleGen {
-      inherit (gradleSpec) nativeVersion;
-
-      name = "gradle-${gradleSpec.version}-${gradleSpec.type}";
-
-      src = fetchurl {
-        inherit (gradleSpec) url sha256;
-      };
-    } // {
-      inherit (gradleSpec) version;
+      inherit (gradleSpec) nativeVersion version sha256;
     };
 
   mkProjectEnv = projectSpec: rec {

apks/seedvault_10/gradle-env.nix

@@ -236,13 +236,7 @@ let
 
   mkGradle = gradleSpec:
     gradleGen.gradleGen {
-      inherit (gradleSpec) nativeVersion;
-
-      name = "gradle-${gradleSpec.version}-${gradleSpec.type}";
-
-      src = fetchurl {
-        inherit (gradleSpec) url sha256;
-      };
+      inherit (gradleSpec) nativeVersion version sha256;
     };
 
   mkProjectEnv = projectSpec: {

flake.lock

@@ -2,7 +2,7 @@
   description = "Build Android (AOSP) using Nix";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";
     nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     androidPkgs.url = "github:tadfisher/android-nixpkgs/stable";
   };

flake.nix

@@ -36,6 +36,7 @@ let
       cp -r . $out
       cp ${pkgs.libedit}/lib/libedit.so.0 $out/lib64/libedit.so.2 # ABI is the same--but distros have inconsistent numbering
     '';
+    autoPatchelfIgnoreMissingDeps=true; # Ignore missing liblog.so
   };
   prebuiltGas = let
     # Not always included in the platform repo manifest

flavors/vanilla/11/kernel/default.nix

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2020 Daniel Fullmer and robotnix contributors
 # SPDX-License-Identifier: MIT
 
-{ pkgs, callPackage, lib, substituteAll, makeWrapper, fetchFromGitHub, jdk16_headless, gradleGen,
+{ pkgs, callPackage, lib, substituteAll, makeWrapper, fetchFromGitHub, jdk17_headless, gradleGen,
   listenHost ? "localhost",
   port ? 8080,
   applicationId ? "org.robotnix.auditor",
@@ -11,24 +11,25 @@
   avbFingerprint ? ""
 }:
 let
+  jdk = jdk17_headless;
   buildGradle = callPackage ./gradle-env.nix {
     gradleGen = callPackage (pkgs.path + /pkgs/development/tools/build-managers/gradle) {
-      java = jdk16_headless;
+      java = jdk;
     };
   };
   supportedDevices = import ../../apks/auditor/supported-devices.nix;
 in
 buildGradle {
   pname = "AttestationServer";
-  version = "2021-09-08";
+  version = "2021-10-13";
 
   envSpec = ./gradle-env.json;
 
   src = fetchFromGitHub {
     owner = "grapheneos";
     repo = "AttestationServer";
-    rev = "cf42a655a98c0ab890cb931077229d2234b5bf37";
-    sha256 = "0riiww9gi1n5fj3d7q467cryypjwzlzrmssyh9hnqhjirgszml16";
+    rev = "47be83795d2f9836fe40bd0f1914abab8bb9d043";
+    sha256 = "10kz6lb0s7vhq253vl538hin4k6pz0g80wg5xqd35fih0p9a966p";
   };
 
   patches = [
@@ -57,7 +58,7 @@ buildGradle {
     mv build/libs/source.jar build/libs/AttestationServer.jar # "source" is just the name of the parent dir in the nix environment, which ought to be "AttestationServer"
     cp -r build/libs/* $out/share/java
 
-    makeWrapper ${jdk16_headless}/bin/java $out/bin/AttestationServer \
+    makeWrapper ${jdk}/bin/java $out/bin/AttestationServer \
       --add-flags "-cp $out/share/java/AttestationServer.jar:$out/share/java/* app.attestation.server.AttestationServer"
 
     # Static HTML output