3p/nixpkgs: improvise, adapt, overcome

nix/pkgs/copybara.nix

@@ -2,9 +2,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ buildBazelPackage, buildFHSUserEnv, openjdk11_headless, bazel, git, mercurial, makeWrapper, fetchFromGitHub }:
+{ buildBazelPackage, buildFHSEnv, openjdk11_headless, bazel, git, mercurial, makeWrapper, fetchFromGitHub }:
 let
-  hackedBazelTop = buildFHSUserEnv {
+  hackedBazelTop = buildFHSEnv {
     name = "bazel";
     targetPkgs = pkgs: [
       (bazel.override { enableNixHacks = true; })

nix/pkgs/javaws-env.nix

@@ -49,7 +49,7 @@ let
     jdk = cookedJDK;
   };
 in
-pkgs.buildFHSUserEnv {
+pkgs.buildFHSEnv {
   name = "javaws-env";
   targetPkgs = pkgs: (with pkgs;
     [

ops/nixos/default.nix

@@ -7,16 +7,21 @@ let
   inherit (builtins) foldl' mapAttrs;
   inherit (lib) filterAttrs;
   baseModule = name: { ... }: {
+    imports = [ ../../third_party/nixpkgs/nixos/modules/misc/nixpkgs/read-only.nix ];
     _module.args = {
       rebuilder = rebuilder name;
+    };
+    nixpkgs = {
       pkgs = lib.mkForce pkgs;
     };
   };
   systemFor = systemName: config:
     (depot.third_party.nixeval {
-      inherit system;
+      system = null;
       modules = [ (baseModule systemName) (args: { imports = [ lib/common.nix config ]; }) ];
-      specialArgs = args;
+      specialArgs = {
+        inherit (args) depot third_party;
+      };
     });
   systems = [
     "porcorosso"

ops/nixos/lib/common.nix

@@ -125,7 +125,7 @@ in
         builders-use-substitutes = "true";
       };
     };
-    nixpkgs.config = depot.third_party.nixpkgsConfig;
+    # nixpkgs.config = depot.third_party.nixpkgsConfig;
 
     documentation.nixos.enable = false;  # I just use the website.