From 0aabe750747f318a82e3afe1c7c5eb4a073fb65c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 22 Dec 2024 03:17:16 +0100 Subject: [PATCH] glib: move to by-name --- .../libraries => by-name/gl}/glib/darwin-compilation.patch | 0 .../gl}/glib/elementary-terminal-support.patch | 0 .../{development/libraries => by-name/gl}/glib/gdb_script.patch | 0 .../libraries => by-name/gl}/glib/glib-appinfo-watch.patch | 0 .../libraries => by-name/gl}/glib/gobject_init_on_demand.patch | 0 .../libraries/glib/default.nix => by-name/gl/glib/package.nix} | 0 .../libraries => by-name/gl}/glib/quark_init_on_demand.patch | 0 .../gl}/glib/schema-override-variable.patch | 0 pkgs/{development/libraries => by-name/gl}/glib/setup-hook.sh | 0 .../libraries => by-name/gl}/glib/split-dev-programs.patch | 0 pkgs/top-level/all-packages.nix | 2 +- 11 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/libraries => by-name/gl}/glib/darwin-compilation.patch (100%) rename pkgs/{development/libraries => by-name/gl}/glib/elementary-terminal-support.patch (100%) rename pkgs/{development/libraries => by-name/gl}/glib/gdb_script.patch (100%) rename pkgs/{development/libraries => by-name/gl}/glib/glib-appinfo-watch.patch (100%) rename pkgs/{development/libraries => by-name/gl}/glib/gobject_init_on_demand.patch (100%) rename pkgs/{development/libraries/glib/default.nix => by-name/gl/glib/package.nix} (100%) rename pkgs/{development/libraries => by-name/gl}/glib/quark_init_on_demand.patch (100%) rename pkgs/{development/libraries => by-name/gl}/glib/schema-override-variable.patch (100%) rename pkgs/{development/libraries => by-name/gl}/glib/setup-hook.sh (100%) rename pkgs/{development/libraries => by-name/gl}/glib/split-dev-programs.patch (100%) diff --git a/pkgs/development/libraries/glib/darwin-compilation.patch b/pkgs/by-name/gl/glib/darwin-compilation.patch similarity index 100% rename from pkgs/development/libraries/glib/darwin-compilation.patch rename to pkgs/by-name/gl/glib/darwin-compilation.patch diff --git a/pkgs/development/libraries/glib/elementary-terminal-support.patch b/pkgs/by-name/gl/glib/elementary-terminal-support.patch similarity index 100% rename from pkgs/development/libraries/glib/elementary-terminal-support.patch rename to pkgs/by-name/gl/glib/elementary-terminal-support.patch diff --git a/pkgs/development/libraries/glib/gdb_script.patch b/pkgs/by-name/gl/glib/gdb_script.patch similarity index 100% rename from pkgs/development/libraries/glib/gdb_script.patch rename to pkgs/by-name/gl/glib/gdb_script.patch diff --git a/pkgs/development/libraries/glib/glib-appinfo-watch.patch b/pkgs/by-name/gl/glib/glib-appinfo-watch.patch similarity index 100% rename from pkgs/development/libraries/glib/glib-appinfo-watch.patch rename to pkgs/by-name/gl/glib/glib-appinfo-watch.patch diff --git a/pkgs/development/libraries/glib/gobject_init_on_demand.patch b/pkgs/by-name/gl/glib/gobject_init_on_demand.patch similarity index 100% rename from pkgs/development/libraries/glib/gobject_init_on_demand.patch rename to pkgs/by-name/gl/glib/gobject_init_on_demand.patch diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/by-name/gl/glib/package.nix similarity index 100% rename from pkgs/development/libraries/glib/default.nix rename to pkgs/by-name/gl/glib/package.nix diff --git a/pkgs/development/libraries/glib/quark_init_on_demand.patch b/pkgs/by-name/gl/glib/quark_init_on_demand.patch similarity index 100% rename from pkgs/development/libraries/glib/quark_init_on_demand.patch rename to pkgs/by-name/gl/glib/quark_init_on_demand.patch diff --git a/pkgs/development/libraries/glib/schema-override-variable.patch b/pkgs/by-name/gl/glib/schema-override-variable.patch similarity index 100% rename from pkgs/development/libraries/glib/schema-override-variable.patch rename to pkgs/by-name/gl/glib/schema-override-variable.patch diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/by-name/gl/glib/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/glib/setup-hook.sh rename to pkgs/by-name/gl/glib/setup-hook.sh diff --git a/pkgs/development/libraries/glib/split-dev-programs.patch b/pkgs/by-name/gl/glib/split-dev-programs.patch similarity index 100% rename from pkgs/development/libraries/glib/split-dev-programs.patch rename to pkgs/by-name/gl/glib/split-dev-programs.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27d706ce16a6f..14752cfb4d9ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9298,7 +9298,7 @@ with pkgs; grantlee = libsForQt5.callPackage ../development/libraries/grantlee { }; - glib = callPackage ../development/libraries/glib (let + glib = callPackage ../by-name/gl/glib/package.nix (let glib-untested = glib.overrideAttrs { doCheck = false; }; in { # break dependency cycles