mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-28 16:43:58 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
22 lines
1018 B
Diff
22 lines
1018 B
Diff
diff --git a/src/extensions.c b/src/extensions.c
|
|
index 354f476..8d020a6 100644
|
|
--- a/src/extensions.c
|
|
+++ b/src/extensions.c
|
|
@@ -122,15 +122,7 @@ daemon_read_extension_directory (GHashTable *ifaces,
|
|
continue;
|
|
}
|
|
|
|
- /* Ensure it looks like "../../dbus-1/interfaces/${name}" */
|
|
- const gchar * const prefix = "../../dbus-1/interfaces/";
|
|
- if (g_str_has_prefix (symlink, prefix) && g_str_equal (symlink + strlen (prefix), name)) {
|
|
- daemon_read_extension_file (ifaces, filename);
|
|
- } else {
|
|
- g_warning ("Found accounts service vendor extension symlink %s, but it must be exactly "
|
|
- "equal to '../../dbus-1/interfaces/%s' for forwards-compatibility reasons.",
|
|
- filename, name);
|
|
- }
|
|
+ daemon_read_extension_file (ifaces, filename);
|
|
}
|
|
|
|
g_dir_close (dir);
|