Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-01-11 06:02:00 +00:00 committed by GitHub
commit 47c5df190a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 453 additions and 462 deletions

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xchm"; pname = "xchm";
version = "1.32"; version = "1.33";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rzvncj"; owner = "rzvncj";
repo = "xCHM"; repo = "xCHM";
rev = version; rev = version;
sha256 = "sha256-Ss8kdfUAMC8v05rdt2SoO6vPyssG5v8gOzdf/v18cdg="; sha256 = "sha256-8HQaXxZQwfBaWc22GivKri1vZEnZ23anSfriCvmLHHw=";
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];

View File

@ -9,7 +9,7 @@
, yasm, libGLU, libGL, sqlite, unzip, makeWrapper , yasm, libGLU, libGL, sqlite, unzip, makeWrapper
, hunspell, libevent, libstartup_notification , hunspell, libevent, libstartup_notification
, libvpx , libvpx
, icu69, libpng, glib, pciutils , icu70, libpng, glib, pciutils
, autoconf213, which, gnused, rustPackages , autoconf213, which, gnused, rustPackages
, rust-cbindgen, nodejs, nasm, fetchpatch , rust-cbindgen, nodejs, nasm, fetchpatch
, gnum4 , gnum4
@ -129,12 +129,14 @@ buildStdenv.mkDerivation ({
inherit src unpackPhase meta; inherit src unpackPhase meta;
patches = [ patches = [
# Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1745560:
./fix-build-with-wayland-1.20.patch
] ++ ] ++
lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++
lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch ++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch ++
lib.optional (lib.versionAtLeast version "95") ./no-buildconfig-ffx95.patch ++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch ++
# Fix wayland 1.20 compatibility (https://bugzilla.mozilla.org/show_bug.cgi?id=1745560:)
lib.optional (lib.versionOlder version "96") ./fix-build-with-wayland-1.20.patch ++
patches; patches;
# Ignore trivial whitespace changes in patches, this fixes compatibility of # Ignore trivial whitespace changes in patches, this fixes compatibility of
@ -150,9 +152,10 @@ buildStdenv.mkDerivation ({
xorg.xorgproto xorg.xorgproto
xorg.libXdamage xorg.libXdamage
xorg.libXext xorg.libXext
xorg.libXtst
libevent libstartup_notification /* cairo */ libevent libstartup_notification /* cairo */
libpng glib libpng glib
nasm icu69 libvpx nasm icu70 libvpx
# >= 66 requires nasm for the AV1 lib dav1d # >= 66 requires nasm for the AV1 lib dav1d
# yasm can potentially be removed in future versions # yasm can potentially be removed in future versions
# https://bugzilla.mozilla.org/show_bug.cgi?id=1501796 # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796

View File

@ -1,5 +1,5 @@
diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
index 038136a..1709f1f 100644 index e7be91a248..5eb98534ee 100644
--- a/docshell/base/nsAboutRedirector.cpp --- a/docshell/base/nsAboutRedirector.cpp
+++ b/docshell/base/nsAboutRedirector.cpp +++ b/docshell/base/nsAboutRedirector.cpp
@@ -66,9 +66,6 @@ static const RedirEntry kRedirMap[] = { @@ -66,9 +66,6 @@ static const RedirEntry kRedirMap[] = {
@ -13,13 +13,13 @@ index 038136a..1709f1f 100644
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::ALLOW_SCRIPT}, nsIAboutModule::ALLOW_SCRIPT},
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index 9ac4305..916b4ad 100644 index 74c0ae8f34..a5d9645a96 100644
--- a/toolkit/content/jar.mn --- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn
@@ -39,8 +39,6 @@ toolkit.jar: @@ -41,8 +41,6 @@ toolkit.jar:
content/global/plugins.html
content/global/plugins.css content/global/plugins.css
content/global/plugins.js content/global/plugins.js
#endif
-* content/global/buildconfig.html -* content/global/buildconfig.html
- content/global/buildconfig.css - content/global/buildconfig.css
content/global/contentAreaUtils.js content/global/contentAreaUtils.js

View File

@ -7,10 +7,10 @@ in
rec { rec {
firefox = common rec { firefox = common rec {
pname = "firefox"; pname = "firefox";
version = "95.0.2"; version = "96.0";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "1b9eb91d72a6975b4d2558a7c5de0e008095398b9862498623656ab6d8056e3cffc12263f58aa07feeddc91ccfb512aa4b582dfeadb142d548d96c3d50204196"; sha512 = "39f553474537eb4e521f4182e38f0ddff039fa6b40b939d461937d2cef27f7182097b478f08f90d64fdcbe9c063e78f14f6863a8a82a16207ec7a1d3fdfda4ff";
}; };
meta = { meta = {
@ -32,10 +32,10 @@ rec {
firefox-esr-91 = common rec { firefox-esr-91 = common rec {
pname = "firefox-esr"; pname = "firefox-esr";
version = "91.4.1esr"; version = "91.5.0esr";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "1b9f17c4e58e3753f8507754bba93e3b7f76df5b6845d6173719fbdd98b70af2a90242df42fe274217f56d0280e5dbae17962f5b6bf111421260790f770f5337"; sha512 = "1712415b6b73c6a21edfefc39eaba5fcbbca54032f78627c0005d291501d16ef4daffb8b9a160d1d5361113ceba04eb5ddb21d903e3dd8d58838aa9596f2d781";
}; };
meta = { meta = {

View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "senpai"; pname = "senpai";
version = "unstable-2021-11-29"; version = "unstable-2021-12-14";
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~taiite"; owner = "~taiite";
repo = "senpai"; repo = "senpai";
rev = "3904c9190d94f273c0ae9937d3161b9fe4adf856"; rev = "8091752a67781273944e7a79a803b7a671378313";
sha256 = "sha256-4ZhJuAxcoGjRO5xVqzlmaUvipnyiFMuJ1A3n8vlhYxU="; sha256 = "sha256-tZp0ra/Sq/5MAFlAFHPJ94jYxtHbDiG1wSD4NOH1x7I=";
}; };
vendorSha256 = "sha256-xkJh7k8GZmoZqE0HgbFp2xMJQOVDkPEXOZEl6bJZz1A="; vendorSha256 = "sha256-xkJh7k8GZmoZqE0HgbFp2xMJQOVDkPEXOZEl6bJZz1A=";

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "v2ray-geoip"; pname = "v2ray-geoip";
version = "202112300030"; version = "202201060033";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "v2fly"; owner = "v2fly";
repo = "geoip"; repo = "geoip";
rev = "570a09062b1b6dbd3b8cb1785c0ce4a0ed3c50f4"; rev = "57f0e64ece0582314958c027198b8e50daa353d2";
sha256 = "sha256-YGKHruyVShFrMbE0eXzb2Qp3BMfM+4SLaK8pqR2sloM="; sha256 = "sha256-RG7sLp9u8k1U5XVFcwAF57UcvwhF3pFKCFLLJ2x7q00=";
}; };
installPhase = '' installPhase = ''

View File

@ -18,13 +18,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ansible-lint"; pname = "ansible-lint";
version = "5.3.1"; version = "5.3.2";
disabled = isPy27; disabled = isPy27;
format = "pyproject"; format = "pyproject";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-fXvHS5uQxZgr5cJ0wq/LpbgHPsiMznk/q0Y/5kGKJfY="; sha256 = "sha256-m6iG20xE5ZNgvI1mjwvq5hk8Ch/LuedhJwAMo6ztfCg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -1,12 +1,12 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro ? null, futures ? null, enum34 ? null }: { lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro ? null, futures ? null, enum34 ? null }:
buildPythonPackage rec { buildPythonPackage rec {
version = "1.7.0"; version = "1.8.2";
pname = "confluent-kafka"; pname = "confluent-kafka";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "80e01b4791513c27eded8517af847530dfdf04c43d99ff132ed9c3085933b75b"; sha256 = "b79e836c3554bc51c6837a8a0152f7521c9bf31342f5b8e21eba6b28044fa585";
}; };
buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ; buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ;

View File

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "goodwe"; pname = "goodwe";
version = "0.2.13"; version = "0.2.14";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "marcelblijleven"; owner = "marcelblijleven";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "189szff4sl5pc670wv8syl6zcv3p748s33w11biig0vbd59kdr1l"; sha256 = "1q314mq83n9cfkhw3rmx6ka6ga6n2c5q5irh1bsf3f0i7m7m1k3j";
}; };
checkInputs = [ checkInputs = [

View File

@ -2,23 +2,25 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, click , click
, pycryptodome
, requests , requests
, tzlocal , tzlocal
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "micloud"; pname = "micloud";
version = "0.4"; version = "0.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Squachen"; owner = "Squachen";
repo = "micloud"; repo = "micloud";
rev = "v_${version}"; rev = "v_${version}";
sha256 = "01z1qfln6f7pnxb4ssmyygyamnfgh36fzgn85s8axdwy8wrch20x"; sha256 = "sha256-1qtOsEH+G5ASsRyVCa4U0WQ/9kDRn1WpPNkvuvWFovQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
click click
pycryptodome
requests requests
tzlocal tzlocal
]; ];

View File

@ -21,7 +21,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
paramiko paramiko
lxml lxml
selectors2
]; ];
checkInputs = [ checkInputs = [

View File

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-smarttub"; pname = "python-smarttub";
version = "0.0.28"; version = "0.0.29";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "mdz"; owner = "mdz";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-dAwOi1hhjGhBGKEp5u3qW5WL1GLHBFac0drIc1Zk6ok="; sha256 = "sha256-utUpNuemyS8XEVhfhLgOwTRkPFqCBXyK1s1LWemywmU=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -1,13 +1,13 @@
{ fetchPypi, buildPythonPackage, lib }: { fetchPypi, buildPythonPackage, lib }:
buildPythonPackage rec { buildPythonPackage rec {
version = "3.10.5"; version = "3.10.6";
pname = "thespian"; pname = "thespian";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "17adad8afbc4779a01f34a6595c63fceccfd21f10556b85a261338eb99b5d306"; sha256 = "c987a8042ba2303e22371f38a67354593dd81c4c11ba1eba7f6657409288d5ed";
}; };
# Do not run the test suite: it takes a long time and uses # Do not run the test suite: it takes a long time and uses

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "jql"; pname = "jql";
version = "3.0.4"; version = "3.0.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yamafaktory"; owner = "yamafaktory";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-SU8byylr/Rv4lDWkt9+U4UvgCM5kYZeRsTk+hdz0y8w="; sha256 = "sha256-3WLbFKK4gRpPjU/qnfRYGvI2o/ASPph8I2ISEbahpCM=";
}; };
cargoSha256 = "sha256-snc5QSaxbnXo6FOceqYucjN+ECo+RonejXda9Fvgggc="; cargoSha256 = "sha256-SYsT4/UaUCgmHJPWfSBf1EBJ7aOiRtWDAFjYEhtI2X4=";
meta = with lib; { meta = with lib; {
description = "A JSON Query Language CLI tool built with Rust"; description = "A JSON Query Language CLI tool built with Rust";

View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, glib , glib
, meson , meson
, ninja , ninja
@ -15,25 +14,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vala-lint"; pname = "vala-lint";
version = "unstable-2021-11-18"; version = "unstable-2021-12-28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vala-lang"; owner = "vala-lang";
repo = "vala-lint"; repo = "vala-lint";
rev = "2db018056befba76136e6c69a78d905a128a6165"; rev = "1eeb3538b2a71addd0d8adc9f53ffe80fdfb8ce0";
sha256 = "sha256-bQaj2bETzl6ykgrpE2iLAvx691aGDLFteL/ulfoKuEk="; sha256 = "sha256-u2VJIDc1yvhbBgdMKL1RijoKEL4Vl8sbrGUYu5t/wJI=";
}; };
patches = [
# Fix build against vala-0.54.3+. Pull fix pending upstream
# inclusion: https://github.com/vala-lang/vala-lint/pull/155
(fetchpatch {
name = "vala-0.54.patch";
url = "https://github.com/vala-lang/vala-lint/commit/739f9a0b7d3e92db41eb32f2bfa527efdacc223b.patch";
sha256 = "sha256-1IbQu3AQXRCrrjoMZKhEOqzExmPAo1SQOFHa/IrqnNA=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
gettext gettext
meson meson

View File

@ -2,7 +2,7 @@
# Do not edit! # Do not edit!
{ {
version = "2021.12.7"; version = "2021.12.8";
components = { components = {
"abode" = ps: with ps; [ abodepy ]; "abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ]; "accuweather" = ps: with ps; [ accuweather ];
@ -217,7 +217,6 @@
"eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools[scan] "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools[scan]
"edimax" = ps: with ps; [ pyedimax ]; "edimax" = ps: with ps; [ pyedimax ];
"edl21" = ps: with ps; [ pysml ]; "edl21" = ps: with ps; [ pysml ];
"ee_brightbox" = ps: with ps; [ eebrightbox ];
"efergy" = ps: with ps; [ pyefergy ]; "efergy" = ps: with ps; [ pyefergy ];
"egardia" = ps: with ps; [ pythonegardia ]; "egardia" = ps: with ps; [ pythonegardia ];
"eight_sleep" = ps: with ps; [ pyeight ]; "eight_sleep" = ps: with ps; [ pyeight ];
@ -335,7 +334,6 @@
"google_translate" = ps: with ps; [ gtts ]; "google_translate" = ps: with ps; [ gtts ];
"google_travel_time" = ps: with ps; [ googlemaps ]; "google_travel_time" = ps: with ps; [ googlemaps ];
"google_wifi" = ps: with ps; [ ]; "google_wifi" = ps: with ps; [ ];
"gpmdp" = ps: with ps; [ websocket-client ];
"gpsd" = ps: with ps; [ gps3 ]; "gpsd" = ps: with ps; [ gps3 ];
"gpslogger" = ps: with ps; [ aiohttp-cors ]; "gpslogger" = ps: with ps; [ aiohttp-cors ];
"graphite" = ps: with ps; [ ]; "graphite" = ps: with ps; [ ];

View File

@ -265,7 +265,7 @@ let
extraBuildInputs = extraPackages py.pkgs; extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating # Don't forget to run parse-requirements.py after updating
hassVersion = "2021.12.7"; hassVersion = "2021.12.8";
in with py.pkgs; buildPythonApplication rec { in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant"; pname = "homeassistant";
@ -282,7 +282,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant"; owner = "home-assistant";
repo = "core"; repo = "core";
rev = version; rev = version;
hash = "sha256:0jcnk43wm3xwvsfyvbswq681v2c3xmki1bakn0l12j6paida784y"; hash = "sha256:HxSEXaqNHh2hSr1fmu3xpC212PXhzvnD4CwR1Ulw9ok=";
}; };
# leave this in, so users don't have to constantly update their downstream patch handling # leave this in, so users don't have to constantly update their downstream patch handling
@ -467,7 +467,6 @@ in with py.pkgs; buildPythonApplication rec {
"eafm" "eafm"
"ecobee" "ecobee"
"econet" "econet"
"ee_brightbox"
"efergy" "efergy"
"elgato" "elgato"
"elkm1" "elkm1"

View File

@ -79,6 +79,7 @@ def parse_components(version: str = "master"):
) )
for domain in sorted(integrations): for domain in sorted(integrations):
integration = integrations[domain] integration = integrations[domain]
if not integration.disabled:
components[domain] = integration.manifest components[domain] = integration.manifest
return components return components

View File

@ -3,16 +3,16 @@
buildGoModule rec { buildGoModule rec {
pname = "imgproxy"; pname = "imgproxy";
version = "3.0.0"; version = "3.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
sha256 = "sha256-r9nT4nAzD6xBTB9jfmPfE7vKs4tgrdGPWOptRpqh5TM="; sha256 = "sha256-aQ+EKUsqmsdCvEeKNNoF2Sj5+BN8yuhJAbL4BnYWINM=";
rev = "v${version}"; rev = "v${version}";
}; };
vendorSha256 = "sha256-7LRxR6ISV+A30NSztlAlfjMjgnXZpHq3aMAKGoHJtNY="; vendorSha256 = "sha256-MHcV6n6uZsjC85vQVl+o6JD+psvE2xuPr//3RueT8V0=";
doCheck = false; doCheck = false;

View File

@ -4,7 +4,7 @@ with lib;
buildGoPackage rec { buildGoPackage rec {
pname = "nats-server"; pname = "nats-server";
version = "2.6.0"; version = "2.6.3";
goPackagePath = "github.com/nats-io/${pname}"; goPackagePath = "github.com/nats-io/${pname}";
@ -12,7 +12,7 @@ buildGoPackage rec {
rev = "v${version}"; rev = "v${version}";
owner = "nats-io"; owner = "nats-io";
repo = pname; repo = pname;
sha256 = "sha256-DggzXYPyu0dQ40L98VzxgN9S/35vLJJow9UjDtMz9rY="; sha256 = "sha256-7srDyTsIyac4AYwTFpDji4Czg6rRK9evb4W25CqQgGk=";
}; };
meta = { meta = {

View File

@ -11,7 +11,7 @@ let
# 1. Needs ocaml >= 4.04 and <= 4.11 # 1. Needs ocaml >= 4.04 and <= 4.11
# 2. ocaml 4.10 defaults to safe (immutable) strings so we need a version with # 2. ocaml 4.10 defaults to safe (immutable) strings so we need a version with
# that disabled as weidu is strongly dependent on mutable strings # that disabled as weidu is strongly dependent on mutable strings
ocaml' = ocaml-ng.ocamlPackages_4_10.ocaml.overrideAttrs (old: { ocaml' = ocaml-ng.ocamlPackages_4_11.ocaml.overrideAttrs (old: {
configureFlags = old.configureFlags ++ [ configureFlags = old.configureFlags ++ [
# https://github.com/WeiDUorg/weidu/issues/197 # https://github.com/WeiDUorg/weidu/issues/197
"--disable-force-safe-string" "--disable-force-safe-string"
@ -21,13 +21,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "weidu"; pname = "weidu";
version = "247.00"; version = "249.00";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "WeiDUorg"; owner = "WeiDUorg";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-vAIIYn0urQnnL82mdfwJtahrS3uWPFferm+0F13TKcw="; sha256 = "sha256-+vkKTzFZdAzY2dL+mZ4A0PDxhTKGgs9bfArz7S6b4m4=";
}; };
postPatch = '' postPatch = ''

View File

@ -10,15 +10,15 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "cht.sh"; pname = "cht.sh";
version = "unstable-2021-11-17"; version = "unstable-2022-01-01";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chubin"; owner = "chubin";
repo = "cheat.sh"; repo = "cheat.sh";
rev = "e0010117ca3eeb22e79346cb37f3897b7404ed12"; rev = "46d1a5f73c6b88da15d809154245dbf234e9479e";
sha256 = "GJSJyIQ+8kz/+8/3lgPVr+V6zoo7iW739Z2frLpMTJI="; sha256 = "6uEbxkkNV5EGhiCSoWJgfRUUqUS3OFTVOZFlVyMp/x8=";
}; };
# Fix ".cht.sh-wrapped" in the help message # Fix ".cht.sh-wrapped" in the help message