Unverified Commit 3fd97bef authored by Taliyah Webb's avatar Taliyah Webb
Browse files

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).
parent a9c22aa9

doc/release-notes/rl-2505.section.md

+4 −0
Original line number Diff line number Diff line
@@ -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).

pkgs/by-name/xd/xdragon/package.nix→pkgs/by-name/dr/dragon-drop/package.nix

+4 −3
Original line number Diff line number Diff line
@@ -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";

  };

})

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -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;















  };