diff options
| author | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2023-08-26 16:08:02 -0700 |
|---|---|---|
| committer | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2023-08-26 16:08:02 -0700 |
| commit | 80a74ec050766415beb2f5765155ab425ac86af3 (patch) | |
| tree | e3a5baa5e6a6f65822aad855b7e00364b661d6bd /pkgs/development/python-modules/setupmeta/default.nix | |
| parent | 8adf696a5431332893f14e019a560703000ed648 (diff) | |
| parent | a7d27e87ee8a2b5b5a6bd39e5c3cdf7549606923 (diff) | |
Merge branch 'master' into staging-next
Manually fixed a merge conflict between https://github.com/NixOS/nixpkgs/pull/227900 and https://github.com/NixOS/nixpkgs/pull/246022.
Diffstat (limited to 'pkgs/development/python-modules/setupmeta/default.nix')
0 files changed, 0 insertions, 0 deletions