Merge pull request #300050 from ianmjones/snippetexpander-1.0.2

snippetexpander: 1.0.1 -> 1.0.2

authored by Weijia Wang and committed by GitHub 92323443 74f7e19d

+57 -34
+16 -5
pkgs/by-name/sn/snippetexpander/package.nix
··· 1 { lib 2 , buildGoModule 3 , fetchFromSourcehut 4 , scdoc 5 , installShellFiles 6 , snippetexpanderd 7 }: 8 9 buildGoModule rec { ··· 11 12 pname = "snippetexpander"; 13 14 - vendorHash = "sha256-wSAho59yxcXTu1zQ5x783HT4gtfSM4GdsOEeC1wfHhE="; 15 16 proxyVendor = true; 17 18 modRoot = "cmd/snippetexpander"; 19 20 nativeBuildInputs = [ 21 scdoc 22 installShellFiles 23 ]; 24 25 buildInputs = [ 26 snippetexpanderd 27 ]; 28 29 ldflags = [ 30 "-s" 31 "-w" 32 ]; 33 34 postInstall = '' ··· 36 installManPage snippetexpander.1 37 ''; 38 39 - meta = with lib; { 40 description = "Your little expandable text snippet helper CLI"; 41 homepage = "https://snippetexpander.org"; 42 - license = licenses.gpl2Plus; 43 - maintainers = with maintainers; [ ianmjones ]; 44 - platforms = platforms.linux; 45 mainProgram = "snippetexpander"; 46 }; 47 }
··· 1 { lib 2 , buildGoModule 3 , fetchFromSourcehut 4 + , makeWrapper 5 , scdoc 6 , installShellFiles 7 , snippetexpanderd 8 + , snippetexpanderx 9 }: 10 11 buildGoModule rec { ··· 13 14 pname = "snippetexpander"; 15 16 + vendorHash = "sha256-W9NkENdZRzqSAONI9QS2EI5aERK+AaPqwYwITKLwXQE="; 17 18 proxyVendor = true; 19 20 modRoot = "cmd/snippetexpander"; 21 22 nativeBuildInputs = [ 23 + makeWrapper 24 scdoc 25 installShellFiles 26 ]; 27 28 buildInputs = [ 29 snippetexpanderd 30 + snippetexpanderx 31 ]; 32 33 ldflags = [ 34 "-s" 35 "-w" 36 + "-X 'main.version=${src.rev}'" 37 ]; 38 39 postInstall = '' ··· 41 installManPage snippetexpander.1 42 ''; 43 44 + postFixup = '' 45 + # Ensure snippetexpanderd and snippetexpanderx are available to start/stop. 46 + wrapProgram $out/bin/snippetexpander \ 47 + --prefix PATH : ${lib.makeBinPath [ snippetexpanderd snippetexpanderx ]} 48 + ''; 49 + 50 + meta = { 51 description = "Your little expandable text snippet helper CLI"; 52 homepage = "https://snippetexpander.org"; 53 + license = lib.licenses.gpl2Plus; 54 + maintainers = with lib.maintainers; [ ianmjones ]; 55 + platforms = lib.platforms.linux; 56 mainProgram = "snippetexpander"; 57 }; 58 }
+20 -14
pkgs/by-name/sn/snippetexpanderd/package.nix
··· 2 , stdenv 3 , buildGoModule 4 , fetchFromSourcehut 5 - , pkg-config 6 , makeWrapper 7 , scdoc 8 , installShellFiles 9 - , xorg 10 - , gtk3 11 }: 12 13 buildGoModule rec { 14 pname = "snippetexpanderd"; 15 - version = "1.0.1"; 16 17 src = fetchFromSourcehut { 18 owner = "~ianmjones"; 19 repo = "snippetexpander"; 20 rev = "v${version}"; 21 - hash = "sha256-y3TJ+L3kXYfZFzAD1vmhvP6Yarctu5LHq/74005h8sI="; 22 }; 23 24 - vendorHash = "sha256-QX8HI8I1ZJI6HJ1sl86OiJ4nxwFAjHH8h1zB9ASJaQs="; 25 26 modRoot = "cmd/snippetexpanderd"; 27 28 nativeBuildInputs = [ 29 - pkg-config 30 makeWrapper 31 scdoc 32 installShellFiles 33 ]; 34 35 buildInputs = [ 36 - xorg.libX11 37 - gtk3 38 ]; 39 40 ldflags = [ 41 "-s" 42 "-w" 43 ]; 44 45 postInstall = '' ··· 48 ''; 49 50 postFixup = '' 51 wrapProgram $out/bin/snippetexpanderd \ 52 - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 ]} 53 ''; 54 55 - meta = with lib; { 56 description = "Your little expandable text snippet helper daemon"; 57 homepage = "https://snippetexpander.org"; 58 - license = licenses.gpl2Plus; 59 - maintainers = with maintainers; [ ianmjones ]; 60 - platforms = platforms.linux; 61 mainProgram = "snippetexpanderd"; 62 }; 63 }
··· 2 , stdenv 3 , buildGoModule 4 , fetchFromSourcehut 5 , makeWrapper 6 , scdoc 7 , installShellFiles 8 + , xclip 9 + , wl-clipboard 10 + , xdotool 11 + , wtype 12 }: 13 14 buildGoModule rec { 15 pname = "snippetexpanderd"; 16 + version = "1.0.2"; 17 18 src = fetchFromSourcehut { 19 owner = "~ianmjones"; 20 repo = "snippetexpander"; 21 rev = "v${version}"; 22 + hash = "sha256-iEoBri+NuFfLkARUBA+D/Fe9xk6PPV62N/YRqPv9C/A="; 23 }; 24 25 + vendorHash = "sha256-W9NkENdZRzqSAONI9QS2EI5aERK+AaPqwYwITKLwXQE="; 26 + 27 + proxyVendor = true; 28 29 modRoot = "cmd/snippetexpanderd"; 30 31 nativeBuildInputs = [ 32 makeWrapper 33 scdoc 34 installShellFiles 35 ]; 36 37 buildInputs = [ 38 + xclip 39 + wl-clipboard 40 + xdotool 41 + wtype 42 ]; 43 44 ldflags = [ 45 "-s" 46 "-w" 47 + "-X 'main.version=${src.rev}'" 48 ]; 49 50 postInstall = '' ··· 53 ''; 54 55 postFixup = '' 56 + # Ensure xclip/wcopy and xdotool/wtype are available for copy and paste duties. 57 wrapProgram $out/bin/snippetexpanderd \ 58 + --prefix PATH : ${lib.makeBinPath [ xclip wl-clipboard xdotool wtype ]} 59 ''; 60 61 + meta = { 62 description = "Your little expandable text snippet helper daemon"; 63 homepage = "https://snippetexpander.org"; 64 + license = lib.licenses.gpl2Plus; 65 + maintainers = with lib.maintainers; [ ianmjones ]; 66 + platforms = lib.platforms.linux; 67 mainProgram = "snippetexpanderd"; 68 }; 69 }
+15 -11
pkgs/by-name/sn/snippetexpandergui/package.nix
··· 1 { lib 2 , buildGoModule 3 , fetchFromSourcehut 4 - , makeWrapper 5 , wails 6 , scdoc 7 , installShellFiles ··· 10 , webkitgtk 11 , gsettings-desktop-schemas 12 , snippetexpanderd 13 }: 14 15 buildGoModule rec { ··· 17 18 pname = "snippetexpandergui"; 19 20 - vendorHash = "sha256-iZfZdT8KlfZMVLQcYmo6EooIdsSGrpO/ojwT9Ft1GQI="; 21 22 proxyVendor = true; 23 24 modRoot = "cmd/snippetexpandergui"; 25 26 nativeBuildInputs = [ 27 - makeWrapper 28 wails 29 scdoc 30 installShellFiles 31 ]; 32 33 buildInputs = [ 34 xorg.libX11 35 gtk3 36 webkitgtk 37 - gsettings-desktop-schemas 38 snippetexpanderd 39 ]; 40 41 ldflags = [ 42 "-s" 43 "-w" 44 ]; 45 46 tags = [ ··· 54 installManPage snippetexpandergui.1 55 ''; 56 57 - postFixup = '' 58 - wrapProgram $out/bin/snippetexpandergui \ 59 - --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name} 60 ''; 61 62 - meta = with lib; { 63 description = "Your little expandable text snippet helper GUI"; 64 homepage = "https://snippetexpander.org"; 65 - license = licenses.gpl2Plus; 66 - maintainers = with maintainers; [ ianmjones ]; 67 - platforms = platforms.linux; 68 mainProgram = "snippetexpandergui"; 69 }; 70 }
··· 1 { lib 2 , buildGoModule 3 , fetchFromSourcehut 4 + , wrapGAppsHook 5 , wails 6 , scdoc 7 , installShellFiles ··· 10 , webkitgtk 11 , gsettings-desktop-schemas 12 , snippetexpanderd 13 + , snippetexpanderx 14 }: 15 16 buildGoModule rec { ··· 18 19 pname = "snippetexpandergui"; 20 21 + vendorHash = "sha256-W9NkENdZRzqSAONI9QS2EI5aERK+AaPqwYwITKLwXQE="; 22 23 proxyVendor = true; 24 25 modRoot = "cmd/snippetexpandergui"; 26 27 nativeBuildInputs = [ 28 wails 29 scdoc 30 installShellFiles 31 + wrapGAppsHook 32 ]; 33 34 buildInputs = [ 35 xorg.libX11 36 gtk3 37 webkitgtk 38 snippetexpanderd 39 + snippetexpanderx 40 ]; 41 42 ldflags = [ 43 "-s" 44 "-w" 45 + "-X 'main.version=${src.rev}'" 46 ]; 47 48 tags = [ ··· 56 installManPage snippetexpandergui.1 57 ''; 58 59 + preFixup = '' 60 + gappsWrapperArgs+=( 61 + # Ensure snippetexpanderd and snippetexpanderx are available to start/stop. 62 + --prefix PATH : ${lib.makeBinPath [ snippetexpanderd snippetexpanderx ]} 63 + ) 64 ''; 65 66 + meta = { 67 description = "Your little expandable text snippet helper GUI"; 68 homepage = "https://snippetexpander.org"; 69 + license = lib.licenses.gpl2Plus; 70 + maintainers = with lib.maintainers; [ ianmjones ]; 71 + platforms = lib.platforms.linux; 72 mainProgram = "snippetexpandergui"; 73 }; 74 }
+6 -4
pkgs/by-name/sn/snippetexpanderx/package.nix
··· 42 snippetexpanderd 43 ]; 44 45 installPhase = '' 46 runHook preInstall 47 mkdir -p $out/bin ··· 53 # There are no tests. 54 doCheck = false; 55 56 - meta = with lib; { 57 description = "Your little expandable text snippet helper auto expander daemon"; 58 homepage = "https://snippetexpander.org"; 59 - license = licenses.gpl2Plus; 60 - maintainers = with maintainers; [ ianmjones ]; 61 - platforms = platforms.linux; 62 mainProgram = "snippetexpanderx"; 63 }; 64 }
··· 42 snippetexpanderd 43 ]; 44 45 + makeFlags = [ "VERSION=${src.rev}" ]; 46 + 47 installPhase = '' 48 runHook preInstall 49 mkdir -p $out/bin ··· 55 # There are no tests. 56 doCheck = false; 57 58 + meta = { 59 description = "Your little expandable text snippet helper auto expander daemon"; 60 homepage = "https://snippetexpander.org"; 61 + license = lib.licenses.gpl2Plus; 62 + maintainers = with lib.maintainers; [ ianmjones ]; 63 + platforms = lib.platforms.linux; 64 mainProgram = "snippetexpanderx"; 65 }; 66 }