Martin Weinelt 9b79a05ae1 Merge remote-tracking branch 'origin/master' into 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		2024-07-01 01:07:21 +02:00
..
elisp-packages	Merge remote-tracking branch 'origin/master' into staging-next	2024-07-01 01:07:21 +02:00
default.nix	Revert "emacs: set 29 as default version and remove 28" (#272785)	2023-12-08 01:34:55 +01:00
macport_noescape_noop.h
make-emacs.nix	emacs: add mailutils support	2024-05-01 14:13:46 -03:00
native-comp-driver-options-28.patch
native-comp-driver-options.patch
site-start.el
sources.nix	Merge staging-next into staging	2024-06-24 00:03:38 +00:00