From fb44aa17bfdb419d757921c81c9558bfd05e2307 Mon Sep 17 00:00:00 2001 From: Taliyah Webb Date: Sat, 22 Mar 2025 17:14:12 +0100 Subject: [PATCH 1/6] maintainers: add taliyahwebb --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 78e17406ca4d..c60e74db30e9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23319,6 +23319,12 @@ } ]; }; + taliyahwebb = { + email = "taliyahmail@proton.me"; + github = "taliyahwebb"; + githubId = 161863235; + name = "Taliyah Webb"; + }; talkara = { email = "taito.horiuchi@relexsolutions.com"; github = "talkara"; From 3fa013536773bf3a9db64579a8175df56b20b50c Mon Sep 17 00:00:00 2001 From: Taliyah Webb Date: Sat, 22 Mar 2025 17:16:51 +0100 Subject: [PATCH 2/6] xdragon: add taliyahwebb as maintainer --- pkgs/tools/X11/xdragon/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/xdragon/default.nix b/pkgs/tools/X11/xdragon/default.nix index 9fa790b2048b..f501d3a5380d 100644 --- a/pkgs/tools/X11/xdragon/default.nix +++ b/pkgs/tools/X11/xdragon/default.nix @@ -29,7 +29,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Simple drag-and-drop source/sink for X or Wayland (called dragon in upstream)"; homepage = "https://github.com/mwh/dragon"; license = licenses.gpl3; - maintainers = with maintainers; [ das_j ]; + maintainers = with maintainers; [ + das_j + taliyahwebb + ]; mainProgram = "xdragon"; }; }) From f8545ffcad1f04b8e7a05706b1dc4a1d8720ac3f Mon Sep 17 00:00:00 2001 From: Taliyah Webb Date: Sat, 22 Mar 2025 17:34:40 +0100 Subject: [PATCH 3/6] xdragon: license gpl3 -> gpl3Plus gpl3 as license identifier is deprecated --- pkgs/tools/X11/xdragon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/X11/xdragon/default.nix b/pkgs/tools/X11/xdragon/default.nix index f501d3a5380d..9af7cffc4c03 100644 --- a/pkgs/tools/X11/xdragon/default.nix +++ b/pkgs/tools/X11/xdragon/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Simple drag-and-drop source/sink for X or Wayland (called dragon in upstream)"; homepage = "https://github.com/mwh/dragon"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ das_j taliyahwebb From a9c22aa99aa055c6131563974533d588f3786548 Mon Sep 17 00:00:00 2001 From: Taliyah Webb Date: Sat, 22 Mar 2025 17:45:40 +0100 Subject: [PATCH 4/6] xdragon: manual migration to pkgs/by-name --- .../X11/xdragon/default.nix => by-name/xd/xdragon/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{tools/X11/xdragon/default.nix => by-name/xd/xdragon/package.nix} (100%) diff --git a/pkgs/tools/X11/xdragon/default.nix b/pkgs/by-name/xd/xdragon/package.nix similarity index 100% rename from pkgs/tools/X11/xdragon/default.nix rename to pkgs/by-name/xd/xdragon/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b93992f27b4..08372eab1c4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17701,7 +17701,7 @@ with pkgs; stdenv = gccStdenv; }; - xdragon = lowPrio (callPackage ../tools/X11/xdragon { }); + xdragon = lowPrio (callPackage ../by-name/xd/xdragon/package.nix { }); sail-riscv = callPackage ../applications/virtualization/sail-riscv { inherit (ocamlPackages) sail; From 3fd97beff1214436f4ca867629ce8f445ef9d11b Mon Sep 17 00:00:00 2001 From: Taliyah Webb Date: Sat, 22 Mar 2025 17:57:40 +0100 Subject: [PATCH 5/6] xdragon: rename -> dragon-drop mwh/dragon#17 nominates 'dragon-drop' as disambiguation (https://github.com/mwh/dragon/issues/17#issuecomment-947332142) xdragon alias for compatibility 'dragon' binary removal pkg upstream suggests to use the disambiguating name exclusively top-level/all-packages.nix lowPrio lowPrio was introduced because kdePackages.dragon also produces a 'dragon' binary (no longer needed, see above). --- doc/release-notes/rl-2505.section.md | 4 ++++ pkgs/by-name/{xd/xdragon => dr/dragon-drop}/package.nix | 7 ++++--- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 9 insertions(+), 5 deletions(-) rename pkgs/by-name/{xd/xdragon => dr/dragon-drop}/package.nix (83%) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index e386ead66797..229fec645214 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -21,6 +21,10 @@ - [testers.shellcheck](https://nixos.org/manual/nixpkgs/unstable/#tester-shellcheck) now warns when `name` is not provided. The `name` argument will become mandatory in a future release. +- `xdragon` package has been renamed to `dragon-drop`. + `xdragon` is an alias to `dragon-drop` and the package still provides `bin/xdragon`. + `bin/dragon` is no longer supplied. + - The `nixLog*` family of functions made available through the standard environment have been rewritten to prefix messages with both the debug level and the function name of the caller. The `nixLog` function, which logs unconditionally, was also re-introduced and modified to prefix messages with the function name of the caller. For more information, [see this PR](https://github.com/NixOS/nixpkgs/pull/370742). diff --git a/pkgs/by-name/xd/xdragon/package.nix b/pkgs/by-name/dr/dragon-drop/package.nix similarity index 83% rename from pkgs/by-name/xd/xdragon/package.nix rename to pkgs/by-name/dr/dragon-drop/package.nix index 9af7cffc4c03..681f0fdee4d9 100644 --- a/pkgs/by-name/xd/xdragon/package.nix +++ b/pkgs/by-name/dr/dragon-drop/package.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "xdragon"; + pname = "dragon-drop"; version = "1.2.0"; src = fetchFromGitHub { @@ -20,9 +20,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 ]; + makeFlags = [ "NAME=dragon-drop" ]; installFlags = [ "PREFIX=${placeholder "out"}" ]; postInstall = '' - ln -s $out/bin/dragon $out/bin/xdragon + ln -s $out/bin/dragon-drop $out/bin/xdragon ''; meta = with lib; { @@ -33,6 +34,6 @@ stdenv.mkDerivation (finalAttrs: { das_j taliyahwebb ]; - mainProgram = "xdragon"; + mainProgram = "dragon-drop"; }; }) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d4b0ff8e5800..cf450932937e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1700,6 +1700,7 @@ mapAliases { xbmc-retroarch-advanced-launchers = throw "'xbmc-retroarch-advanced-launchers' has been renamed to/replaced by 'kodi-retroarch-advanced-launchers'"; # Converted to throw 2024-10-17 xboxdrv = throw "'xboxdrv' has been dropped as it has been superseded by an in-tree kernel driver"; # Added 2024-12-25 xdg_utils = throw "'xdg_utils' has been renamed to/replaced by 'xdg-utils'"; # Converted to throw 2024-10-17 + xdragon = dragon-drop; # Added 2025-03-22 xen-light = throw "'xen-light' has been renamed to/replaced by 'xen-slim'"; # Added 2024-06-30 xen-slim = throw "'xen-slim' has been renamed to 'xen'. The old Xen package with built-in components no longer exists"; # Added 2024-10-05 xen_4_16 = throw "While Xen 4.16 was still security-supported when it was removed from Nixpkgs, it would have reached its End of Life a couple of days after NixOS 24.11 released. To avoid shipping an insecure version of Xen, the Xen Project Hypervisor Maintenance Team decided to delete the derivation entirely"; # Added 2024-10-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08372eab1c4a..a86d836625f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17701,8 +17701,6 @@ with pkgs; stdenv = gccStdenv; }; - xdragon = lowPrio (callPackage ../by-name/xd/xdragon/package.nix { }); - sail-riscv = callPackage ../applications/virtualization/sail-riscv { inherit (ocamlPackages) sail; }; From 97275788212e851dd463eae166ba6734a6f9dd9e Mon Sep 17 00:00:00 2001 From: Taliyah Webb Date: Mon, 24 Mar 2025 15:06:57 +0100 Subject: [PATCH 6/6] dragon-drop: add linux platform to meta --- pkgs/by-name/dr/dragon-drop/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dr/dragon-drop/package.nix b/pkgs/by-name/dr/dragon-drop/package.nix index 681f0fdee4d9..9a3f5a7e64a2 100644 --- a/pkgs/by-name/dr/dragon-drop/package.nix +++ b/pkgs/by-name/dr/dragon-drop/package.nix @@ -26,14 +26,15 @@ stdenv.mkDerivation (finalAttrs: { ln -s $out/bin/dragon-drop $out/bin/xdragon ''; - meta = with lib; { + meta = { description = "Simple drag-and-drop source/sink for X or Wayland (called dragon in upstream)"; homepage = "https://github.com/mwh/dragon"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ das_j taliyahwebb ]; mainProgram = "dragon-drop"; + platforms = lib.platforms.linux; }; })