Treewide: migrate guile packages to by-name (#346423)

NixOS · Oct 4, 2024 · 44de13c · 44de13c
2 parents 9282052 + f886811
commit 44de13c
Show file tree

Hide file tree

Showing 18 changed files with 3 additions and 32 deletions.
diff --git a/...evelopment/tools/guile/g-wrap/default.nix → pkgs/by-name/g-/g-wrap/package.nix b/...evelopment/tools/guile/g-wrap/default.nix → pkgs/by-name/g-/g-wrap/package.nix
diff --git a/...ent/guile-modules/guile-cairo/default.nix → pkgs/by-name/gu/guile-cairo/package.nix b/...ent/guile-modules/guile-cairo/default.nix → pkgs/by-name/gu/guile-cairo/package.nix
diff --git a/...uile-modules/guile-commonmark/default.nix → pkgs/by-name/gu/guile-commonmark/package.nix b/...uile-modules/guile-commonmark/default.nix → pkgs/by-name/gu/guile-commonmark/package.nix
diff --git a/...nt/guile-modules/guile-config/default.nix → pkgs/by-name/gu/guile-config/package.nix b/...nt/guile-modules/guile-config/default.nix → pkgs/by-name/gu/guile-config/package.nix
diff --git a/...nt/guile-modules/guile-fibers/default.nix → pkgs/by-name/gu/guile-fibers/package.nix b/...nt/guile-modules/guile-fibers/default.nix → pkgs/by-name/gu/guile-fibers/package.nix
diff --git a/...nt/guile-modules/guile-gcrypt/default.nix → pkgs/by-name/gu/guile-gcrypt/package.nix b/...nt/guile-modules/guile-gcrypt/default.nix → pkgs/by-name/gu/guile-gcrypt/package.nix
diff --git a/...pment/guile-modules/guile-git/default.nix → pkgs/by-name/gu/guile-git/package.nix b/...pment/guile-modules/guile-git/default.nix → pkgs/by-name/gu/guile-git/package.nix
diff --git a/...nt/guile-modules/guile-gnutls/default.nix → pkgs/by-name/gu/guile-gnutls/package.nix b/...nt/guile-modules/guile-gnutls/default.nix → pkgs/by-name/gu/guile-gnutls/package.nix
diff --git a/...opment/tools/guile/guile-hall/default.nix → pkgs/by-name/gu/guile-hall/package.nix b/...opment/tools/guile/guile-hall/default.nix → pkgs/by-name/gu/guile-hall/package.nix
diff --git a/...ment/guile-modules/guile-json/default.nix → pkgs/by-name/gu/guile-json/package.nix b/...ment/guile-modules/guile-json/default.nix → pkgs/by-name/gu/guile-json/package.nix
diff --git a/...pment/guile-modules/guile-lib/default.nix → pkgs/by-name/gu/guile-lib/package.nix b/...pment/guile-modules/guile-lib/default.nix → pkgs/by-name/gu/guile-lib/package.nix
diff --git a/...t/guile-modules/guile-ncurses/default.nix → pkgs/by-name/gu/guile-ncurses/package.nix b/...t/guile-modules/guile-ncurses/default.nix → pkgs/by-name/gu/guile-ncurses/package.nix
diff --git a/...nt/guile-modules/guile-opengl/default.nix → pkgs/by-name/gu/guile-opengl/package.nix b/...nt/guile-modules/guile-opengl/default.nix → pkgs/by-name/gu/guile-opengl/package.nix
diff --git a/...nt/guile-modules/guile-reader/default.nix → pkgs/by-name/gu/guile-reader/package.nix b/...nt/guile-modules/guile-reader/default.nix → pkgs/by-name/gu/guile-reader/package.nix
diff --git a/...ment/guile-modules/guile-sdl2/default.nix → pkgs/by-name/gu/guile-sdl2/package.nix b/...ment/guile-modules/guile-sdl2/default.nix → pkgs/by-name/gu/guile-sdl2/package.nix
diff --git a/...pment/guile-modules/guile-ssh/default.nix → pkgs/by-name/gu/guile-ssh/package.nix b/...pment/guile-modules/guile-ssh/default.nix → pkgs/by-name/gu/guile-ssh/package.nix
diff --git a/...pment/guile-modules/guile-xcb/default.nix → pkgs/by-name/gu/guile-xcb/package.nix b/...pment/guile-modules/guile-xcb/default.nix → pkgs/by-name/gu/guile-xcb/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -16773,39 +16773,11 @@ 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 { };
-
-  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 ../development/guile-modules/guile-xcb {
+  guile-xcb = callPackage ../by-name/gu/guile-xcb/package.nix {
     guile = guile_2_2;
   };
 
@@ -17851,9 +17823,8 @@ with pkgs;
 
   guff = callPackage ../tools/graphics/guff { };
 
-  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;
   };