Merge branch 'main' into feat/cleanup-v3

.github/workflows/pages.yml

@@ -10,7 +10,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac  # v4.0.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608  # v4.1.0
 
       - name: Install nix
         uses: cachix/install-nix-action@6a9a9e84a173d90b3ffb42c5ddaf9ea033fad011  # v23

.gitignore

@@ -4,4 +4,5 @@
 /.pre-commit-config.yaml
 result
 interpreter
-__pycache__
+__pycache__
+*.egg-info

.mergify.yml

@@ -0,0 +1,16 @@
+queue_rules:
+  - name: default
+    merge_conditions:
+      - check-success=buildbot/nix-eval
+defaults:
+  actions:
+    queue:
+      allow_merging_configuration_change: true
+      method: rebase
+pull_request_rules:
+  - name: merge using the merge queue
+    conditions:
+      - base=main
+      - label~=merge-queue|dependencies
+    actions:
+      queue:

examples/dream2nix-repo-flake-groups/flake.nix

@@ -0,0 +1,83 @@
+{
+  description = "My flake with dream2nix packages";
+
+  inputs = {
+    dream2nix.url = "github:nix-community/dream2nix";
+    nixpkgs.url = "nixpkgs/nixos-unstable";
+  };
+
+  outputs = inputs @ {
+    self,
+    dream2nix,
+    nixpkgs,
+    ...
+  }: let
+    system = "x86_64-linux";
+    lib = nixpkgs.lib;
+  in {
+    # all packages defined inside ./packages/
+    packages = let
+      module = {
+        config,
+        lib,
+        dream2nix,
+        ...
+      }: {
+        imports = [
+          dream2nix.modules.dream2nix.groups
+        ];
+
+        # Overrides for all package sets
+        overrides = {};
+
+        # We can define various package sets
+        groups = {
+          non-overridden-set = {
+            overrides = lib.mkForce {};
+          };
+          # By default, a set has a packages attribute.
+          # Additional modules can add support for creating environments.
+          python-set = {
+            overrides = {};
+            devShell = {};
+            packages = {};
+          };
+          nodejs-set = {
+            # ...
+          };
+
+          final-set = {
+            imports = [
+              dream2nix.modules.dream2nix.packages
+              dream2nix.modules.dream2nix.python-packages
+              dream2nix.modules.dream2nix.symlinked-env
+              dream2nix.modules.dream2nix.dev-shell
+            ];
+            packages = {
+              inherit
+                (config.groups.python-set)
+                requests
+                aiohttp
+                ;
+            };
+            symlinked-env = {type = "derivation";};
+            dev-shell = {type = "derivation";};
+            # populated automatically
+            public.symlinked-env = {type = "derivation";};
+            public.dev-shell = {type = "derivation";};
+          };
+        };
+      };
+      evaled = lib.evalModules {modules = [module];};
+      packages = evaled.config.groups.python-set.public.packages;
+      env = evaled.config.packages-sets.python-set.public.env;
+      symlinkedEnv = evaled.config.packge-sets.final-set.public.symlinked-env;
+    in {
+      inherit
+        (packages)
+        hello
+        torch
+        ;
+    };
+  };
+}

examples/dream2nix-repo-flake-pdm/.gitignore

@@ -0,0 +1,3 @@
+__pypackages__
+.pdm-build
+.pdm-python

examples/dream2nix-repo-flake-pdm/flake.nix

