Unverified Commit d0ce043a authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #296213 from donovanglover/hyprdim-hyprnome 

hyprdim, hyprnome: cleanup
parents 5ebdb3ed 489e9a86

pkgs/applications/misc/hyprdim/default.nix→pkgs/by-name/hy/hyprdim/package.nix

+10 −11
Original line number Diff line number Diff line 
{ lib

, rustPlatform

, fetchFromGitHub

, installShellFiles

, nix-update-script

{

  lib,

  rustPlatform,

  fetchFromGitHub,

  installShellFiles,

  nix-update-script,

}:



rustPlatform.buildRustPackage rec {
@@ -18,17 +19,15 @@ rustPlatform.buildRustPackage rec { 


  cargoHash = "sha256-hgcGzRLB1L3yxJjw1ECDJPmbl1W+2OS4KDojclyVYrc=";



  nativeBuildInputs = [

    installShellFiles

  ];

  nativeBuildInputs = [ installShellFiles ];



  postInstall = ''

    installManPage target/man/hyprdim.1



    installShellCompletion --cmd hyprdim \

      --bash <(cat target/completions/hyprdim.bash) \

      --fish <(cat target/completions/hyprdim.fish) \

      --zsh <(cat target/completions/_hyprdim)

      --bash target/completions/hyprdim.bash \

      --fish target/completions/hyprdim.fish \

      --zsh target/completions/_hyprdim

  '';



  passthru.updateScript = nix-update-script { };

pkgs/applications/misc/hyprnome/default.nix→pkgs/by-name/hy/hyprnome/package.nix

+10 −11
Original line number Diff line number Diff line 
{ lib

, rustPlatform

, fetchFromGitHub

, installShellFiles

, nix-update-script

{

  lib,

  rustPlatform,

  fetchFromGitHub,

  installShellFiles,

  nix-update-script,

}:



rustPlatform.buildRustPackage rec {
@@ -18,17 +19,15 @@ rustPlatform.buildRustPackage rec { 


  cargoHash = "sha256-DpbRs97sr5wpJSrYF99ZiQ0SZOZdoQjfaLhKIAU95HA=";



  nativeBuildInputs = [

    installShellFiles

  ];

  nativeBuildInputs = [ installShellFiles ];



  postInstall = ''

    installManPage target/man/hyprnome.1



    installShellCompletion --cmd hyprnome \

      --bash <(cat target/completions/hyprnome.bash) \

      --fish <(cat target/completions/hyprnome.fish) \

      --zsh <(cat target/completions/_hyprnome)

      --bash target/completions/hyprnome.bash \

      --fish target/completions/hyprnome.fish \

      --zsh target/completions/_hyprnome

  '';



  passthru.updateScript = nix-update-script { };

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -5631,8 +5631,6 @@ with pkgs; 
  hypr = callPackage ../applications/window-managers/hyprwm/hypr {

    cairo = cairo.override { xcbSupport = true; };  };













  hyprdim = callPackage ../applications/misc/hyprdim { };



























  hyprland = callPackage ../applications/window-managers/hyprwm/hyprland {















    wlroots = callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { };















    udis86 = callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { };









@@ -5644,8 +5642,6 @@ with pkgs;



























  hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { };



























  hyprnome = callPackage ../applications/misc/hyprnome { };



























  hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { };





























  hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker {