mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-16 09:28:35 +03:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
ba1f7a5a83
File diff suppressed because it is too large
Load Diff
@ -61,13 +61,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "audacity";
|
||||
version = "3.2.3";
|
||||
version = "3.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "Audacity-${version}";
|
||||
sha256 = "sha256-0F9+4hyUoKb0UP5t02yws/ErogscvI1nsdnSTpcr53E=";
|
||||
hash = "sha256-gz2o0Rj4364nJAvJmMQzwIQycoQmqz2/43DBvd3qbho=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grandorgue";
|
||||
version = "3.9.4-1";
|
||||
version = "3.9.5-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GrandOrgue";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-10gcVxMLhMXUblvJYLj0TTwGFl1YHI7HU3TfHXtJ+24=";
|
||||
sha256 = "sha256-5OqTQBOYE6XU3BRiVwXOHrn22bVZzIIeZI8pgsWxhPw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
# This file has been generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit!
|
||||
{ lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }:
|
||||
let
|
||||
packages = ( self:
|
||||
packages = ( self:
|
||||
{
|
||||
active-window-kak = buildKakounePluginFrom2Nix {
|
||||
pname = "active-window-kak";
|
||||
version = "2020-05-13";
|
||||
version = "2022-11-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "greenfork";
|
||||
repo = "active-window.kak";
|
||||
rev = "988db69cfbb88bd741d089bb43b0be551693e7c1";
|
||||
rev = "36bf0364eed856a52cddf274072e9f255902c0ee";
|
||||
sha256 = "1fv1cp9q212gamf9z2papl5xcl2w31fpcmbgdzbxcxdl1pvfsqp8";
|
||||
};
|
||||
meta.homepage = "https://github.com/greenfork/active-window.kak/";
|
||||
@ -17,12 +17,12 @@ let
|
||||
|
||||
auto-pairs-kak = buildKakounePluginFrom2Nix {
|
||||
pname = "auto-pairs-kak";
|
||||
version = "2021-03-28";
|
||||
version = "2022-03-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexherbo2";
|
||||
repo = "auto-pairs.kak";
|
||||
rev = "526779a26a5cf5f48e7c4f5c5fecca274968a737";
|
||||
sha256 = "0gkhvwxyh8pdfydrj7zkfidk0drrbhvdi1fq3pkzllna3vz8q181";
|
||||
rev = "bfdcb8566076f653ec707f86207f83ea75173ce9";
|
||||
sha256 = "0vx9msk8wlj8p9qf6yiv9gzrbanb5w245cidnx5cppgld2w842ij";
|
||||
};
|
||||
meta.homepage = "https://github.com/alexherbo2/auto-pairs.kak/";
|
||||
};
|
||||
@ -41,48 +41,48 @@ let
|
||||
|
||||
fzf-kak = buildKakounePluginFrom2Nix {
|
||||
pname = "fzf-kak";
|
||||
version = "2021-04-03";
|
||||
version = "2022-10-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "andreyorst";
|
||||
repo = "fzf.kak";
|
||||
rev = "1b3a3beebbe7134e671fde2ef2f4242b34ae2c60";
|
||||
sha256 = "0rsd65zcizbq3isy8576gqw7mcml5ixw84padaz6ndwfif5fv701";
|
||||
rev = "6910bfb4c23cac59c17f5b7850f7bd49aba3e5cb";
|
||||
sha256 = "1hlals4d9x5i4mwigxjlx4f9xgc9rw15yzvbvc64cminxic2i3i8";
|
||||
};
|
||||
meta.homepage = "https://github.com/andreyorst/fzf.kak/";
|
||||
};
|
||||
|
||||
kakboard = buildKakounePluginFrom2Nix {
|
||||
pname = "kakboard";
|
||||
version = "2020-05-09";
|
||||
version = "2022-04-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lePerdu";
|
||||
repo = "kakboard";
|
||||
rev = "2f13f5cd99591b76ad5cba230815b80138825120";
|
||||
sha256 = "1kvnbsv20y09rlnyar87qr0h26i16qsq801krswvxcwhid7ijlvd";
|
||||
rev = "5759dcc5af593ff88a7faecc41a8f549ec440771";
|
||||
sha256 = "0g8q0rkdnzsfvlibjd1zfcapngfli5aa3qrgmkgdi24n9ad8wzvh";
|
||||
};
|
||||
meta.homepage = "https://github.com/lePerdu/kakboard/";
|
||||
};
|
||||
|
||||
kakoune-buffer-switcher = buildKakounePluginFrom2Nix {
|
||||
pname = "kakoune-buffer-switcher";
|
||||
version = "2020-12-27";
|
||||
version = "2022-09-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "occivink";
|
||||
repo = "kakoune-buffer-switcher";
|
||||
rev = "6a27c45db87a23070c34fab36d2f8d812cd002a6";
|
||||
sha256 = "1rmwy317908v8p54806m721bpzm8sgygb9abri34537ka6r05y5j";
|
||||
rev = "21319aa08e7c9072dcf1a4f2f5583887d701fc37";
|
||||
sha256 = "0lnvcb4khw1ywxd369phd2xibsh5f6qc11x5vrla331wr1q7y8j8";
|
||||
};
|
||||
meta.homepage = "https://github.com/occivink/kakoune-buffer-switcher/";
|
||||
};
|
||||
|
||||
kakoune-buffers = buildKakounePluginFrom2Nix {
|
||||
pname = "kakoune-buffers";
|
||||
version = "2021-04-02";
|
||||
version = "2021-11-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Delapouite";
|
||||
repo = "kakoune-buffers";
|
||||
rev = "7832ea7a4528363482f5684f16cbcebcbec0adfd";
|
||||
sha256 = "196d36jww6asf5zr03l1rwg49kkv16s2d4zyryb2m3zvy7prf2bb";
|
||||
rev = "6b2081f5b7d58c72de319a5cba7bf628b6802881";
|
||||
sha256 = "0pbrgydifw2a8yf3ringyqq91fccfv4lm4v8sk5349hbcz6apr4c";
|
||||
};
|
||||
meta.homepage = "https://github.com/Delapouite/kakoune-buffers/";
|
||||
};
|
||||
@ -101,12 +101,12 @@ let
|
||||
|
||||
kakoune-extra-filetypes = buildKakounePluginFrom2Nix {
|
||||
pname = "kakoune-extra-filetypes";
|
||||
version = "2021-01-15";
|
||||
version = "2021-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kakoune-editor";
|
||||
repo = "kakoune-extra-filetypes";
|
||||
rev = "c6f8aaccd8c9cd6b487964c8943416e21fbe7c18";
|
||||
sha256 = "1vkff8xbycfgxv8x09cvc79qcg5fdzn2x77mbmifmkq236khrwrg";
|
||||
rev = "8ffeec08068edfee42e076c5f6d56a54a498bad2";
|
||||
sha256 = "1v87aqfk2jcysbdls3mh2v1yafk1albbinfxsxp11m4nxd2b9agl";
|
||||
};
|
||||
meta.homepage = "https://github.com/kakoune-editor/kakoune-extra-filetypes/";
|
||||
};
|
||||
@ -125,24 +125,24 @@ let
|
||||
|
||||
kakoune-registers = buildKakounePluginFrom2Nix {
|
||||
pname = "kakoune-registers";
|
||||
version = "2020-06-19";
|
||||
version = "2022-03-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Delapouite";
|
||||
repo = "kakoune-registers";
|
||||
rev = "9531947baecd83c1d4c3bea0adf10f4462f1e120";
|
||||
sha256 = "08v9ndghh7wvr8rsrqm05gksk9ai5vnwvw9gwqasbppb48cv4a8c";
|
||||
rev = "b8ca8e04ebe50671a937bceccba69c62b68ae8b0";
|
||||
sha256 = "0vy5dc6jly5xqcck0vhnmbjxjdy3615b6d329v0b04amzy0hdlck";
|
||||
};
|
||||
meta.homepage = "https://github.com/Delapouite/kakoune-registers/";
|
||||
};
|
||||
|
||||
kakoune-vertical-selection = buildKakounePluginFrom2Nix {
|
||||
pname = "kakoune-vertical-selection";
|
||||
version = "2019-04-11";
|
||||
version = "2022-11-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "occivink";
|
||||
repo = "kakoune-vertical-selection";
|
||||
rev = "c420f8b867ce47375fac303886e31623669a42b7";
|
||||
sha256 = "13jdyd2j45wvgqvxdzw9zww14ly93bqjb6700zzxj7mkbiff6wsb";
|
||||
rev = "227b3fd9643e6e3b9d36fab324081a988c038e21";
|
||||
sha256 = "0ygqhlk31ilczpwws28iqya8i1qhnwkb5rw6bn2zqgxj428a1kqj";
|
||||
};
|
||||
meta.homepage = "https://github.com/occivink/kakoune-vertical-selection/";
|
||||
};
|
||||
@ -161,24 +161,24 @@ let
|
||||
|
||||
pandoc-kak = buildKakounePluginFrom2Nix {
|
||||
pname = "pandoc-kak";
|
||||
version = "2020-11-30";
|
||||
version = "2021-06-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "basbebe";
|
||||
repo = "pandoc.kak";
|
||||
rev = "63979f7e08b86d80436bbe2d9dba173a56057b97";
|
||||
sha256 = "16pmmnpyxf8r7gpj8g1lwa960nscjmcl52n1a7s6xcqkp9856wxs";
|
||||
rev = "e9597e8df58427884161ce27392a9558930832a7";
|
||||
sha256 = "1baslidszbybx2ngdkm7wns2m5l27gc0mb3blhhydiav8fcfvc6m";
|
||||
};
|
||||
meta.homepage = "https://github.com/basbebe/pandoc.kak/";
|
||||
};
|
||||
|
||||
powerline-kak = buildKakounePluginFrom2Nix {
|
||||
pname = "powerline-kak";
|
||||
version = "2021-04-06";
|
||||
version = "2022-04-05";
|
||||
src = fetchFromGitHub {
|
||||
owner = "andreyorst";
|
||||
repo = "powerline.kak";
|
||||
rev = "6fa5ad383f2884f201d6e3ef07a4687c606df525";
|
||||
sha256 = "1s7ggjby0bymq48njzhdvkkarmzl44803xv0dlnzrj7q9c3xv27a";
|
||||
rev = "c5ef9a845bbd886c73ef00c0efff986e02d5f5d8";
|
||||
sha256 = "1lshlnz5xrxzafxmb6w05g2i6nvi49aqyd8852k9l0lmzqryp7l2";
|
||||
};
|
||||
meta.homepage = "https://github.com/andreyorst/powerline.kak/";
|
||||
};
|
||||
@ -195,41 +195,41 @@ let
|
||||
meta.homepage = "https://github.com/kakounedotcom/prelude.kak/";
|
||||
};
|
||||
|
||||
replace-mode-kak = buildKakounePluginFrom2Nix {
|
||||
pname = "replace-mode-kak";
|
||||
version = "2020-10-07";
|
||||
smarttab-kak = buildKakounePluginFrom2Nix {
|
||||
pname = "smarttab-kak";
|
||||
version = "2022-04-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexherbo2";
|
||||
repo = "replace-mode.kak";
|
||||
rev = "5f4c73cdbaf5aeb964ee35ad4b9081b233af90c0";
|
||||
sha256 = "1cmylx99bm7jwfb4hclb69sdc4n8f29ssyy2byjiw53ni9rnc8q0";
|
||||
owner = "andreyorst";
|
||||
repo = "smarttab.kak";
|
||||
rev = "86ac6599b13617ff938905ba4cdd8225d7eb6a2e";
|
||||
sha256 = "1992xwf2aygzfd26lhg3yiy253g0hl1iagj0kq9yhcqg0i5xjcj9";
|
||||
};
|
||||
meta.homepage = "https://github.com/alexherbo2/replace-mode.kak/";
|
||||
};
|
||||
|
||||
sleuth-kak = buildKakounePluginFrom2Nix {
|
||||
pname = "sleuth-kak";
|
||||
version = "2020-11-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexherbo2";
|
||||
repo = "sleuth.kak";
|
||||
rev = "911db8bd208ad0d289b8fa15a2ac665ff39bd6bd";
|
||||
sha256 = "0g41c0038fpmihqva71xl4vfbmvsp13i47gp6fnmaikajpynzc51";
|
||||
};
|
||||
meta.homepage = "https://github.com/alexherbo2/sleuth.kak/";
|
||||
meta.homepage = "https://github.com/andreyorst/smarttab.kak/";
|
||||
};
|
||||
|
||||
tabs-kak = buildKakounePluginFrom2Nix {
|
||||
pname = "tabs-kak";
|
||||
version = "2021-04-14";
|
||||
version = "2021-07-05";
|
||||
src = fetchFromGitHub {
|
||||
owner = "enricozb";
|
||||
repo = "tabs.kak";
|
||||
rev = "048f83455ea7c671ab06e9b9578ac25e5de1d6fb";
|
||||
sha256 = "0xswpsdf1bj54inl6vf2lzbjkxfc6g0fyv5kd6y9ahlh5irij8z0";
|
||||
rev = "1cb19e410a3ef299f7a701fa5bec98c2d9284dac";
|
||||
sha256 = "0hxa4mvw1k74vscxkm520c6g7iwcaqh8kj9g4mwy6n5kkvr1drf0";
|
||||
};
|
||||
meta.homepage = "https://github.com/enricozb/tabs.kak/";
|
||||
};
|
||||
|
||||
zig-kak = buildKakounePluginFrom2Nix {
|
||||
pname = "zig-kak";
|
||||
version = "2019-05-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "adrusi";
|
||||
repo = "zig.kak";
|
||||
rev = "5a7e84e138324e6b8d140fe384dfe5cc941e26b7";
|
||||
sha256 = "1w0nmhsgchjga4by9ch9md3pdc1bwn0p157g6zwnfpj7lnaahsmq";
|
||||
};
|
||||
meta.homepage = "https://github.com/adrusi/zig.kak/";
|
||||
};
|
||||
|
||||
});
|
||||
in lib.fix' (lib.extends overrides packages)
|
||||
|
||||
@ -1,20 +1,20 @@
|
||||
repo,branch,alias
|
||||
alexherbo2/auto-pairs.kak,,
|
||||
alexherbo2/replace-mode.kak,,
|
||||
alexherbo2/sleuth.kak,,
|
||||
andreyorst/fzf.kak,,
|
||||
andreyorst/powerline.kak,,
|
||||
basbebe/pandoc.kak,,
|
||||
danr/kakoune-easymotion,,
|
||||
Delapouite/kakoune-buffers,,
|
||||
Delapouite/kakoune-registers,,
|
||||
enricozb/tabs.kak@main,,
|
||||
greenfork/active-window.kak,,
|
||||
kakoune-editor/kakoune-extra-filetypes,,
|
||||
kakounedotcom/connect.kak,,
|
||||
kakounedotcom/prelude.kak,,
|
||||
lePerdu/kakboard,,
|
||||
listentolist/kakoune-rainbow,,
|
||||
mayjs/openscad.kak,,
|
||||
occivink/kakoune-buffer-switcher,,
|
||||
occivink/kakoune-vertical-selection,,
|
||||
https://github.com/greenfork/active-window.kak/,,
|
||||
https://github.com/alexherbo2/auto-pairs.kak/,,
|
||||
https://github.com/kakounedotcom/connect.kak/,,
|
||||
https://github.com/andreyorst/fzf.kak/,,
|
||||
https://github.com/lePerdu/kakboard/,,
|
||||
https://github.com/occivink/kakoune-buffer-switcher/,,
|
||||
https://github.com/Delapouite/kakoune-buffers/,,
|
||||
https://github.com/danr/kakoune-easymotion/,,
|
||||
https://github.com/kakoune-editor/kakoune-extra-filetypes/,,
|
||||
https://github.com/listentolist/kakoune-rainbow/,,
|
||||
https://github.com/Delapouite/kakoune-registers/,,
|
||||
https://github.com/occivink/kakoune-vertical-selection/,,
|
||||
https://github.com/mayjs/openscad.kak/,,
|
||||
https://github.com/basbebe/pandoc.kak/,,
|
||||
https://github.com/andreyorst/powerline.kak/,,
|
||||
https://github.com/kakounedotcom/prelude.kak/,,
|
||||
https://github.com/andreyorst/smarttab.kak/,,
|
||||
https://github.com/enricozb/tabs.kak/,,
|
||||
https://github.com/adrusi/zig.kak/,,
|
||||
|
||||
@ -42,19 +42,19 @@ HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/
|
||||
class KakouneEditor(pluginupdate.Editor):
|
||||
|
||||
|
||||
def generate_nix(self, plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str):
|
||||
sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower())
|
||||
def generate_nix(self, plugins: List[Tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]], outfile: str):
|
||||
sorted_plugins = sorted(plugins, key=lambda v: v[1].name.lower())
|
||||
|
||||
with open(outfile, "w+") as f:
|
||||
f.write(HEADER)
|
||||
f.write(
|
||||
"""
|
||||
{ lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }:
|
||||
let
|
||||
packages = ( self:
|
||||
{"""
|
||||
{ lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }:
|
||||
let
|
||||
packages = ( self:
|
||||
{"""
|
||||
)
|
||||
for owner, repo, plugin in sorted_plugins:
|
||||
for pluginDesc, plugin in sorted_plugins:
|
||||
if plugin.has_submodules:
|
||||
submodule_attr = "\n fetchSubmodules = true;"
|
||||
else:
|
||||
@ -62,24 +62,19 @@ class KakouneEditor(pluginupdate.Editor):
|
||||
|
||||
f.write(
|
||||
f"""
|
||||
{plugin.normalized_name} = buildKakounePluginFrom2Nix {{
|
||||
pname = "{plugin.normalized_name}";
|
||||
version = "{plugin.version}";
|
||||
src = fetchFromGitHub {{
|
||||
owner = "{owner}";
|
||||
repo = "{repo}";
|
||||
rev = "{plugin.commit}";
|
||||
sha256 = "{plugin.sha256}";{submodule_attr}
|
||||
}};
|
||||
meta.homepage = "https://github.com/{owner}/{repo}/";
|
||||
}};
|
||||
"""
|
||||
{plugin.normalized_name} = buildKakounePluginFrom2Nix {{
|
||||
pname = "{plugin.normalized_name}";
|
||||
version = "{plugin.version}";
|
||||
src = {pluginDesc.repo.as_nix(plugin)};
|
||||
meta.homepage = "{pluginDesc.repo.url("")}";
|
||||
}};
|
||||
"""
|
||||
)
|
||||
f.write(
|
||||
"""
|
||||
});
|
||||
in lib.fix' (lib.extends overrides packages)
|
||||
"""
|
||||
});
|
||||
in lib.fix' (lib.extends overrides packages)
|
||||
"""
|
||||
)
|
||||
print(f"updated {outfile}")
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
|
||||
|
||||
{ buildGrammar, fetchCrate, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchHex, fetchgit, fetchhg, fetchsvn }:
|
||||
{ buildGrammar, fetchCrate, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchHex, fetchPypi, fetchgit, fetchhg, fetchsvn }:
|
||||
|
||||
{
|
||||
ada = buildGrammar {
|
||||
@ -71,12 +71,12 @@
|
||||
};
|
||||
beancount = buildGrammar {
|
||||
language = "beancount";
|
||||
version = "4cbd1f0";
|
||||
version = "c68ffc4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "polarmutex";
|
||||
repo = "tree-sitter-beancount";
|
||||
rev = "4cbd1f09cd07c1f1fabf867c2cf354f9da53cc4c";
|
||||
hash = "sha256-Uh9/yBYXNKBvdpqNv1kr5eREYmKy3Z/kvaSZQpUl+0U=";
|
||||
rev = "c68ffc4c6c27eadd81dd56c66f03f4d202d4b2d7";
|
||||
hash = "sha256-MJDatUpXJMf3OB8KocA+kJi+mqNKRs7wraq33tCg3/c=";
|
||||
};
|
||||
meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount";
|
||||
};
|
||||
@ -124,6 +124,17 @@
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
|
||||
};
|
||||
capnp = buildGrammar {
|
||||
language = "capnp";
|
||||
version = "62057f5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-capnp";
|
||||
rev = "62057f5d3a57ac44ca3d773623f5585b98ae2ce7";
|
||||
hash = "sha256-EsqsYnetQBpANCrOzk1U5Tg2gfJzFSax9/ia4A8x7ic=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-capnp";
|
||||
};
|
||||
clojure = buildGrammar {
|
||||
language = "clojure";
|
||||
version = "262d6d6";
|
||||
@ -181,12 +192,12 @@
|
||||
};
|
||||
cpp = buildGrammar {
|
||||
language = "cpp";
|
||||
version = "2d2c4ae";
|
||||
version = "56cec4c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-cpp";
|
||||
rev = "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1";
|
||||
hash = "sha256-BjNWSTpwytOSYw32lYFItNI4t3xw+uJUx/0htYo7aLs=";
|
||||
rev = "56cec4c2eb5d6af3d2942e69e35db15ae2433740";
|
||||
hash = "sha256-CWh5p0tlBQizABjwBRN1VoxeEriOPhTy3lFZI9PjsTA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
|
||||
};
|
||||
@ -203,12 +214,12 @@
|
||||
};
|
||||
cuda = buildGrammar {
|
||||
language = "cuda";
|
||||
version = "0091006";
|
||||
version = "de20daa";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "tree-sitter-cuda";
|
||||
rev = "0091006d6498ee5647f080ef6c09e5b95e481078";
|
||||
hash = "sha256-t1wd32UE2Kz1VkIM4HfFFSDnttdCPGm1xOH9ZP+ATxc=";
|
||||
rev = "de20daa547344bec47d89e55a37fb9ab0706d8cc";
|
||||
hash = "sha256-gZctMdfwDCJEFNPKWLPr546V24clnIXUdiz4U7qISKY=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
|
||||
};
|
||||
@ -349,12 +360,12 @@
|
||||
};
|
||||
erlang = buildGrammar {
|
||||
language = "erlang";
|
||||
version = "f0e2f78";
|
||||
version = "2422bc9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "WhatsApp";
|
||||
repo = "tree-sitter-erlang";
|
||||
rev = "f0e2f78cdadb2e67323f9ed511656e47dcaa43bb";
|
||||
hash = "sha256-aMgKNcIQUkwA3rrzS5+gHzzGESabCtbLa9HGXmIxT90=";
|
||||
rev = "2422bc9373094bfa97653ac540e08759f812523c";
|
||||
hash = "sha256-DTIA3EP2RQtts6Hl6FThSxN1SwEUbRVJJig8zOUQRCo=";
|
||||
};
|
||||
meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";
|
||||
};
|
||||
@ -459,12 +470,12 @@
|
||||
};
|
||||
gitcommit = buildGrammar {
|
||||
language = "gitcommit";
|
||||
version = "190d288";
|
||||
version = "f71b93f";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gbprod";
|
||||
repo = "tree-sitter-gitcommit";
|
||||
rev = "190d288a1746bddb4abe96b597fb7d17b76e5522";
|
||||
hash = "sha256-PPdwdUfJ+2TCxVdEvexxGSBMDZmI1GW7eSfc/X3Me7Y=";
|
||||
rev = "f71b93f399c9c2b315825827c95466e7405ec622";
|
||||
hash = "sha256-489Rbi75XbW/IuFLijFThsI+BNXqVY1tVALwMT6yie0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
|
||||
};
|
||||
@ -637,12 +648,12 @@
|
||||
};
|
||||
hlsl = buildGrammar {
|
||||
language = "hlsl";
|
||||
version = "bd0d463";
|
||||
version = "8e2f090";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "tree-sitter-hlsl";
|
||||
rev = "bd0d463d1380816240a8cb1fd747fc0d3fed24aa";
|
||||
hash = "sha256-0Dafbn0+8N1MBRyOhiaZBo7KZqm8YpFzg/ZwT3SLq+g=";
|
||||
rev = "8e2f0907e8d2e17a88a375025e70054bafdaa8b0";
|
||||
hash = "sha256-kBSigaBR6uM4E9uHI79gYlxBrN0E5i1zTW8syMPIQdI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
|
||||
};
|
||||
@ -703,23 +714,23 @@
|
||||
};
|
||||
java = buildGrammar {
|
||||
language = "java";
|
||||
version = "09d650d";
|
||||
version = "dd597f1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-java";
|
||||
rev = "09d650def6cdf7f479f4b78f595e9ef5b58ce31e";
|
||||
hash = "sha256-tGBi6gJJIPpp6oOwmAQdqBD6eaJRBRcYbWtm1BHsgBA=";
|
||||
rev = "dd597f13eb9bab0c1bccc9aec390e8e6ebf9e0a6";
|
||||
hash = "sha256-JeQZ4TMpt6Lfbcfc6m/PzhFZEgTdouasJ3b1sPISy2s=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-java";
|
||||
};
|
||||
javascript = buildGrammar {
|
||||
language = "javascript";
|
||||
version = "7a29d06";
|
||||
version = "15e85e8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-javascript";
|
||||
rev = "7a29d06274b7cf87d643212a433d970b73969016";
|
||||
hash = "sha256-fMPCHdfHHyg7yNi9LDA35z+WFfPRbctrh38dZV5qZt4=";
|
||||
rev = "15e85e80b851983fab6b12dce5a535f5a0df0f9c";
|
||||
hash = "sha256-2SAJBnY8pmynGqB8OVqHeeAKovskO+C/XiJbLTKSlcM=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript";
|
||||
};
|
||||
@ -791,23 +802,34 @@
|
||||
};
|
||||
julia = buildGrammar {
|
||||
language = "julia";
|
||||
version = "0412178";
|
||||
version = "9d36818";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-julia";
|
||||
rev = "041217800bf423099015e1654c9a4fdd75310bb1";
|
||||
hash = "sha256-DwRU4yqnMFqMIh4mAo9a57SRXhOLTnWKjO6zSaczUNU=";
|
||||
rev = "9d368185be7e8139f2eda93d8b0acc2a54031718";
|
||||
hash = "sha256-6jKiqDo8fSHrUGFIizNSKWoB0CVXJv6b3XfN9YjNLJc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia";
|
||||
};
|
||||
kdl = buildGrammar {
|
||||
language = "kdl";
|
||||
version = "3a67244";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-kdl";
|
||||
rev = "3a67244a48e9446248fc48117afe11dab19b030a";
|
||||
hash = "sha256-mq+aG0C71b9OSug7chtopipVm1OJNLijmwe/PNb2ais=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-kdl";
|
||||
};
|
||||
kotlin = buildGrammar {
|
||||
language = "kotlin";
|
||||
version = "b953dbd";
|
||||
version = "e463703";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fwcd";
|
||||
repo = "tree-sitter-kotlin";
|
||||
rev = "b953dbdd05257fcb2b64bc4d9c1578fac12e3c28";
|
||||
hash = "sha256-xTbRn7bDN6FR9UOzw43RVHIahI/DFjwLGQj3cYoPurY=";
|
||||
rev = "e4637037a5fe6f25fe66c305669faa0855f35692";
|
||||
hash = "sha256-Xoj9RJqtyNtwag5tXRfu5iJpTnajRk1g7ClflBbFZyI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
|
||||
};
|
||||
@ -890,24 +912,24 @@
|
||||
};
|
||||
markdown = buildGrammar {
|
||||
language = "markdown";
|
||||
version = "16d0b5e";
|
||||
version = "b795aa9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MDeiml";
|
||||
repo = "tree-sitter-markdown";
|
||||
rev = "16d0b5e54d781150bea1070ffb360d47e6238659";
|
||||
hash = "sha256-Nz9vEOV9yz3Vk8TM41clp6isViHNiko9T9mEq4NA76k=";
|
||||
rev = "b795aa9893e4417609cf03723fe1e94e547ccfa4";
|
||||
hash = "sha256-TfQoNPZd6OBOi/E2anJSpjLg9MwQQjix7d7rIL92SEw=";
|
||||
};
|
||||
location = "tree-sitter-markdown";
|
||||
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
|
||||
};
|
||||
markdown_inline = buildGrammar {
|
||||
language = "markdown_inline";
|
||||
version = "16d0b5e";
|
||||
version = "b795aa9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MDeiml";
|
||||
repo = "tree-sitter-markdown";
|
||||
rev = "16d0b5e54d781150bea1070ffb360d47e6238659";
|
||||
hash = "sha256-Nz9vEOV9yz3Vk8TM41clp6isViHNiko9T9mEq4NA76k=";
|
||||
rev = "b795aa9893e4417609cf03723fe1e94e547ccfa4";
|
||||
hash = "sha256-TfQoNPZd6OBOi/E2anJSpjLg9MwQQjix7d7rIL92SEw=";
|
||||
};
|
||||
location = "tree-sitter-markdown-inline";
|
||||
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
|
||||
@ -947,12 +969,12 @@
|
||||
};
|
||||
nickel = buildGrammar {
|
||||
language = "nickel";
|
||||
version = "092e901";
|
||||
version = "d6c7eeb";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickel-lang";
|
||||
repo = "tree-sitter-nickel";
|
||||
rev = "092e90142667482996880044d2c04837d3d1c266";
|
||||
hash = "sha256-y0Lx6HdkoC7rOzm8fOfLBUt6672qe7AHe1SI6YY/aHE=";
|
||||
rev = "d6c7eeb751038f934b5b1aa7ff236376d0235c56";
|
||||
hash = "sha256-D/RRwXsWyHMxoU7Z8VVJ6jn7zUFKaKusLT/ofON7sOE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel";
|
||||
};
|
||||
@ -1091,6 +1113,17 @@
|
||||
};
|
||||
meta.homepage = "https://github.com/leo60228/tree-sitter-pioasm";
|
||||
};
|
||||
poe_filter = buildGrammar {
|
||||
language = "poe_filter";
|
||||
version = "80dc101";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ObserverOfTime";
|
||||
repo = "tree-sitter-poe-filter";
|
||||
rev = "80dc10195e26c72598ed1ab02cdf2d8e4c792e7b";
|
||||
hash = "sha256-KDsi8eLrTnZaD9XwyF24edmBNHre3FoTiD7RE/MpvEQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter";
|
||||
};
|
||||
prisma = buildGrammar {
|
||||
language = "prisma";
|
||||
version = "eca2596";
|
||||
@ -1269,12 +1302,12 @@
|
||||
};
|
||||
scala = buildGrammar {
|
||||
language = "scala";
|
||||
version = "067ee61";
|
||||
version = "b7cebd2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-scala";
|
||||
rev = "067ee61ff9484eac4f5bc4d57dfd007900c48f20";
|
||||
hash = "sha256-KyxlDQla/XTBHccJG+rTqN9EO90OElZd7y21f1HTibI=";
|
||||
rev = "b7cebd27eeb9c46082105938cae0acaaace573e3";
|
||||
hash = "sha256-E5RwaeFmYmvEAV1W+pMNseMuVCef++xZEFssqNHrfug=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
|
||||
};
|
||||
@ -1346,12 +1379,12 @@
|
||||
};
|
||||
sql = buildGrammar {
|
||||
language = "sql";
|
||||
version = "9d98029";
|
||||
version = "4fe05b2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "derekstride";
|
||||
repo = "tree-sitter-sql";
|
||||
rev = "9d9802991aa1d1bc00eee7713a838dab1eb4f149";
|
||||
hash = "sha256-Iy5rqNZem1r++aI7vGITzBSFGjdDLGHFOgBWqIgKZX0=";
|
||||
rev = "4fe05b2d81565ddb689d2f415e07afdacc515c52";
|
||||
hash = "sha256-rfx4jBKC2zXo+zWBBb2WkFopF00KB7WHzz7LZ3M026M=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
|
||||
@ -1450,12 +1483,12 @@
|
||||
};
|
||||
thrift = buildGrammar {
|
||||
language = "thrift";
|
||||
version = "999a27d";
|
||||
version = "a4e433e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "duskmoon314";
|
||||
repo = "tree-sitter-thrift";
|
||||
rev = "999a27d87b8f90a74306d4e79c5e22db3ab61633";
|
||||
hash = "sha256-9aadAYFKeBv0gc4SHCYH+m77BB0c4qXpmg1mOeKp6mw=";
|
||||
rev = "a4e433e7198c811d44164d50c491c82ec533dfdc";
|
||||
hash = "sha256-Nnmg8qWxPmDvyYkWpb9GvbaJHxzCWED7h+bkI/DLSWg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift";
|
||||
};
|
||||
@ -1472,12 +1505,12 @@
|
||||
};
|
||||
tlaplus = buildGrammar {
|
||||
language = "tlaplus";
|
||||
version = "d3ef05e";
|
||||
version = "6fd16d8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tlaplus-community";
|
||||
repo = "tree-sitter-tlaplus";
|
||||
rev = "d3ef05eec4473094e2d691243aa243ce63de6406";
|
||||
hash = "sha256-k5O6VheS8RBrSNk/GBjP3Qun4wY8cbPXxEFU0tCKbuU=";
|
||||
rev = "6fd16d8469c6898317423d61738d97e2b3f5caf7";
|
||||
hash = "sha256-s5mYc/kPZ4wHhm1ZeC5WBjBfzTFnANPRAZeE8UOVE1I=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus";
|
||||
};
|
||||
@ -1505,12 +1538,12 @@
|
||||
};
|
||||
tsx = buildGrammar {
|
||||
language = "tsx";
|
||||
version = "faad909";
|
||||
version = "5d20856";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-typescript";
|
||||
rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7";
|
||||
hash = "sha256-8W/YX2EP3brbDsURZ8YI04KqgLOK6QqXaiFikpwrTV0=";
|
||||
rev = "5d20856f34315b068c41edaee2ac8a100081d259";
|
||||
hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ=";
|
||||
};
|
||||
location = "tsx";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
|
||||
@ -1539,24 +1572,24 @@
|
||||
};
|
||||
typescript = buildGrammar {
|
||||
language = "typescript";
|
||||
version = "faad909";
|
||||
version = "5d20856";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-typescript";
|
||||
rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7";
|
||||
hash = "sha256-8W/YX2EP3brbDsURZ8YI04KqgLOK6QqXaiFikpwrTV0=";
|
||||
rev = "5d20856f34315b068c41edaee2ac8a100081d259";
|
||||
hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ=";
|
||||
};
|
||||
location = "typescript";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
|
||||
};
|
||||
v = buildGrammar {
|
||||
language = "v";
|
||||
version = "0b03983";
|
||||
version = "7ef1f12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "vls";
|
||||
rev = "0b039830a33e759f0c9ee978b47ad10b82d37349";
|
||||
hash = "sha256-sQxq/tWNN/aWD3ZmNhil45cnjzfy/2AXn2X/NhzvnKk=";
|
||||
rev = "7ef1f120c1c8950c7a3e1cdffe655bdd7220321b";
|
||||
hash = "sha256-2oVvuJsvEgv8J3abkV5ezAt0YdIkNNA4psqrcr4K+jo=";
|
||||
};
|
||||
location = "tree_sitter_v";
|
||||
meta.homepage = "https://github.com/vlang/vls";
|
||||
|
||||
@ -68,6 +68,9 @@
|
||||
# nvim-treesitter dependencies
|
||||
, callPackage
|
||||
|
||||
# sg.nvim dependencies
|
||||
, darwin
|
||||
|
||||
# sved dependencies
|
||||
, glib
|
||||
, gobject-introspection
|
||||
@ -484,10 +487,6 @@ self: super: {
|
||||
dependencies = with self; [ plenary-nvim ];
|
||||
});
|
||||
|
||||
gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: {
|
||||
dependencies = with self; [ lush-nvim ];
|
||||
});
|
||||
|
||||
himalaya-vim = super.himalaya-vim.overrideAttrs (old: {
|
||||
postPatch = ''
|
||||
substituteInPlace plugin/himalaya.vim \
|
||||
@ -748,6 +747,34 @@ self: super: {
|
||||
];
|
||||
});
|
||||
|
||||
sg-nvim = super.sg-nvim.overrideAttrs (old:
|
||||
let
|
||||
sg-nvim-rust = rustPlatform.buildRustPackage {
|
||||
pname = "sg-nvim-rust";
|
||||
inherit (old) version src;
|
||||
|
||||
cargoHash = "sha256-lrVwmJqfERq/tj4u+kRJ0kgbPQaFNAR6M3d4GqIJJyU=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
cargoBuildFlags = [ "--workspace" ];
|
||||
|
||||
# tests are broken
|
||||
doCheck = false;
|
||||
};
|
||||
in
|
||||
{
|
||||
dependencies = with self; [ plenary-nvim ];
|
||||
postInstall = ''
|
||||
mkdir -p $out/target/debug
|
||||
ln -s ${sg-nvim-rust}/{bin,lib}/* $out/target/debug
|
||||
'';
|
||||
});
|
||||
|
||||
skim = buildVimPluginFrom2Nix {
|
||||
pname = "skim";
|
||||
inherit (skim) version;
|
||||
@ -1056,7 +1083,7 @@ self: super: {
|
||||
libiconv
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-v9RXW5RSPMotRVR/9ljBJ9VNbrLnSkU3zlEU79Xem28=";
|
||||
cargoSha256 = "sha256-fPVLVJXvC5blIjZ3Qyc/lxq+V+qoGrIKrXEzwdNpdHc=";
|
||||
};
|
||||
in
|
||||
''
|
||||
|
||||
@ -622,6 +622,7 @@ https://github.com/megaannum/self/,,
|
||||
https://github.com/jaxbot/semantic-highlight.vim/,,
|
||||
https://github.com/numirias/semshi/,,
|
||||
https://github.com/junegunn/seoul256.vim/,,
|
||||
https://github.com/tjdevries/sg.nvim/,HEAD,
|
||||
https://github.com/osyo-manga/shabadou.vim/,,
|
||||
https://github.com/AndrewRadev/sideways.vim/,,
|
||||
https://github.com/lotabout/skim.vim/,,
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kdevelop-pg-qt";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
|
||||
sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1";
|
||||
sha256 = "sha256-PVZgTEefjwSuMqUj7pHzB4xxcRfQ3rOelz4iSUy7ZfE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config extra-cmake-modules ];
|
||||
|
||||
@ -1,24 +1,5 @@
|
||||
From 8befa137776786829508f23dd33ab37e2b95a895 Mon Sep 17 00:00:00 2001
|
||||
From: Poncho <poncho@spahan.ch>
|
||||
Date: Mon, 7 Sep 2020 09:39:49 +0200
|
||||
Subject: [PATCH] Fix building with bison 3.7
|
||||
|
||||
Bison 3.7 changes how header files are included [1][2], in that instead of
|
||||
copying and inserting the contents of a file, the file itself is included
|
||||
(by default as '"basename.h"').
|
||||
|
||||
[1] https://lists.gnu.org/archive/html/info-gnu/2020-07/msg00006.html
|
||||
[2] https://www.gnu.org/software/bison/manual/html_node/_0025define-Summary.html
|
||||
|
||||
Close: https://github.com/GoldenCheetah/GoldenCheetah/issues/3586
|
||||
---
|
||||
src/Core/DataFilter.y | 3 +++
|
||||
src/Core/RideDB.y | 2 ++
|
||||
src/FileIO/JsonRideFile.y | 3 +++
|
||||
3 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/src/Core/DataFilter.y b/src/Core/DataFilter.y
|
||||
index 7c5e481b0..142e80a5c 100644
|
||||
index 30070f131..15f746a10 100644
|
||||
--- a/src/Core/DataFilter.y
|
||||
+++ b/src/Core/DataFilter.y
|
||||
@@ -49,6 +49,9 @@ extern Leaf *DataFilterroot; // root node for parsed statement
|
||||
@ -28,8 +9,8 @@ index 7c5e481b0..142e80a5c 100644
|
||||
+// generated by the scanner
|
||||
+%define api.header.include {"DataFilter_yacc.h"}
|
||||
+
|
||||
// Symbol can be meta or metric name
|
||||
%token <leaf> SYMBOL PYTHON
|
||||
// Symbol can be meta, metric, variable or function name
|
||||
%token <string> SYMBOL PYTHON
|
||||
|
||||
diff --git a/src/Core/RideDB.y b/src/Core/RideDB.y
|
||||
index d6da086bd..f2001e23c 100644
|
||||
@ -58,6 +39,21 @@ index 2cbbef9fc..d5c77a779 100644
|
||||
%pure-parser
|
||||
%lex-param { void *scanner }
|
||||
%parse-param { struct JsonContext *jc }
|
||||
--
|
||||
2.34.1
|
||||
|
||||
diff --git a/src/gcconfig.pri.in b/src/gcconfig.pri.in
|
||||
index a280bbb6b..07e543372 100644
|
||||
--- a/src/gcconfig.pri.in
|
||||
+++ b/src/gcconfig.pri.in
|
||||
@@ -75,10 +75,10 @@
|
||||
|
||||
# Let us know where flex and bison are installed.
|
||||
# You may need to specify the full path if things don't work.
|
||||
-#QMAKE_LEX = flex
|
||||
-#QMAKE_YACC = bison
|
||||
+QMAKE_LEX = flex
|
||||
+QMAKE_YACC = bison
|
||||
# If you are using bison 3.7 or higher, uncomment the line below
|
||||
-#QMAKE_MOVE = cp
|
||||
+QMAKE_MOVE = cp
|
||||
# If you're compiling with nmake and VC then you
|
||||
# will likely also use win_flex and win_bison
|
||||
# so uncomment below
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, fetchFromGitHub, fetchpatch, mkDerivation
|
||||
, qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools
|
||||
, qtconnectivity, qtcharts, libusb-compat-0_1, gsl, blas
|
||||
, bison, flex, zlib, qmake, makeDesktopItem, makeWrapper
|
||||
, bison, flex, zlib, qmake, makeDesktopItem, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
let
|
||||
@ -16,13 +16,13 @@ let
|
||||
};
|
||||
in mkDerivation rec {
|
||||
pname = "golden-cheetah";
|
||||
version = "3.6-DEV2111";
|
||||
version = "3.6-RC3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoldenCheetah";
|
||||
repo = "GoldenCheetah";
|
||||
rev = "v${version}";
|
||||
sha256 = "17sk89szvaq31bcv6rgfn1bbw132k7w8zlalfb3ayflavdxbk6sa";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/LGVDeWJZZXy5r5WxElDuxUagpA/RIwHGRbkcdO8IrE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -39,7 +39,7 @@ in mkDerivation rec {
|
||||
gsl
|
||||
blas
|
||||
];
|
||||
nativeBuildInputs = [ flex makeWrapper qmake bison ];
|
||||
nativeBuildInputs = [ flex wrapQtAppsHook qmake bison ];
|
||||
|
||||
patches = [
|
||||
# allow building with bison 3.7
|
||||
@ -55,11 +55,10 @@ in mkDerivation rec {
|
||||
preConfigure = ''
|
||||
cp src/gcconfig.pri.in src/gcconfig.pri
|
||||
cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
|
||||
echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri
|
||||
echo 'LIBUSB_INSTALL = ${libusb-compat-0_1}' >> src/gcconfig.pri
|
||||
echo 'LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include' >> src/gcconfig.pri
|
||||
echo 'LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb' >> src/gcconfig.pri
|
||||
sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local
|
||||
sed -i 's,^#QMAKE_LRELEASE.*,QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease,' src/gcconfig.pri
|
||||
sed -i 's,^#LIBUSB_INSTALL.*,LIBUSB_INSTALL = ${libusb-compat-0_1},' src/gcconfig.pri
|
||||
sed -i 's,^#LIBUSB_INCLUDE.*,LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include,' src/gcconfig.pri
|
||||
sed -i 's,^#LIBUSB_LIBS.*,LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb,' src/gcconfig.pri
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
@ -76,7 +75,7 @@ in mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Performance software for cyclists, runners and triathletes";
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ adamcstephens ];
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tippecanoe";
|
||||
version = "2.18.0";
|
||||
version = "2.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "felt";
|
||||
repo = "tippecanoe";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-+V6nV2L1lE5QEkZcDMg9WE3iiBuZN/QTMR+XX/IdjmA=";
|
||||
hash = "sha256-FWdAMIAoj3/+SQLIan++UpmWH1o3v92FsDw//b5RorM=";
|
||||
};
|
||||
|
||||
buildInputs = [ sqlite zlib ];
|
||||
|
||||
@ -10,18 +10,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "usql";
|
||||
version = "0.13.5";
|
||||
version = "0.13.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xo";
|
||||
repo = "usql";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Tsv2nUlxu/nUsupQgYn1CAy/mrwq14OEFZErgO34thU=";
|
||||
hash = "sha256-FmwsiCXSnTEvA1oAScJhnl1ZG7WTfbNQyJBULnNt9/c=";
|
||||
};
|
||||
|
||||
buildInputs = [ unixODBC icu ];
|
||||
|
||||
vendorHash = "sha256-Zd8/1i9YwVoOoJ1NG5gMGB781IbNBL5lfkrSwYNn9Hg=";
|
||||
vendorHash = "sha256-lla+smDg6nNNQZYEQI5xY3iRw4gm6WCDh8gDZ6N9lqk=";
|
||||
proxyVendor = true;
|
||||
|
||||
# Exclude broken impala & hive driver
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{
|
||||
"stable": {
|
||||
"version": "109.0.5414.74",
|
||||
"sha256": "0pcfaj3n3rjk4va9g0ajlsv1719kdhqcnjdd4piinqxb4qy27vgd",
|
||||
"sha256bin64": "1qfp9li90p2d6asy60v12h7r4025l01yf3dzcdyihvr0la3bhdrx",
|
||||
"version": "109.0.5414.119",
|
||||
"sha256": "0bdyb14v12izxkldq27jx532p0bid3wdwfpd1mwm7jqswxgfzkfb",
|
||||
"sha256bin64": "0iap6i4zmflp4fsj16knwdp03gixsdkbys0scbvvzs3fzy2r5zkx",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-11-10",
|
||||
@ -12,16 +12,16 @@
|
||||
}
|
||||
},
|
||||
"chromedriver": {
|
||||
"version": "109.0.5414.25",
|
||||
"sha256_linux": "1gybh9nyc2j96ics1898qkrn1aajb2gpjb8l6b2p0hs24iqhjilg",
|
||||
"sha256_darwin": "1w3sz9sxjkir2wwkzjx870qq04xzf9z7b59m953w33mkfm6zvz71",
|
||||
"sha256_darwin_aarch64": "1qfg22glac44y5pdzscm2yr6wjnhm7p7pkiadblky27fp13dpyv0"
|
||||
"version": "109.0.5414.74",
|
||||
"sha256_linux": "1mhnw4maixwfhrz3r3mhpr9bl9hn7cvr2ji6y6ai32hxa1ix9m6f",
|
||||
"sha256_darwin": "0w46xd05m7irfxqsfnjwgd2v65c9vgnh8awaknqgh02wmdgx3nm0",
|
||||
"sha256_darwin_aarch64": "0amb2kd4cq4clir9gqr1b1mdy46m8nwzka227xxjd2i14vwzckb0"
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "110.0.5481.38",
|
||||
"sha256": "0y3clfzqnbyz0v53w3ha1kx4jb9skdf22ihs09i8b568dj1m9mwj",
|
||||
"sha256bin64": "0gvxsgw0ywq8d689g8790fymhksqg744m3j7kg4hcnmiyqdajl0n",
|
||||
"version": "110.0.5481.52",
|
||||
"sha256": "09khb67xl1b2caw0j9lmv6a9iyms9sprn2r7wsgqzjn9dzd9wwcq",
|
||||
"sha256bin64": "0dv9fxwqn50hl06y7zfqby8hd9lwqwk2q3856fygbn82qppkbl4r",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-12-12",
|
||||
@ -32,9 +32,9 @@
|
||||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "111.0.5545.6",
|
||||
"sha256": "0c5v7w0fbhrgqialncx0adyyah2026icwrxjwywridah1jrbm90a",
|
||||
"sha256bin64": "1m3s40hibs3f1j3g2asq102iijjd59xrqqz7iv82za1slnrcbfg5",
|
||||
"version": "111.0.5562.0",
|
||||
"sha256": "0aviz1cjm00lya530n0wyqn85d3idzn3bbp8065ygvfawqcf163j",
|
||||
"sha256bin64": "0azkcvbl645c9ph4vn4502qbgfcb7zbs4ycy3q73nj5al642absm",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-12-12",
|
||||
|
||||
@ -7,20 +7,20 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.8.56";
|
||||
version = "0.8.59";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
sha256 = "sha256-iU0/ovnclq/jwhi1d6zY4tz56ZB7FT0Mbpi2tEjb9QI=";
|
||||
sha256 = "sha256-uvvxlU5c5MNYVqu0btL4xpjyvb/fDbFPGWkIzru84Z8=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorHash = "sha256-DsLW5l7TxlXRFZDhtRfq5YqVT3XR7EZGNIoPiksHNck=";
|
||||
vendorHash = "sha256-WQsnBBx05wXKDS7h3bhipTqZTQLxRjVLObuMNUfAiTk=";
|
||||
|
||||
# Exclude pkg/get: tests downloading of binaries which fail when sandbox=true
|
||||
subPackages = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20230109-1";
|
||||
version = "20230128-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-wPx1W0eaQHpA/jcZ+A7YFL5FwPqz12j/jPgxa1JeEM8=";
|
||||
sha256 = "sha256-wYhftShCL9XozK0c7OLijqzveDvEvv9stpw+6CQND/Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-repo";
|
||||
version = "2.30";
|
||||
version = "2.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "android";
|
||||
repo = "tools_repo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ck+Q7sHhMqUWu6WeA3DhY+svMxH2sU0WvmyvZ5qsW+E=";
|
||||
sha256 = "sha256-Xr5VH7iMboh2F2iBqjIo+PNmWcC/GCYJp3PrPbeyefQ=";
|
||||
};
|
||||
|
||||
# Fix 'NameError: name 'ssl' is not defined'
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "ibm-plex";
|
||||
version = "6.0.1";
|
||||
version = "6.1.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
|
||||
hash = "sha256-n13NuKrZUc0JGvDf2PLZkxogefDkEHaOZk4JN42/C74=";
|
||||
hash = "sha256-PZ7KPtaXZFVD5uMc7i+GQMA4DU5PsspeAodiU/FrTpY=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "sudo-font";
|
||||
version = "0.64";
|
||||
version = "0.69";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
|
||||
hash = "sha256-Y99YPoNpe55Wrj5epiqqQ6ddUBTj9uI4oj4M5ARTzJo=";
|
||||
hash = "sha256-GXlQh9JRAzbwWKTJw/y003ywjaWtiQayHxiWPTPvIO0=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -36,13 +36,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ogre";
|
||||
version = "13.6.0";
|
||||
version = "13.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OGRECave";
|
||||
repo = "ogre";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yPIrF0jSeWXQ67U/QDgeQnMPvxsyaecyiW964kLsDAE=";
|
||||
hash = "sha256-UG/vwLE80Ski9NwMj9E5+PoLU6rSCdJrSmQOmmFv66U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "plasma-wayland-protocols";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-pCdbmoVHFvpe2cK6LWl98rB0n8RaKK2WXmjQqjbF1Mg=";
|
||||
sha256 = "sha256-MZSIZ8mgRhPm3g0jrfy8Ws7N3vCzn5hrNF7GwZcnNv4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
||||
@ -1,8 +1,10 @@
|
||||
{ lib
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPyPy
|
||||
, python
|
||||
, openblas
|
||||
, blas
|
||||
, lapack # build segfaults with 64-bit blas
|
||||
, suitesparse
|
||||
@ -28,13 +30,23 @@ buildPythonPackage rec {
|
||||
sha256 = "sha256-ALGyMvnR+QLVeKnXWBS2f6AgdY1a5CLijKjO9iafpcY=";
|
||||
};
|
||||
|
||||
buildInputs = [ blas lapack ];
|
||||
buildInputs = (if stdenv.isDarwin then [ openblas ] else [ blas lapack ]);
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
# similar to Gsl, glpk, fftw there is also a dsdp interface
|
||||
# but dsdp is not yet packaged in nixpkgs
|
||||
preConfigure = ''
|
||||
preConfigure = (if stdenv.isDarwin then
|
||||
''
|
||||
export CVXOPT_BLAS_LIB=openblas
|
||||
export CVXOPT_LAPACK_LIB=openblas
|
||||
''
|
||||
else
|
||||
''
|
||||
export CVXOPT_BLAS_LIB=blas
|
||||
export CVXOPT_LAPACK_LIB=lapack
|
||||
'') +
|
||||
''
|
||||
export CVXOPT_BUILD_DSDP=0
|
||||
export CVXOPT_SUITESPARSE_LIB_DIR=${lib.getLib suitesparse}/lib
|
||||
export CVXOPT_SUITESPARSE_INC_DIR=${lib.getDev suitesparse}/include
|
||||
'' + lib.optionalString withGsl ''
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "codeql";
|
||||
version = "2.12.0";
|
||||
version = "2.12.1";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
|
||||
sha256 = "sha256-V+UXodw84NGZPi3Ws4hKyftqnGibn9uFgrkGXxpRAZc=";
|
||||
sha256 = "sha256-rJdB1G2/Fbs5zwfXF/Q79k1IztkOJrL7b0sjH5kcEMs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "millet";
|
||||
version = "0.7.5";
|
||||
version = "0.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "azdavis";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lRWL8J83U8W/QdxNew9To4kbqhmqt0KUQMnaODTfT1U=";
|
||||
hash = "sha256-7Mv1+c8X+rZQyw3y+eGvSyqVqiSPdTj1WxoUv1mynSs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IGEmcFmkEm+seGf9eLokU7pjRNgwOaJr+mf152yogw8=";
|
||||
cargoHash = "sha256-0fJIp2zlZkeidTFg6jQs6S2mVHJL8flqiZtTvM0F9OQ=";
|
||||
|
||||
postPatch = ''
|
||||
rm .cargo/config.toml
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "revive";
|
||||
version = "1.2.4";
|
||||
version = "1.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mgechev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tD6Z7W/sPwHKqvCXjXLlxkGj3FZ4+QCv9vn7KdCmSv4=";
|
||||
sha256 = "sha256-pWX3dZqZ9UZ/k8c1K0xAgonsxZVrutWJ1PROQusO9vQ=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@ -18,7 +18,7 @@ buildGoModule rec {
|
||||
rm -rf $out/.git
|
||||
'';
|
||||
};
|
||||
vendorSha256 = "sha256-sa4OkTSRyoPFXTGmjpiqBug+EKgxkcJrNxQwbTRfN2A=";
|
||||
vendorHash = "sha256-IfayKnHCe1HHSi7YPNz8Wlz1TSAiVGs0rxpY9HYG3s8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@ -35,7 +35,7 @@ buildGoModule rec {
|
||||
|
||||
# The following tests fail when built by nix:
|
||||
#
|
||||
# $ nix log /nix/store/build-revive.1.2.4.drv | grep FAIL
|
||||
# $ nix log /nix/store/build-revive.1.2.5.drv | grep FAIL
|
||||
#
|
||||
# --- FAIL: TestAll (0.01s)
|
||||
# --- FAIL: TestTimeEqual (0.00s)
|
||||
|
||||
@ -3,16 +3,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "matrix-dendrite";
|
||||
version = "0.10.8";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "dendrite";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-D+hZWcywOCynGxMlJtsr5YaGxwRVGODNYO8jZROsGX8=";
|
||||
sha256 = "sha256-EJUHpV+ZsMMSMsJGhF0Atblksg5rgI3a2qcRxLyZP38=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-mNvie0PP0758AndWQ629oY4/aFGwiG358NhwYHSdxEU=";
|
||||
vendorHash = "sha256-Ygd5wC4j0kAbEMMVct5WXZvkcYSqqK8d7ZZ9CDU1RHU=";
|
||||
|
||||
subPackages = [
|
||||
# The server as a monolith: https://matrix-org.github.io/dendrite/installation/install/monolith
|
||||
|
||||
22
pkgs/servers/xteve/default.nix
Normal file
22
pkgs/servers/xteve/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "xteve";
|
||||
version = "2.2.0.200";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xteve-project";
|
||||
repo = "xTeVe";
|
||||
rev = version;
|
||||
hash = "sha256-hD4GudSkGZO41nR/CgcMg/SqKjpAO1yJDkfwa8AUges=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-oPkSWpqNozfSFLIFsJ+e2pOL6CcR91YHbqibEVF2aSk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "M3U Proxy for Plex DVR and Emby Live TV";
|
||||
homepage = "https://github.com/xteve-project/xTeVe";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ nrhelmi ];
|
||||
};
|
||||
}
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jfrog-cli";
|
||||
version = "2.32.0";
|
||||
vendorSha256 = "sha256-nL+2Yc4gI2+SoxoaGlazecsrcVkVh6Ig9sqITSOa5e0=";
|
||||
version = "2.34.0";
|
||||
vendorHash = "sha256-Z0ifACsdSIYevsvRD5KACFSRlvrL1jIJbrzjDFeLbEQ=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jfrog";
|
||||
repo = "jfrog-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EyDX4OrBAzc5eYR660SrGIG61TRlWnnV/GAtXy7DfEI=";
|
||||
sha256 = "sha256-SDZzbUh3wbDfzkE/5GgFstDuMYLiM8+MXRZ79jYGoaQ=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "phrase-cli";
|
||||
version = "2.6.4";
|
||||
version = "2.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phrase";
|
||||
repo = "phrase-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-9jNRXAP+qNihqr30/dSHqzDkyh+GauafMQBkBit5gmc=";
|
||||
sha256 = "sha256-6pt8WjfSt458FIK/cCzEOM9mFruFY6jBnkXoRWIhOr0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zUwp7RqaKtxbTzEOhcmGG/+tqtBKs7cm6+sFNCKET08=";
|
||||
|
||||
@ -40,13 +40,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rpm-ostree";
|
||||
version = "2022.13";
|
||||
version = "2023.1";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-3lU+Xmfyjs6AFnf+vE5xMSAntRoNeHBVrOJZLvv1YyY=";
|
||||
hash = "sha256-JNLp1IHbIRpe3Au2iUsx7x065rirQlzT9bg7CoqHCyg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -114,6 +114,9 @@ stdenv.mkDerivation rec {
|
||||
env NOCONFIGURE=1 ./autogen.sh
|
||||
'';
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/201254
|
||||
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model";
|
||||
homepage = "https://coreos.github.io/rpm-ostree/";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gost";
|
||||
version = "2.11.1";
|
||||
version = "2.11.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ginuerzh";
|
||||
repo = "gost";
|
||||
rev = "v${version}";
|
||||
sha256 = "1mxgjvx99bz34f132827bqk56zgvh5rw3h2xmc524wvx59k9zj2a";
|
||||
sha256 = "sha256-UBjrWeBw9+qKQ/+1T1W/3e0vrigp540URIyM2d9iCE8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1cgb957ipkiix3x0x84c77a1i8l679q3kqykm1lhb4f19x61dqjh";
|
||||
vendorHash = "sha256-lA4uW0cc0XqU9pjVEMapFLb3eD20Lea9PbkgL3sjJns=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace http2_test.go \
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kestrel";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "finfet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aJKqx/PY7BanzE5AtqmKxvkULgXXqueGnDniLd9tHOg=";
|
||||
hash = "sha256-kEM81HIfWETVrUiqXu1+3az+Stg3GdjHE7FaxXJgNYk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-UnXaDdQzoYP1N2FnLjOQgiJKnCyCojXKKxVlWYZT0DE=";
|
||||
cargoHash = "sha256-xv35oFawFLVXZS3Eum6RCo8LcVvHftfv+UvJYYmIDx4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -11501,6 +11501,8 @@ with pkgs;
|
||||
|
||||
rpm-ostree = callPackage ../tools/misc/rpm-ostree {
|
||||
gperf = gperf_3_0;
|
||||
# https://github.com/NixOS/nixpkgs/issues/201254
|
||||
stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv;
|
||||
};
|
||||
|
||||
rpm2targz = callPackage ../tools/archivers/rpm2targz { };
|
||||
@ -13107,6 +13109,8 @@ with pkgs;
|
||||
|
||||
xray = callPackage ../tools/networking/xray { };
|
||||
|
||||
xteve = callPackage ../servers/xteve { };
|
||||
|
||||
testdisk = libsForQt5.callPackage ../tools/system/testdisk { };
|
||||
|
||||
testdisk-qt = testdisk.override { enableQt = true; };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user