diff --git a/pkgs/applications/misc/sfwbar/default.nix b/pkgs/by-name/sf/sfwbar/package.nix similarity index 50% rename from pkgs/applications/misc/sfwbar/default.nix rename to pkgs/by-name/sf/sfwbar/package.nix index bc96dbe2c317..712040333536 100644 --- a/pkgs/applications/misc/sfwbar/default.nix +++ b/pkgs/by-name/sf/sfwbar/package.nix @@ -1,28 +1,31 @@ -{ lib -, stdenv -, fetchFromGitHub -, gtk3 -, meson -, ninja -, json_c -, pkg-config -, gtk-layer-shell -, libpulseaudio -, libmpdclient -, libxkbcommon -, alsa-lib -, makeWrapper -, +{ + lib, + stdenv, + fetchFromGitHub, + gtk3, + meson, + ninja, + json_c, + pkg-config, + gtk-layer-shell, + libpulseaudio, + libmpdclient, + libxkbcommon, + alsa-lib, + makeWrapper, }: -stdenv.mkDerivation rec { +let + version = "1.0_beta14"; +in +stdenv.mkDerivation { pname = "sfwbar"; - version = "1.0_beta13"; + inherit version; src = fetchFromGitHub { owner = "LBCrion"; - repo = pname; + repo = "sfwbar"; rev = "v${version}"; - hash = "sha256-7oiuTEqdXDReKdakJX6+HRaSi1XovM+MkHFkaFZtq64="; + hash = "sha256-4brP1SXaWq/L0D87rvlrWhLU1oFPSwNNxBSzRr4jsTM="; }; buildInputs = [ @@ -47,12 +50,16 @@ stdenv.mkDerivation rec { --suffix XDG_DATA_DIRS : $out/share ''; - meta = with lib; { + meta = { homepage = "https://github.com/LBCrion/sfwbar"; description = "Flexible taskbar application for wayland compositors, designed with a stacking layout in mind"; + changelog = "https://github.com/LBCrion/sfwbar/releases/tag/v${version}"; mainProgram = "sfwbar"; - platforms = platforms.linux; - maintainers = with maintainers; [ NotAShelf ]; - license = licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + NotAShelf + ]; + license = lib.licenses.gpl3Only; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index adba1c835f36..1c54520cd46b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31565,8 +31565,6 @@ with pkgs; singularity-overriden-nixos ; - sfwbar = callPackage ../applications/misc/sfwbar { }; - skate = callPackage ../applications/misc/skate { }; slack = callPackage ../applications/networking/instant-messengers/slack { };