From 284e71527761ee75c6676f1e526605863a3b8edd Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 12 May 2021 09:12:59 -0300 Subject: [PATCH 1/4] taxi: 0.0.1 -> 0.0.1-unstable=2020-09-03 --- .../networking/ftp/taxi/default.nix | 49 ++++++++++++------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index 9e6ee864137..66692f96c66 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -1,33 +1,48 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, pantheon, pkg-config, meson, ninja, python3, vala -, gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }: +{ lib +, stdenv +, fetchFromGitHub +, gobject-introspection +, gtk3 +, libgee +, libsecret +, libsoup +, meson +, ninja +, nix-update-script +, pantheon +, pkg-config +, python3 +, vala +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "taxi"; - version = "0.0.1"; + version = "0.0.1-unstable=2020-09-03"; src = fetchFromGitHub { owner = "Alecaddd"; repo = pname; - rev = "v${version}"; - sha256 = "01c552w68576pnsyqbwy3hjhbww6vys3r3s0wxjdiscjqj1aawqg"; + rev = "74aade67fd9ba9e5bc10c950ccd8d7e48adc2ea1"; + sha256 = "sha256-S/FeKJxIdA30CpfFVrQsALdq7Gy4F4+P50Ky5tmqKvM="; }; nativeBuildInputs = [ - vala gobject-introspection meson ninja pkg-config python3 + vala wrapGAppsHook ]; buildInputs = [ - pantheon.granite - libgee gtk3 + libgee libsecret libsoup + pantheon.granite ]; postPatch = '' @@ -35,17 +50,15 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + meta = with lib; { + homepage = "https://github.com/Alecaddd/taxi"; + description = "The FTP Client that drives you anywhere"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; }; - meta = with lib; { - description = "The FTP Client that drives you anywhere"; - homepage = "https://github.com/Alecaddd/taxi"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + passthru.updateScript = nix-update-script { + attrPath = pname; }; } From 9cb3114a547a7234b341bb01caa811707cba831e Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 12 May 2021 09:08:50 -0300 Subject: [PATCH 2/4] celluloid: 0.20 -> 0.21 Also, adopts from worldofpeace (in memoriam?). --- pkgs/applications/video/celluloid/default.nix | 52 +++++++++---------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index 838d306c685..f6bc0561b0c 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -1,42 +1,42 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, nix-update-script -, meson -, ninja -, python3 -, gettext -, pkg-config -, desktop-file-utils -, wrapGAppsHook , appstream-glib +, desktop-file-utils , epoxy +, gettext , glib , gtk3 +, meson , mpv +, ninja +, nix-update-script +, pkg-config +, python3 +, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "celluloid"; - version = "0.20"; + version = "0.21"; src = fetchFromGitHub { owner = "celluloid-player"; repo = "celluloid"; rev = "v${version}"; - hash = "sha256-fEZnH8EqU6CykgKINXnKChuBUlisroa97B1vjcx2cWA="; + hash = "sha256-1Jeg1uqWxURGKR/Xg4j4roZ9Pg5MR7geyttdzlOU+rA="; }; nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gettext meson ninja - python3 - appstream-glib - gettext pkg-config - desktop-file-utils + python3 wrapGAppsHook ]; - buildInputs = [ epoxy glib @@ -50,22 +50,20 @@ stdenv.mkDerivation rec { doCheck = true; - passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; - }; - meta = with lib; { + homepage = "https://github.com/celluloid-player/celluloid"; description = "Simple GTK frontend for the mpv video player"; longDescription = '' - GNOME MPV interacts with mpv via the client API exported by libmpv, - allowing access to mpv's powerful playback capabilities through an - easy-to-use user interface. + Celluloid (formerly GNOME MPV) is a simple GTK+ frontend for mpv. + Celluloid interacts with mpv via the client API exported by libmpv, + allowing access to mpv's powerful playback capabilities. ''; - homepage = "https://github.com/celluloid-player/celluloid"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; } From ac31cfa66b578e7e0a2b1021e63c65384c2b5db4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 12 May 2021 09:11:46 -0300 Subject: [PATCH 3/4] fondo: adoption --- pkgs/applications/graphics/fondo/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index 34dd4926a49..c2cb4c92d47 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -57,18 +58,15 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; - }; - - meta = with lib; { - description = "Find the most beautiful wallpapers for your desktop"; homepage = "https://github.com/calo001/fondo"; + description = "Find the most beautiful wallpapers for your desktop"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; } From 8352b700e9efdbbdf2fe7fcc1be5f08a07a1c5f4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 12 May 2021 09:12:27 -0300 Subject: [PATCH 4/4] notejot: 1.6.3 -> 3.0.4 --- pkgs/applications/misc/notejot/default.nix | 46 ++++++++++++++-------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 724d9285ec2..bd30fa2bb21 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -1,15 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, vala, pkg-config, meson, ninja, python3, pantheon -, gtk3, gtksourceview, json-glib, libgee, wrapGAppsHook }: +{ lib +, stdenv +, fetchFromGitHub +, gtk4 +, gtksourceview +, json-glib +, libadwaita +, libgee +, meson +, ninja +, nix-update-script +, pantheon +, pkg-config +, python3 +, vala +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "notejot"; - version = "1.6.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "170dzgd6cnf2k3hfifjysmdggpskx6v1pjmblqgbwaj2d3snf3h8"; + hash = "sha256-p8rca3PsnT/3Lp6W30VvqR9aPr6EIuNrH5gsxL0lZ0Q="; }; nativeBuildInputs = [ @@ -20,31 +35,30 @@ stdenv.mkDerivation rec { python3 wrapGAppsHook ]; - buildInputs = [ - gtk3 + gtk4 gtksourceview json-glib + libadwaita libgee pantheon.elementary-icon-theme pantheon.granite ]; postPatch = '' - patchShebangs meson/post_install.py + chmod +x build-aux/post_install.py + patchShebangs build-aux/post_install.py ''; - passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; - }; - meta = with lib; { - description = "Stupidly-simple sticky notes applet"; homepage = "https://github.com/lainsce/notejot"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + description = "Stupidly-simple sticky notes applet"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; }