tijolo: 0.7.4 → 0.8.1 (#312817)

authored by sunder and committed by GitHub 33696fc5 27954243

+53 -23
+25 -10
pkgs/applications/editors/tijolo/default.nix
··· 2 2 , lib 3 3 , fetchFromGitHub 4 4 , crystal 5 - , vte 5 + , vte-gtk4 6 6 , libgit2 7 + , gtk4 8 + , libadwaita 7 9 , editorconfig-core-c 8 - , gtksourceview4 9 - , wrapGAppsHook3 10 + , gtksourceview5 11 + , wrapGAppsHook4 12 + , gobject-introspection 10 13 , desktopToDarwinBundle 11 14 }: 15 + 12 16 crystal.buildCrystalPackage rec { 13 17 pname = "tijolo"; 14 - version = "0.7.4"; 18 + version = "0.8.1"; 15 19 16 20 src = fetchFromGitHub { 17 21 owner = "hugopl"; 18 22 repo = "tijolo"; 19 23 rev = "v${version}"; 20 - hash = "sha256-3TfXvRVP3lu43qF3RWCHnZ3czTaSl5EzrhuTlpnMfKo="; 24 + hash = "sha256-+sRcS5bVH6WLmSDLiPw608OB6OjBVwLqWxGT5Y6caBc="; 21 25 }; 22 26 23 - nativeBuildInputs = [ wrapGAppsHook3 ] 27 + postPatch = '' 28 + substituteInPlace Makefile \ 29 + --replace-fail "shards install" "true" 30 + ''; 31 + 32 + shardsFile = ./shards.nix; 33 + copyShardDeps = true; 34 + 35 + preBuild = '' 36 + cd lib/gi-crystal && shards build -Dpreview_mt --release --no-debug 37 + cd ../.. && mkdir bin/ && cp lib/gi-crystal/bin/gi-crystal bin/ 38 + ''; 39 + 40 + nativeBuildInputs = [ wrapGAppsHook4 gobject-introspection ] 24 41 ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; 25 - buildInputs = [ vte libgit2 gtksourceview4 editorconfig-core-c ]; 42 + buildInputs = [ gtk4 libadwaita vte-gtk4 libgit2 gtksourceview5 editorconfig-core-c ]; 26 43 27 44 buildTargets = [ "all" ]; 28 45 doCheck = false; 29 46 30 - shardsFile = ./shards.nix; 31 - 32 - installTargets = [ "install" "install-fonts"]; 47 + installTargets = [ "install" "post-install" "install-fonts"]; 33 48 doInstallCheck = false; 34 49 35 50 meta = with lib; {
+28 -13
pkgs/applications/editors/tijolo/shards.nix
··· 1 1 { 2 - compiled_license = { 3 - url = "https://github.com/elorest/compiled_license.git"; 4 - rev = "v1.2.2"; 5 - sha256 = "1f412r6m31cc093lcw31m2rp5s3y7vh6q3wc3xh9b8vccvmj21p7"; 6 - }; 7 2 fzy = { 8 3 url = "https://github.com/hugopl/fzy.git"; 9 4 rev = "v0.5.5"; 10 5 sha256 = "1zk95m43ymx9ilwr6iw9l44nkmp4sas28ib0dkr07hkhgrkw68sv"; 11 6 }; 12 - gobject = { 13 - url = "https://github.com/jhass/crystal-gobject.git"; 14 - rev = "v0.10.0"; 15 - sha256 = "02cc3486ifbffdbvgl75ylwn47gpfb2j0srz92jx5yz1d596x746"; 7 + gi-crystal = { 8 + url = "https://github.com/hugopl/gi-crystal.git"; 9 + rev = "v0.22.2"; 10 + sha256 = "0bpa1f8iaf97z2kbgjc7nc8km7nd7bppiwna319lm2hvm8m5pw15"; 11 + }; 12 + gtk4 = { 13 + url = "https://github.com/hugopl/gtk4.cr.git"; 14 + rev = "v0.16.1"; 15 + sha256 = "1cqkbh072y70l8g0p040vf50k920p32ry1larnwn9mqabd74jwaj"; 16 + }; 17 + harfbuzz = { 18 + url = "https://github.com/hugopl/harfbuzz.cr.git"; 19 + rev = "v0.2.0"; 20 + sha256 = "06wgqxwyib5416yp53j2iwcbr3bl4jjxb1flm7z103l365par694"; 21 + }; 22 + libadwaita = { 23 + url = "https://github.com/geopjr/libadwaita.cr.git"; 24 + rev = "cffabb56e911d2a90c53c2fd14d6bd08bf5ac446"; 25 + sha256 = "0gcq04vgxg0vff9fcalgzq9phq0y76diihkzhlfn91bdxwkx7rl3"; 26 + }; 27 + pango = { 28 + url = "https://github.com/hugopl/pango.cr.git"; 29 + rev = "v0.3.1"; 30 + sha256 = "0xlf127flimnll875mcq92q7xsi975rrgdpcpmnrwllhdhfx9qmv"; 16 31 }; 17 32 toml = { 18 33 url = "https://github.com/crystal-community/toml.cr.git"; 19 34 rev = "v0.7.0"; 20 35 sha256 = "0vznx2irvx6m8w6chdf9ms72n2w0cf2m5cwh0cjmp1jz9y3xwv7z"; 21 36 }; 22 - version_from_shard = { 23 - url = "https://github.com/hugopl/version_from_shard.git"; 24 - rev = "v1.2.5"; 25 - sha256 = "0xizj0q4rd541rwjbx04cjifc2gfx4l5v6q2y7gmd0ndjmkgb8ik"; 37 + vte = { 38 + url = "https://github.com/hugopl/vte.cr.git"; 39 + rev = "v0.1.0"; 40 + sha256 = "18x2l9cm8czhwpdfng3rz00kn07c49y0555kf2j5l2wb0g05snh3"; 26 41 }; 27 42 }