diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-07-01 01:07:02 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-07-01 01:07:21 +0200 |
| commit | 9b79a05ae1311685f77dafbdfc88e81e390b22f1 (patch) | |
| tree | 73301ee669f664cc6fbbc1a498b08d65d5556878 /pkgs/desktops/enlightenment | |
| parent | 3bb3e89f3b053d085ab876d9f06c34386fd6f71c (diff) | |
| parent | b2e0a5c33ce0db07af94a7f9cfd50612dd4bdcda (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next staging-next
Conflicts: - pkgs/development/python-modules/flexcache/default.nix - pkgs/development/python-modules/flexparser/default.nix - pkgs/development/python-modules/odp-amsterdam/default.nix - pkgs/development/python-modules/pint/default.nix - pkgs/development/python-modules/uncertainties/default.nix - pkgs/top-level/python-packages.nix
Diffstat (limited to 'pkgs/desktops/enlightenment')
0 files changed, 0 insertions, 0 deletions