update nixpkgs:

- downgrade mitmproxy to avoid breakage
- add test for pip lock script
- fix bug in flake compat implementation (nix-community/flake-compat#4 (comment))
- small fix in docs for lock and eval-cache
- fix lock refresh script: don't swallow errors

Author: DavHau

dev-flake/flake-compat.nix

@@ -200,7 +200,13 @@
 
     rootOverrides =
       mapAttrs'
-      (input: lockKey: nameValuePair lockKey (impureOverrides.${input} or null))
+      (input: lockKey': let
+        lockKey =
+          if builtins.isList lockKey'
+          then builtins.concatStringsSep "/" lockKey'
+          else lockKey';
+      in
+        nameValuePair lockKey (impureOverrides.${input} or null))
       lockFile.nodes.${lockFile.root}.inputs;
 
     allNodes =

dev-flake/flake.lock

@@ -7,7 +7,7 @@
   };
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-unstable";
+    nixpkgs.url = "nixpkgs/nixpkgs-unstable";
 
     flake-parts.url = "github:hercules-ci/flake-parts";
     flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
@@ -19,7 +19,7 @@
     pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
 
     nix-unit.url = "github:nix-community/nix-unit";
-    # nix-unit.inputs.nixpkgs.follows = "nixpkgs";
+    nix-unit.inputs.nixpkgs.follows = "nixpkgs";
     nix-unit.inputs.flake-parts.follows = "flake-parts";
 
     devshell = {

dev-flake/flake.nix

@@ -61,7 +61,7 @@ in {
           dream2nix.modules.dream2nix.nixpkgs-overrides
         ];
         nixpkgs-overrides = {
-          exclude = ["propagatedBuildInputs"];
+          exclude = ["propagatedBuildInputs" "dependencies"];
         };
       };
       lazy-object-proxy = {

examples/packages/single-language/python-package-apache-airflow/default.nix

@@ -49,7 +49,7 @@ in {
 
     refresh = l.mkOption {
       type = t.path;
-      description = "Script to refresh the cache file of this package";
+      description = "Script to refresh the eval cache file";
       readOnly = true;
     };
   };

flake.lock

@@ -47,7 +47,7 @@
     refresh_scripts = json.loads('${l.toJSON cfg.fields}')  # noqa: E501
     repo_path = Path(subprocess.run(
         ['${config.paths.findRoot}'],  # noqa: E501
-        check=True, text=True, capture_output=True)
+        check=True, text=True, stdout=subprocess.PIPE)
         .stdout.strip())
     lock_path_rel = Path('${config.paths.package}/${config.paths.lockFile}')  # noqa: E501
     lock_path = repo_path / lock_path_rel.relative_to(lock_path_rel.anchor)
@@ -200,7 +200,7 @@ in {
 
   config = {
     lock.refresh = config.deps.writeScriptBin "refresh" ''
-      #!/usr/bin/env bash
+      #!${config.deps.bash}/bin/bash
       set -Eeuo pipefail
 
       ### Executing auto generated refresh script
@@ -221,7 +221,7 @@ in {
 
     deps = {nixpkgs, ...}:
       l.mapAttrs (_: l.mkDefault) {
-        inherit (nixpkgs) nix writeScriptBin;
+        inherit (nixpkgs) bash nix writeScriptBin;
         inherit (nixpkgs.writers) writePython3 writePython3Bin;
       };
   };

modules/dream2nix/core/eval-cache/interface.nix

@@ -79,7 +79,7 @@ in {
 
     refresh = l.mkOption {
       type = t.package;
-      description = "Script to refresh the cache file of this package";
+      description = "Script to refresh the lock file";
       readOnly = true;
     };
 

modules/dream2nix/core/lock/default.nix

@@ -135,7 +135,7 @@ in {
         inherit (cfg) env pypiSnapshotDate pipFlags pipVersion requirementsList requirementsFiles nativeBuildInputs;
         inherit (config.deps) writePureShellScript nix;
         inherit (config.paths) findRoot;
-        inherit (nixpkgs) gitMinimal nix-prefetch-scripts python3 writeText openssh;
+        inherit (nixpkgs) fetchFromGitHub fetchurl gitMinimal nix-prefetch-scripts openssh python3 rustPlatform writeText;
         pythonInterpreter = "${python}/bin/python";
       };
       setuptools = config.deps.python.pkgs.setuptools;

modules/dream2nix/core/lock/interface.nix

@@ -0,0 +1,56 @@
+# An example package with dependencies defined via pyproject.toml
+{
+  config,
+  lib,
+  dream2nix,
+  packageSets,
+  ...
+}: let
+  pyproject = lib.importTOML (config.mkDerivation.src + /pyproject.toml);
+  pkgs = packageSets.nixpkgs;
+in {
+  imports = [
+    dream2nix.modules.dream2nix.pip
+  ];
+
+  deps = {nixpkgs, ...}: {
+    python = nixpkgs.python310;
+  };
+
+  inherit (pyproject.project) name version;
+
+  mkDerivation = {
+    src = ./.;
+  };
+
+  pip = {
+    pypiSnapshotDate = "2023-08-27";
+    requirementsList =
+      pyproject.build-system.requires
+      or []
+      ++ pyproject.project.dependencies;
+    flattenDependencies = true;
+  };
+
+  paths.projectRootFile = "pyproject.toml";
+
+  public = lib.mkForce (pkgs.runCommand "pip-lock-script-works" {
+      outputHashMode = "flat";
+      outputHashAlgo = "sha256";
+      outputHash = "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=";
+      # invalidate by including into the name a hash over:
+      # - the path to the nixpkgs
+      # - TODO: the implementation of the fetch script
+      name = let
+        hash = builtins.hashString "sha256" (builtins.unsafeDiscardStringContext ''
+          ${pkgs.path}
+        '');
+      in "pip-lock-script-works-${lib.substring 0 16 hash}";
+    } ''
+      cp -r ${config.mkDerivation.src}/* .
+      chmod +w -R .
+      ls -lah
+      ${config.lock.refresh}/bin/refresh
+      touch $out
+    '');
+}