From b77b21970517d7a1207416a148b11196aecec45e Mon Sep 17 00:00:00 2001 From: sunder Date: Sat, 9 Dec 2023 11:42:50 +0300 Subject: [PATCH] rtfm: 0.2.2 -> 0.2.3 --- pkgs/applications/misc/rtfm/default.nix | 6 +++--- pkgs/applications/misc/rtfm/patches/make.patch | 17 ++++------------- pkgs/applications/misc/rtfm/shards.nix | 16 ++++++++-------- 3 files changed, 15 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/misc/rtfm/default.nix b/pkgs/applications/misc/rtfm/default.nix index 99f9a465e13d..e965c6810af5 100644 --- a/pkgs/applications/misc/rtfm/default.nix +++ b/pkgs/applications/misc/rtfm/default.nix @@ -18,14 +18,14 @@ let in crystal.buildCrystalPackage rec { pname = "rtfm"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "hugopl"; repo = "rtfm"; rev = "v${version}"; name = "rtfm"; - hash = "sha256-SmQq3hG94oV346dHtqTHC0xE4cWB3rspD3XXu+mSI8Q="; + hash = "sha256-ulv5US5EBBb0rK/Qaw8ZpHI4QwEQGlzscmAoe17946k="; }; patches = [ @@ -54,7 +54,7 @@ crystal.buildCrystalPackage rec { wrapGAppsHook4 gobject-introspection gi-crystal - ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ webkitgtk_6_0 diff --git a/pkgs/applications/misc/rtfm/patches/make.patch b/pkgs/applications/misc/rtfm/patches/make.patch index 503faf5245be..51b95575cd0d 100644 --- a/pkgs/applications/misc/rtfm/patches/make.patch +++ b/pkgs/applications/misc/rtfm/patches/make.patch @@ -1,5 +1,5 @@ ---- a/Makefile 2023-07-17 17:18:28.000000000 +0300 -+++ b/Makefile 2023-07-19 12:13:44.627168135 +0300 +--- a/Makefile 2023-12-07 23:37:38.984501858 +0300 ++++ b/Makefile 2023-12-07 23:47:52.884456064 +0300 @@ -4,8 +4,7 @@ all: configure .WAIT rtfm docsets @@ -10,16 +10,7 @@ rtfm: shards build --release -s rtfm -@@ -29,13 +28,15 @@ - install -D -m644 data/io.github.hugopl.rtfm.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/io.github.hugopl.rtfm.gschema.xml - # docsets - mkdir -p $(DESTDIR)$(PREFIX)/share/rtfm/docsets/ -- cp -rv data/Crystal.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/ -- cp -rv data/Gtk4.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/ -+ cp -r data/Crystal.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/ -+ cp -r data/Gtk4.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/ - # License - install -D -m0644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/rtfm/LICENSE +@@ -36,6 +35,8 @@ # Changelog install -D -m0644 CHANGELOG.md $(DESTDIR)$(PREFIX)/share/doc/rtfm/CHANGELOG.md gzip -9fn $(DESTDIR)$(PREFIX)/share/doc/rtfm/CHANGELOG.md @@ -27,4 +18,4 @@ + glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/rtfm \ No newline at end of file + rm -f $(DESTDIR)$(PREFIX)/bin/rtfm diff --git a/pkgs/applications/misc/rtfm/shards.nix b/pkgs/applications/misc/rtfm/shards.nix index f6882397d83f..0a7ce34cda62 100644 --- a/pkgs/applications/misc/rtfm/shards.nix +++ b/pkgs/applications/misc/rtfm/shards.nix @@ -11,13 +11,13 @@ }; gio = { url = "https://github.com/hugopl/gio.cr.git"; - rev = "v0.1.0"; - sha256 = "0vj35bi64d4hni18nrl8fmms306a0gl4zlxpf3aq08lh0sbwzhd8"; + rev = "v0.2.1"; + sha256 = "0vl5lpvhhdi9pvyl12smag0i3dwj1jjz1zzilc8ai0wjrnbnwlxs"; }; gtk4 = { url = "https://github.com/hugopl/gtk4.cr.git"; - rev = "v0.15.0"; - sha256 = "100j5k4sfc2dpj3nplzjcaxw1bwy3hsy5cw93asg00kda9h8dbb1"; + rev = "v0.16.0"; + sha256 = "1bnnfy07246vwbjfwhziv2yw1g52pzhhrr25660fp3qcnw8q513w"; }; harfbuzz = { url = "https://github.com/hugopl/harfbuzz.cr.git"; @@ -26,13 +26,13 @@ }; libadwaita = { url = "https://github.com/geopjr/libadwaita.cr.git"; - rev = "23ce21d6400af7563ede0b53deea6d1f77436985"; - sha256 = "09jz6r0yp4qsm47qcknzgkjxavr5j3dkxf2yjbw0jkaz1an58pfw"; + rev = "cffabb56e911d2a90c53c2fd14d6bd08bf5ac446"; + sha256 = "0gcq04vgxg0vff9fcalgzq9phq0y76diihkzhlfn91bdxwkx7rl3"; }; pango = { url = "https://github.com/hugopl/pango.cr.git"; - rev = "v0.2.0"; - sha256 = "0dl3qrhi2ybylmvzx1x5gsznp2pcdkc50waxrljxwnf5avn8ixsf"; + rev = "v0.3.0"; + sha256 = "1dg5bcbq11zww4xh68dq4ivnsz89yqsnxz81ggp4j9c9d6dhx0m4"; }; sqlite3 = { url = "https://github.com/crystal-lang/crystal-sqlite3.git";