@@ -0,0 +1,38 @@
+{
+  description = "My flake with dream2nix packages";
+
+  inputs = {
+    dream2nix.url = "github:nix-community/dream2nix?dir=modules";
+    nixpkgs.follows = "dream2nix/nixpkgs";
+  };
+
+  outputs = inputs @ {
+    self,
+    dream2nix,
+    nixpkgs,
+    ...
+  }: let
+    system = "x86_64-linux";
+    lib = nixpkgs.lib;
+    module = {
+      config,
+      lib,
+      dream2nix,
+      ...
+    }: {
+      imports = [
+        dream2nix.modules.dream2nix.WIP-python-pdm
+      ];
+      pdm.lockfile = ./pdm.lock;
+      pdm.pyproject = ./pyproject.toml;
+      pdm.pythonInterpreter = nixpkgs.legacyPackages.python3;
+    };
+    evaled = lib.evalModules {
+      modules = [module];
+      specialArgs.dream2nix = dream2nix;
+      specialArgs.packageSets.nixpkgs = nixpkgs.legacyPackages.x86_64-linux;
+    };
+  in {
+    packages.${system} = evaled.config.groups.default.public.packages;
+  };
+}

examples/dream2nix-repo-flake-pdm/pyproject.toml

@@ -0,0 +1,19 @@
+
+[project]
+name = "my-project"
+version = "0.1.0"
+description = ""
+dependencies = [
+    "requests>=2.31.0",
+]
+requires-python = ">=3.10"
+readme = "README.md"
+license = {text = "MIT"}
+[project.optional-dependencies]
+dev = [
+    "pi>=0.1.2",
+]
+
+[build-system]
+requires = ["pdm-backend"]
+build-backend = "pdm.backend"

examples/dream2nix-repo-flake/flake.nix

@@ -3,7 +3,7 @@
 
   inputs = {
     dream2nix.url = "github:nix-community/dream2nix";
-    nixpkgs.url = "nixpkgs/nixos-unstable";
+    nixpkgs.follows = "dream2nix/nixpkgs";
   };
 
   outputs = inputs @ {
@@ -18,8 +18,8 @@
     packages.${system} = dream2nix.lib.importPackages {
       projectRoot = ./.;
       # can be changed to ".git" or "flake.nix" to get rid of .project-root
-      projectRootFile = ".project-root";
-      packagesDir = "/packages";
+      projectRootFile = "flake.nix";
+      packagesDir = ./packages;
       packageSets.nixpkgs = nixpkgs.legacyPackages.${system};
     };
   };

examples/dream2nix-repo-single-package/flake.nix

@@ -0,0 +1,28 @@
+{
+  description = "My flake with dream2nix packages";
+
+  inputs = {
+    dream2nix.url = "github:nix-community/dream2nix";
+    nixpkgs.follows = "dream2nix/nixpkgs";
+  };
+
+  outputs = inputs @ {
+    self,
+    dream2nix,
+    nixpkgs,
+    ...
+  }: let
+    system = "x86_64-linux";
+  in {
+    # all packages defined inside ./packages/
+    packages.${system}.default = nixpkgs.lib.evalModules {
+      modules = [];
+
+      projectRoot = ./.;
+      # can be changed to ".git" or "flake.nix" to get rid of .project-root
+      projectRootFile = "flake.nix";
+      packagesDir = ./packages;
+      packageSets.nixpkgs = nixpkgs.legacyPackages.${system};
+    };
+  };
+}

examples/dream2nix-repo/default.nix

@@ -4,16 +4,16 @@
       url = "https://github.com/nix-community/dream2nix/tarball/main";
       # sha256 = "";
     },
+  pkgs ? import (import dream2nixSource).inputs.nixpkgs {},
 }: let
   dream2nix = import dream2nixSource;
-  nixpkgs = import dream2nix.inputs.nixpkgs {};
   # all packages defined inside ./packages/
   packages = dream2nix.lib.importPackages {
     projectRoot = ./.;
     # can be changed to ".git" to get rid of .project-root
     projectRootFile = ".project-root";
-    packagesDir = "/packages";
-    packageSets.nixpkgs = nixpkgs;
+    packagesDir = ./packages;
+    packageSets.nixpkgs = pkgs;
   };
 in
   # all packages defined inside ./packages/

examples/packages/multi-language/python-nodejs/lock.json

@@ -118,5 +118,6 @@
         ]
       }
     }
-  }
+  },
+  "invalidationHash": "255d7306e2485fb3c4e4419fc044fed9dade9ea3d0748396036c0e31ea72a03f"
 }