From 34b1c1f92f7ac6928b301a2b039d5b50332fe2a7 Mon Sep 17 00:00:00 2001 From: Dusk Banks Date: Thu, 4 Jul 2024 00:13:49 -0700 Subject: [PATCH] treewide: migrate bb010g's packages to by-name --- .../be/betterdiscordctl/package.nix} | 0 .../git-my/default.nix => by-name/gi/git-my/package.nix} | 0 .../libraries/java => by-name/sw}/swt/awt-libs.patch | 0 .../libraries/java => by-name/sw}/swt/gtk-libs.patch | 0 .../java/swt/default.nix => by-name/sw/swt/package.nix} | 0 pkgs/top-level/all-packages.nix | 7 +------ 6 files changed, 1 insertion(+), 6 deletions(-) rename pkgs/{tools/misc/betterdiscordctl/default.nix => by-name/be/betterdiscordctl/package.nix} (100%) rename pkgs/{applications/version-management/git-my/default.nix => by-name/gi/git-my/package.nix} (100%) rename pkgs/{development/libraries/java => by-name/sw}/swt/awt-libs.patch (100%) rename pkgs/{development/libraries/java => by-name/sw}/swt/gtk-libs.patch (100%) rename pkgs/{development/libraries/java/swt/default.nix => by-name/sw/swt/package.nix} (100%) diff --git a/pkgs/tools/misc/betterdiscordctl/default.nix b/pkgs/by-name/be/betterdiscordctl/package.nix similarity index 100% rename from pkgs/tools/misc/betterdiscordctl/default.nix rename to pkgs/by-name/be/betterdiscordctl/package.nix diff --git a/pkgs/applications/version-management/git-my/default.nix b/pkgs/by-name/gi/git-my/package.nix similarity index 100% rename from pkgs/applications/version-management/git-my/default.nix rename to pkgs/by-name/gi/git-my/package.nix diff --git a/pkgs/development/libraries/java/swt/awt-libs.patch b/pkgs/by-name/sw/swt/awt-libs.patch similarity index 100% rename from pkgs/development/libraries/java/swt/awt-libs.patch rename to pkgs/by-name/sw/swt/awt-libs.patch diff --git a/pkgs/development/libraries/java/swt/gtk-libs.patch b/pkgs/by-name/sw/swt/gtk-libs.patch similarity index 100% rename from pkgs/development/libraries/java/swt/gtk-libs.patch rename to pkgs/by-name/sw/swt/gtk-libs.patch diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/by-name/sw/swt/package.nix similarity index 100% rename from pkgs/development/libraries/java/swt/default.nix rename to pkgs/by-name/sw/swt/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 415053c03d0a..94a24380f6b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2349,8 +2349,6 @@ with pkgs; git-mit = callPackage ../applications/version-management/git-mit { }; - git-my = callPackage ../applications/version-management/git-my { }; - git-machete = python3Packages.callPackage ../applications/version-management/git-machete { }; git-nomad = callPackage ../applications/version-management/git-nomad { }; @@ -3332,8 +3330,6 @@ with pkgs; berglas = callPackage ../tools/admin/berglas { }; - betterdiscordctl = callPackage ../tools/misc/betterdiscordctl { }; - betterdiscord-installer = callPackage ../tools/misc/betterdiscord-installer { }; binocle = callPackage ../applications/misc/binocle { @@ -24980,8 +24976,7 @@ with pkgs; smack = callPackage ../development/libraries/java/smack { }; - swt = callPackage ../development/libraries/java/swt { }; - swt_jdk8 = callPackage ../development/libraries/java/swt { + swt_jdk8 = callPackage ../by-name/sw/swt/package.nix { jdk = jdk8; };