From 3a76aa988a53bd50647ed8412b37b57b0ef3ea8c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 6 Sep 2024 09:56:31 -0300 Subject: [PATCH 1/5] g-wrap: migrate to by-name And green-alias it to gwrap. --- .../guile/g-wrap/default.nix => by-name/g-/g-wrap/package.nix} | 0 pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/{development/tools/guile/g-wrap/default.nix => by-name/g-/g-wrap/package.nix} (100%) diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/by-name/g-/g-wrap/package.nix similarity index 100% rename from pkgs/development/tools/guile/g-wrap/default.nix rename to pkgs/by-name/g-/g-wrap/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4077bd7c430c..fb21c8757ac0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17853,7 +17853,8 @@ with pkgs; guile-hall = callPackage ../development/tools/guile/guile-hall { }; - gwrap = callPackage ../development/tools/guile/g-wrap { + gwrap = g-wrap; + g-wrap = callPackage ../by-name/g-/g-wrap/package.nix { guile = guile_2_2; }; From 962d90bf45c13ab35ad5d146808cf252c341a06c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 4 Oct 2024 13:10:10 -0300 Subject: [PATCH 2/5] guile-hall: migrate to by-name --- .../default.nix => by-name/gu/guile-hall/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/guile/guile-hall/default.nix => by-name/gu/guile-hall/package.nix} (100%) diff --git a/pkgs/development/tools/guile/guile-hall/default.nix b/pkgs/by-name/gu/guile-hall/package.nix similarity index 100% rename from pkgs/development/tools/guile/guile-hall/default.nix rename to pkgs/by-name/gu/guile-hall/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb21c8757ac0..76ac3989e23a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17851,8 +17851,6 @@ with pkgs; guff = callPackage ../tools/graphics/guff { }; - guile-hall = callPackage ../development/tools/guile/guile-hall { }; - gwrap = g-wrap; g-wrap = callPackage ../by-name/g-/g-wrap/package.nix { guile = guile_2_2; From 43c282915c02656f70b6eb397682d917458a1aa6 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 6 Sep 2024 10:02:39 -0300 Subject: [PATCH 3/5] guile-xcb: migrate to by-name --- .../guile-xcb/default.nix => by-name/gu/guile-xcb/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/guile-modules/guile-xcb/default.nix => by-name/gu/guile-xcb/package.nix} (100%) diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/by-name/gu/guile-xcb/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-xcb/default.nix rename to pkgs/by-name/gu/guile-xcb/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76ac3989e23a..1baa48fb72c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16805,7 +16805,7 @@ with pkgs; guile-ssh = callPackage ../development/guile-modules/guile-ssh { }; - guile-xcb = callPackage ../development/guile-modules/guile-xcb { + guile-xcb = callPackage ../by-name/gu/guile-xcb/package.nix { guile = guile_2_2; }; From e89b77ef6c283e6274d92b2374fe03fe2d33cd32 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 6 Sep 2024 10:00:16 -0300 Subject: [PATCH 4/5] guile-cairo: migrate to by-name --- .../default.nix => by-name/gu/guile-cairo/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/guile-modules/guile-cairo/default.nix => by-name/gu/guile-cairo/package.nix} (100%) diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/by-name/gu/guile-cairo/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-cairo/default.nix rename to pkgs/by-name/gu/guile-cairo/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1baa48fb72c3..3f4a1c9de583 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16773,8 +16773,6 @@ with pkgs; guile = guile_3_0; - guile-cairo = callPackage ../development/guile-modules/guile-cairo { }; - guile-commonmark = callPackage ../development/guile-modules/guile-commonmark { }; guile-config = callPackage ../development/guile-modules/guile-config { }; From f8868113522f28296568a5430e730b35e87e8f8b Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 6 Sep 2024 10:03:49 -0300 Subject: [PATCH 5/5] treewide: migrate guile-modules to by-name --- .../gu/guile-commonmark/package.nix} | 0 .../gu/guile-config/package.nix} | 0 .../gu/guile-fibers/package.nix} | 0 .../gu/guile-gcrypt/package.nix} | 0 .../gu/guile-git/package.nix} | 0 .../gu/guile-gnutls/package.nix} | 0 .../gu/guile-json/package.nix} | 0 .../gu/guile-lib/package.nix} | 0 .../gu/guile-ncurses/package.nix} | 0 .../gu/guile-opengl/package.nix} | 0 .../gu/guile-reader/package.nix} | 0 .../gu/guile-sdl2/package.nix} | 0 .../gu/guile-ssh/package.nix} | 0 pkgs/top-level/all-packages.nix | 26 ------------------- 14 files changed, 26 deletions(-) rename pkgs/{development/guile-modules/guile-commonmark/default.nix => by-name/gu/guile-commonmark/package.nix} (100%) rename pkgs/{development/guile-modules/guile-config/default.nix => by-name/gu/guile-config/package.nix} (100%) rename pkgs/{development/guile-modules/guile-fibers/default.nix => by-name/gu/guile-fibers/package.nix} (100%) rename pkgs/{development/guile-modules/guile-gcrypt/default.nix => by-name/gu/guile-gcrypt/package.nix} (100%) rename pkgs/{development/guile-modules/guile-git/default.nix => by-name/gu/guile-git/package.nix} (100%) rename pkgs/{development/guile-modules/guile-gnutls/default.nix => by-name/gu/guile-gnutls/package.nix} (100%) rename pkgs/{development/guile-modules/guile-json/default.nix => by-name/gu/guile-json/package.nix} (100%) rename pkgs/{development/guile-modules/guile-lib/default.nix => by-name/gu/guile-lib/package.nix} (100%) rename pkgs/{development/guile-modules/guile-ncurses/default.nix => by-name/gu/guile-ncurses/package.nix} (100%) rename pkgs/{development/guile-modules/guile-opengl/default.nix => by-name/gu/guile-opengl/package.nix} (100%) rename pkgs/{development/guile-modules/guile-reader/default.nix => by-name/gu/guile-reader/package.nix} (100%) rename pkgs/{development/guile-modules/guile-sdl2/default.nix => by-name/gu/guile-sdl2/package.nix} (100%) rename pkgs/{development/guile-modules/guile-ssh/default.nix => by-name/gu/guile-ssh/package.nix} (100%) diff --git a/pkgs/development/guile-modules/guile-commonmark/default.nix b/pkgs/by-name/gu/guile-commonmark/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-commonmark/default.nix rename to pkgs/by-name/gu/guile-commonmark/package.nix diff --git a/pkgs/development/guile-modules/guile-config/default.nix b/pkgs/by-name/gu/guile-config/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-config/default.nix rename to pkgs/by-name/gu/guile-config/package.nix diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/by-name/gu/guile-fibers/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-fibers/default.nix rename to pkgs/by-name/gu/guile-fibers/package.nix diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/by-name/gu/guile-gcrypt/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-gcrypt/default.nix rename to pkgs/by-name/gu/guile-gcrypt/package.nix diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/by-name/gu/guile-git/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-git/default.nix rename to pkgs/by-name/gu/guile-git/package.nix diff --git a/pkgs/development/guile-modules/guile-gnutls/default.nix b/pkgs/by-name/gu/guile-gnutls/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-gnutls/default.nix rename to pkgs/by-name/gu/guile-gnutls/package.nix diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/by-name/gu/guile-json/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-json/default.nix rename to pkgs/by-name/gu/guile-json/package.nix diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/by-name/gu/guile-lib/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-lib/default.nix rename to pkgs/by-name/gu/guile-lib/package.nix diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/by-name/gu/guile-ncurses/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-ncurses/default.nix rename to pkgs/by-name/gu/guile-ncurses/package.nix diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/by-name/gu/guile-opengl/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-opengl/default.nix rename to pkgs/by-name/gu/guile-opengl/package.nix diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/by-name/gu/guile-reader/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-reader/default.nix rename to pkgs/by-name/gu/guile-reader/package.nix diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/by-name/gu/guile-sdl2/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-sdl2/default.nix rename to pkgs/by-name/gu/guile-sdl2/package.nix diff --git a/pkgs/development/guile-modules/guile-ssh/default.nix b/pkgs/by-name/gu/guile-ssh/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-ssh/default.nix rename to pkgs/by-name/gu/guile-ssh/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f4a1c9de583..d5bf8fc51552 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16773,36 +16773,10 @@ with pkgs; guile = guile_3_0; - guile-commonmark = callPackage ../development/guile-modules/guile-commonmark { }; - - guile-config = callPackage ../development/guile-modules/guile-config { }; - - guile-fibers = callPackage ../development/guile-modules/guile-fibers { }; - - guile-gcrypt = callPackage ../development/guile-modules/guile-gcrypt { }; - - guile-git = callPackage ../development/guile-modules/guile-git { }; - - guile-gnutls = callPackage ../development/guile-modules/guile-gnutls { }; - - guile-json = callPackage ../development/guile-modules/guile-json { }; - - guile-lib = callPackage ../development/guile-modules/guile-lib { }; - - guile-ncurses = callPackage ../development/guile-modules/guile-ncurses { }; - - guile-opengl = callPackage ../development/guile-modules/guile-opengl { }; - - guile-reader = callPackage ../development/guile-modules/guile-reader { }; - guile-sdl = callPackage ../by-name/gu/guile-sdl/package.nix { guile = guile_2_2; }; - guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { }; - - guile-ssh = callPackage ../development/guile-modules/guile-ssh { }; - guile-xcb = callPackage ../by-name/gu/guile-xcb/package.nix { guile = guile_2_2; };