From e18c1528d0d1908884e39b11b5d8edc358aa08a4 Mon Sep 17 00:00:00 2001 From: Colin Arnott Date: Mon, 7 Nov 2022 17:50:35 +0000 Subject: [PATCH] emoji-picker: init at 0.2.0 There is an upstream bug with golang.org/x/sys, that requires we upgrade to 0.1.0, and this change forces us to move the go minimum version to 1.17. All of this is done via patch, and can be rolled back when upstream merges bcongdon/ep#7. Fixes #191952 --- .../misc/emoji-picker/default.nix | 27 ++++++++ .../applications/misc/emoji-picker/xsys.patch | 63 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 92 insertions(+) create mode 100644 pkgs/applications/misc/emoji-picker/default.nix create mode 100644 pkgs/applications/misc/emoji-picker/xsys.patch diff --git a/pkgs/applications/misc/emoji-picker/default.nix b/pkgs/applications/misc/emoji-picker/default.nix new file mode 100644 index 00000000000..a0475bc9437 --- /dev/null +++ b/pkgs/applications/misc/emoji-picker/default.nix @@ -0,0 +1,27 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: +buildGoModule rec { + pname = "emoji-picker"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "bcongdon"; + repo = "ep"; + rev = version; + hash = "sha256-ElUsmuJ43kOsu4cGvNytM+xHTfuzMo0jcG8Z1cIeHJs="; + }; + + patches = [./xsys.patch]; + + vendorHash = "sha256-Xeh5JKIBiyOXRGVx9udoUNs+Wv49BMyFvmnAbDfG3rA="; + + meta = with lib; { + description = "A CLI Emoji Picker"; + homepage = "https://github.com/bcongdon/ep"; + license = licenses.mit; + maintainers = with maintainers; [ urandom ]; + mainProgram = "ep"; + }; +} diff --git a/pkgs/applications/misc/emoji-picker/xsys.patch b/pkgs/applications/misc/emoji-picker/xsys.patch new file mode 100644 index 00000000000..ef43a211f4e --- /dev/null +++ b/pkgs/applications/misc/emoji-picker/xsys.patch @@ -0,0 +1,63 @@ +diff --git a/go.mod b/go.mod +index ce4c67d..fcd88f6 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,12 +1,22 @@ + module github.com/bcongdon/ep + +-go 1.12 ++go 1.17 + + require ( + github.com/atotto/clipboard v0.1.2 + github.com/bcongdon/emoji-ordering v0.0.0-20201127221446-8e57a6480ccf + github.com/gdamore/tcell/v2 v2.0.1-0.20201017141208-acf90d56d591 + github.com/rivo/tview v0.0.0-20201118063654-f007e9ad3893 +- github.com/stretchr/testify v1.6.1 // indirect + golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392 + ) ++ ++require ( ++ github.com/gdamore/encoding v1.0.0 // indirect ++ github.com/lucasb-eyer/go-colorful v1.0.3 // indirect ++ github.com/mattn/go-runewidth v0.0.9 // indirect ++ github.com/rivo/uniseg v0.2.0 // indirect ++ github.com/stretchr/testify v1.6.1 // indirect ++ golang.org/x/sys v0.1.0 // indirect ++ golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 // indirect ++ golang.org/x/text v0.3.3 // indirect ++) +diff --git a/go.sum b/go.sum +index 3479558..cf61f93 100644 +--- a/go.sum ++++ b/go.sum +@@ -10,7 +10,6 @@ github.com/gdamore/tcell/v2 v2.0.1-0.20201017141208-acf90d56d591 h1:0WWUDZ1oxq7N + github.com/gdamore/tcell/v2 v2.0.1-0.20201017141208-acf90d56d591/go.mod h1:vSVL/GV5mCSlPC6thFP5kfOFdM9MGZcalipmpTxTgQA= + github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac= + github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= +-github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54= + github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= + github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= + github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +@@ -28,19 +27,17 @@ golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392 h1:xYJJ3S178yv++9zXV/hnr2 + golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= + golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= + golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +-golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756 h1:9nuHUbU8dRnRRfj9KjWUVrJeoexdbeMjttk6Oh1rD10= + golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20201017003518-b09fb700fbb7 h1:XtNJkfEjb4zR3q20BBBcYUykVOEMgZeIUOpBPfNYgxg= + golang.org/x/sys v0.0.0-20201017003518-b09fb700fbb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= ++golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM= + golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= + golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= + golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= + gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51a52a44915..eca426cfce4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27996,6 +27996,8 @@ with pkgs; dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; + emoji-picker = callPackage ../applications/misc/emoji-picker {}; + exploitdb = callPackage ../tools/security/exploitdb { }; evilwm = callPackage ../applications/window-managers/evilwm {