diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/cawbird/default.nix similarity index 57% rename from pkgs/applications/networking/corebird/default.nix rename to pkgs/applications/networking/cawbird/default.nix index 73c0e234945e..edcf9b2846ed 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/cawbird/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_40 +{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala , meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection , glib-networking, python3 }: stdenv.mkDerivation rec { - version = "1.7.4"; - pname = "corebird"; + version = "1.0.1"; + pname = "cawbird"; src = fetchFromGitHub { - owner = "baedert"; - repo = "corebird"; - rev = version; - sha256 = "0qjffsmg1hm64dgsbkfwzbzy9q4xa1q4fh4h8ni8a2b1p3h80x7n"; + owner = "IBBoard"; + repo = "cawbird"; + rev = "v${version}"; + sha256 = "sha256:0bk33fh32nnv6ya6j0ij34abw6a3g6m8fq13303slhhja8xhvmb1"; }; nativeBuildInputs = [ - meson ninja vala_0_40 pkgconfig wrapGAppsHook python3 + meson ninja vala pkgconfig wrapGAppsHook python3 gobject-introspection # for setup hook ]; @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { patchShebangs data/meson_post_install.py ''; - meta = { + meta = with stdenv.lib; { description = "Native GTK Twitter client for the Linux desktop"; - longDescription = "Corebird is a modern, easy and fun Twitter client."; - homepage = https://corebird.baedert.org/; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.jonafato ]; + longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird."; + homepage = https://ibboard.co.uk/cawbird/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ jonafato schmittlauch ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9444de31e1c..29951a033fa9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1305,6 +1305,8 @@ in cardpeek = callPackage ../applications/misc/cardpeek { }; + cawbird = callPackage ../applications/networking/cawbird { }; + cde = callPackage ../tools/package-management/cde { }; cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; @@ -1379,7 +1381,7 @@ in copyright-update = callPackage ../tools/text/copyright-update { }; - corebird = callPackage ../applications/networking/corebird { }; + corebird = throw "corebird has been discontinued, use cawbird instead"; inherit (callPackage ../tools/misc/coreboot-utils { }) msrtool