Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-07-25 06:01:16 +00:00 committed by GitHub
commit 63fdfd7d0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 370 additions and 154 deletions

View file

@ -7501,6 +7501,16 @@
githubId = 22085373;
name = "Luis Hebendanz";
};
luizribeiro = {
email = "nixpkgs@l9o.dev";
matrix = "@luizribeiro:matrix.org";
name = "Luiz Ribeiro";
github = "luizribeiro";
githubId = 112069;
keys = [{
fingerprint = "97A0 AE5E 03F3 499B 7D7A 65C6 76A4 1432 37EF 5817";
}];
};
lunarequest = {
email = "nullarequest@vivlaid.net";
github = "Lunarequest";

View file

@ -0,0 +1,70 @@
{ stdenv
, lib
, fetchFromGitHub
, glib
, meson
, ninja
, wrapGAppsHook
, desktop-file-utils
, gobject-introspection
, gtk3
, python3
}:
stdenv.mkDerivation rec {
pname = "siglo";
version = "0.9.9";
src = fetchFromGitHub {
owner = "theironrobin";
repo = "siglo";
rev = "v${version}";
hash = "sha256-4jKsRpzuyHH31LXndC3Ua4TYcI0G0v9qqe0cbvLuCDA=";
};
patches = [
./siglo-no-user-install.patch
];
postPatch = ''
chmod +x build-aux/meson/postinstall.py # patchShebangs requires an executable file
patchShebangs build-aux/meson/postinstall.py
'';
nativeBuildInputs = [
glib
meson
ninja
wrapGAppsHook
python3.pkgs.wrapPython
python3
desktop-file-utils
gtk3
];
buildInputs = [
gtk3
python3.pkgs.gatt
gobject-introspection
];
pythonPath = with python3.pkgs; [
gatt
pybluez
requests
];
preFixup = ''
buildPythonPath "$out $pythonPath"
gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
'';
meta = with lib; {
description = "GTK app to sync InfiniTime watch with PinePhone";
homepage = "https://github.com/theironrobin/siglo";
changelog = "https://github.com/theironrobin/siglo/tags/v${version}";
license = licenses.mpl20;
maintainers = with maintainers; [ tomfitzhenry ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,13 @@
diff --git a/data/meson.build b/data/meson.build
index 62a00fe..5319974 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -18,8 +18,6 @@ install_data(join_paths('icons', 'com.github.alexr4535.siglo.svg'),
install_dir: join_paths(get_option('datadir'), 'icons')
)
-install_data('siglo.service', install_dir: '/etc/systemd/user/')
-
appstream_file = i18n.merge_file(
input: 'com.github.alexr4535.siglo.appdata.xml.in',
output: 'com.github.alexr4535.siglo.appdata.xml',

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "popeye";
version = "0.10.0";
version = "0.10.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "derailed";
repo = "popeye";
sha256 = "sha256-iCsEYbEENDOg69wdWu9QQ8tTGxvaY2i/Hboc6XSYyEM=";
sha256 = "sha256-GETCwj9T1D6paG56LT/N2YkISE7UBpt/femwvHyHHJE=";
};
ldflags = [
@ -17,9 +17,7 @@ buildGoModule rec {
"-X github.com/derailed/popeye/cmd.commit=${version}"
];
vendorSha256 = "sha256-aLTzhBMwQHa6twzBC3FyMsZa1vQsBDdg4MpzJWZz3n4=";
doCheck = true;
vendorSha256 = "sha256-ZRDcZbaoGJ8jgSwMXTTcWSv/4dlOoTNcuj/bN4QYHNE=";
doInstallCheck = true;
installCheckPhase = ''

View file

@ -1,23 +1,29 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
, rtl-sdr, soapysdr
} :
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, rtl-sdr
, soapysdr
, libobjc
, IOKit
, Security
}:
let
version = "0.3.0";
in stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "soapyrtlsdr";
inherit version;
version = "0.3.3";
src = fetchFromGitHub {
owner = "pothosware";
repo = "SoapyRTLSDR";
rev = "soapy-rtlsdr-${version}";
sha256 = "15j0s7apbg9cjr6rcbr058kl0r3szwzf00ixcbykxb77fh7c6r9w";
rev = "soapy-rtl-sdr-${finalAttrs.version}";
sha256 = "sha256-IapdrBE8HhibY52Anm76/mVAoA0GghwnRCxxfGkyLTw=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ rtl-sdr soapysdr ];
buildInputs = [ rtl-sdr soapysdr ]
++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ];
cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
@ -25,7 +31,7 @@ in stdenv.mkDerivation {
homepage = "https://github.com/pothosware/SoapyRTLSDR";
description = "SoapySDR plugin for RTL-SDR devices";
license = licenses.mit;
maintainers = with maintainers; [ ragge ];
maintainers = with maintainers; [ ragge luizribeiro ];
platforms = platforms.unix;
};
}
})

View file

@ -11,7 +11,7 @@ let
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
in stdenv.mkDerivation rec {
pname = "${name}-bin";
version = "15.6.0";
version = "15.6.1";
src = fetchurl {
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";

View file

@ -1,95 +1,95 @@
# This file was autogenerated. DO NOT EDIT!
{
iosevka = "1frma5fnrfq1z06mvpy3wvp7jkww8qlji308b3pxv0nxwgjd1vyv";
iosevka-aile = "086ml3r09k3raxrwdmqgn7s7xga1zgrkvzxsldzwjpsw9jsax0m6";
iosevka-curly = "000n3wsjsk562lpydmck2c36sxd0w2wkjgz8f7dm8iw57ls9pn6g";
iosevka-curly-slab = "1cybjnmiwqjxj0rw3lil7n5vc6c30dg7ak0dz4g6q5klbnsw354s";
iosevka-etoile = "0gxhsgsxzkz34lln20aqz0rd8wvm58090f6v8z4fi5qsm0dla06s";
iosevka-slab = "00nd3h8vyqzlwbp45by6crzjq9rjpmj0nmmbbq17xvjgxxfhjsxr";
iosevka-ss01 = "1yq8bnrbw3g24xsnrwbq1vl05m4dlcpjl29h8g8irhhpbnnm44nx";
iosevka-ss02 = "1r40drbjxpwb7aqa24hh90nxayzj3gah110fsf8yjq5l5azg9ds8";
iosevka-ss03 = "1mlg9qjfdfia0vwd86gi9ygbbnamld56lpf4h6m7gr8y8v00p07i";
iosevka-ss04 = "0ap45s2si80gbz78q5v8qqga2ipy9dsz9hkq5dyfh8axlx1wiy7p";
iosevka-ss05 = "1mah12ihqwqlkmr01l5z6kasb6h6xifgd7acfypz5547ip2zy425";
iosevka-ss06 = "09w0hm5djjhfvy6lhbynvlq6ckd70zisv0z5y7w4jfmanif8jns3";
iosevka-ss07 = "17imf7021ncpl9f8nbm1c0bjz5grz1iqgvpz48vpqd56632ac6k6";
iosevka-ss08 = "199bf0qa76z59ad5d7fcgkiq8m4fxcia7q162zzjlxpl5bgv0665";
iosevka-ss09 = "0w7jcgi4vn5ix58ji5cybpbnzvdl21k1r6rxad76z97ywwqbflag";
iosevka-ss10 = "18vm9p6jdbyfc8q3cz8wf3sgd0xn7pzyw3qxld9d2qg83siybsmk";
iosevka-ss11 = "0aj1l0g3zzcr3grkj1l6s39449g60v6hvjfmb4xx4kxg7h1h5b4i";
iosevka-ss12 = "0zl2ffmgnlrcaj8mzfgp5x5z7iras5svdpf0zl2xcgjn15k17lkx";
iosevka-ss13 = "0b58jjhd17i9pc5gdcx3xj9y8bgzwxrlh21j6di4cgvgj41gh46k";
iosevka-ss14 = "0vlqr5s40xcc2645vsaap42cgfswi2p4hbpqbfjfzsmf41w6j6qc";
iosevka-ss15 = "01qgvdmy8frbasb5d39c12dxjlha6iv1dq621il0dzm0850x48ys";
iosevka-ss16 = "12vl98p6w73l4rfy2scn57jrvg2jxk99d2vsndri013grx488lq5";
iosevka-ss17 = "0336m1i7vdd86jgyfdnsw4f6pdzcd4d757gxf8pa3h6jyczcn8n1";
iosevka-ss18 = "07sqd4zwc85q8mh9l1bc2nbyr966b0bh9fff9rk91jrk106fijcl";
sgr-iosevka = "0adxnngdwz6lmp4yla8amk0840y9k6d3k1jl90z5qd3dpl0m0w7z";
sgr-iosevka-aile = "07470h9apwbmnai1rzx5s9jw3195gsxqv6q0z1gnf56mp94wihg1";
sgr-iosevka-curly = "1jii49qqlrpvzczwqi39001j0qwbrzklc96bwampn9f0la1iqcbf";
sgr-iosevka-curly-slab = "0bwfsimzkw4pbk6qy4nvbpwcw0h3m16qsjaqwrwfhnzy8hqc6akc";
sgr-iosevka-etoile = "091ikanzxmkb673wfcfdg9qm56xqv4vwd3c1ph0c5bzc2nz3il50";
sgr-iosevka-fixed = "1nz7x90zcbmvwldiz5zv5j22qyjgjn4ba42liki747lr930f38lm";
sgr-iosevka-fixed-curly = "17y7h5jwim59zybpmkv3rqdcc41dxax5145xmhyzvagblsc7qlpk";
sgr-iosevka-fixed-curly-slab = "1xfaszbpydi6vzif14bymv5cqlwxvvkdadba4jhy0psc7b30k095";
sgr-iosevka-fixed-slab = "0pbmhr3nbb777ym30qmhlp4swq0q1f5aqc6i7453fc0lhygmcg55";
sgr-iosevka-fixed-ss01 = "1klxs5npm5i1sxgrnkbkf1rbn1dvrdxp6mr34kjxkjxrd5flrb6m";
sgr-iosevka-fixed-ss02 = "0aw0yqmvahk0wagyb2k6q6jibpdlyza3q7zn2a7pi36pcnm9b2rn";
sgr-iosevka-fixed-ss03 = "0ssxx7a7cskd8lcfy3lnjic1qgzy087d6vk7hmhnlg52jhcfbkjm";
sgr-iosevka-fixed-ss04 = "0fhqzj5ksvcp1rxa8g11a0jwznhwb5xw41wpvjqy1za1qh2h6shw";
sgr-iosevka-fixed-ss05 = "06z42m7x565wzsf9sfxi4p4846cb3mgz7mr5h3xa528789fk1sx0";
sgr-iosevka-fixed-ss06 = "0hzy5bj3ac009q515ylxlc73d1qwdfqcxfq8jxla5h6cgcfipnl4";
sgr-iosevka-fixed-ss07 = "1051ah3q8wgdana4a9v38szd36wdy0h3c15sf1blm0cv3y0q7cv3";
sgr-iosevka-fixed-ss08 = "05pg3ywxg8m4c1ij8xpd43azz1671v1bsw7r3szbiqmmlq651h9w";
sgr-iosevka-fixed-ss09 = "0way85q2jwkhz8ixicx73s1x1hsyznr524am95igqkzwaz7c72q9";
sgr-iosevka-fixed-ss10 = "12b91hk7i00766gmd04dgh3c6m42bvbc25y9h049c6rfimzd9f75";
sgr-iosevka-fixed-ss11 = "1pn06gz3jrksg6f2glk45gj9i7jmgnh4f509fi7qqa73r3an0pl8";
sgr-iosevka-fixed-ss12 = "0nb7g0kbi4riczhjl1dqbzg3kwwsw1vlxnsc5p0qfh8h1rnfpg9g";
sgr-iosevka-fixed-ss13 = "1nj3nbp0b9a4nmskxg4vv98y7qp7gnj6rqkckvsw7bw43mxa2faq";
sgr-iosevka-fixed-ss14 = "1fhwx95702qyr23iwp400l16lgq12pd3ckbf5dn1hyhfmm691cvg";
sgr-iosevka-fixed-ss15 = "088xdxr11gdpn5j4fbf4xscq4prc1cydb23xcsmpnci6gsv4ppzg";
sgr-iosevka-fixed-ss16 = "1p20k188c75jisrg7bqr6fq9pra07b44vyvj10ngm38xwfgqb5lz";
sgr-iosevka-fixed-ss17 = "03giwk9xlnirgshbkpbkqav3l97n2fm7y3wd21g449vi7r9srimk";
sgr-iosevka-fixed-ss18 = "1yl501fcik0kcm20b98n9a285zv9m3yc33ngkjdgj12ssgb02lj8";
sgr-iosevka-slab = "0svls9wajw539bj5xziqbcp3wgc3f3hvwvz0rsicc9wgm7h47i33";
sgr-iosevka-ss01 = "09i5iylma19jfiqcl0svm7dz4d2agi1ylkvzvsh050ggsk57nzv6";
sgr-iosevka-ss02 = "1l0c7519wj46m14aq318rlhajq51hkv5sddhl8nvaqpdmrxx0zcj";
sgr-iosevka-ss03 = "02yz6wqaqnc0in8b6j2n02kf6lws4x16182a5djnh3nnml2jhvi6";
sgr-iosevka-ss04 = "0llrnx6vh6fl0fn5jjxzkq4rk91siy90pcpwin010sm3bppc0qgf";
sgr-iosevka-ss05 = "166y9hywcm6d1zw2szqfrlaj9qaankamcs0ff02vd7q399bkl9a2";
sgr-iosevka-ss06 = "0q41sikcv60nkvxqs5l3zw1dram20192dd5nr17nsd2lrbbdw1qx";
sgr-iosevka-ss07 = "1nxgsj6ykgh5dj3gjba2ild1y5knilm7pzi5b5qbqpal89ymk5dq";
sgr-iosevka-ss08 = "19bidxh3zxid6md8y0zp6ij4yxhqbyhqxfmld12pcskvp9xdv5bc";
sgr-iosevka-ss09 = "15w7dqb73q2v0qkh0wmlhjd3sphcq6qilb8iqz0ifg3kbsix3hd3";
sgr-iosevka-ss10 = "04gcwjpi313sqmdq1limfzycjyhr6p05vnr8jsabvgbxididikdi";
sgr-iosevka-ss11 = "1mvhrqgbppx35h2v62ykhihdkh4zw2lwz5i7fd5qdw0ysiv1006d";
sgr-iosevka-ss12 = "0r7qlba9mx1fibs0jrqgjzbffk1j49912zzim441n9539n6rmpvp";
sgr-iosevka-ss13 = "1qvn83frjhy2w16i9jnhp3874rjlf0z95n7x1kmcg89hzy3x7288";
sgr-iosevka-ss14 = "1yjbdgj1b03p2cwvwsh7jl0npj4a840whgn35j61fi9ap74jld8c";
sgr-iosevka-ss15 = "1jrixb0lw04axv2h6d92mbwgavyzpc189n72b8wf729kwi22bvww";
sgr-iosevka-ss16 = "1mvgl5dh9frqmqvia17zwpyyy9hwm8iayx2azm7mhjkkff0f0sd9";
sgr-iosevka-ss17 = "00059jzz2w9xdfcl2lws2i0lwqgn08fakn0di6clqhjig695yglc";
sgr-iosevka-ss18 = "03sy0az47x9sc0qxjc1wvhkmp71wqrm7q998ijxmj6mkbd3kc24v";
sgr-iosevka-term = "0r5ah7rxqqi4cha3r6nz6dli6z55s1g91yb1x6b2q04irvm0hzrc";
sgr-iosevka-term-curly = "1c9vf1kcl0yai5smzh9dldhkbwanbxji2a1j6y1sw59kn9n7aygf";
sgr-iosevka-term-curly-slab = "02m3fpdj9gxskap4sp43pjr4ylyvr6fpbsbl5csjl5x4rlrh71kr";
sgr-iosevka-term-slab = "1bnb803vcrkk05igm80v3k8b3p6ji14bsa5rjrplxq7yrjq7ybk4";
sgr-iosevka-term-ss01 = "1wfz766fi0xi5nb80wdlpp4j4klggz8v2aa1prl6mbvmzq4g1alk";
sgr-iosevka-term-ss02 = "12vcmbx597h0mfmib9wzqpc7bchbim2jyqnk835fhgrdrddb1w0j";
sgr-iosevka-term-ss03 = "0a4dfrah8rg5bc7x8r08n2ijr6nfxr5nwbwj7ig0snbw1rrizm4i";
sgr-iosevka-term-ss04 = "0ix8wn6dbqs072s3bmcjc1k8jfi4zpgjikbbdld3fgsg13gncz2p";
sgr-iosevka-term-ss05 = "19jjvadmffizdymy21dniz43ac1qkik5i33a4imchk64kcn7nqin";
sgr-iosevka-term-ss06 = "0lx61ikw9c2glr7smxyqkx68271sww47khkdy68llmw16c1dcapc";
sgr-iosevka-term-ss07 = "12nx451b67cc6kx6pkb9x2jyk683xvjz3m21wg7zjplskrhlfaqa";
sgr-iosevka-term-ss08 = "19n39wpz09kp9km9gmb16q6g4xbp288dgnlpdy4jxnway3i23drp";
sgr-iosevka-term-ss09 = "1j4sh9fjyxi5qa85w72bs7sin5189qis8zdr2fbl39ma7igj5l5f";
sgr-iosevka-term-ss10 = "02bv19gc1n73qyrdghp5nfzf2vwcvws3qnrcx7k3jpz23xf1n8s8";
sgr-iosevka-term-ss11 = "1a93vv86sg38ipji4cbpndcr9bfcc2n4bg0s3f19lzyqpw3pa6r9";
sgr-iosevka-term-ss12 = "1c3d3cxna1m7qq77fc278jja7yz84591pazc1adij28l3xl7xh1z";
sgr-iosevka-term-ss13 = "0ss0l4373867csgis87miymby4m1vvxs321lqq00m73x35y9xrj2";
sgr-iosevka-term-ss14 = "0dzg0g5p9p1p8yajdz0xnir8advs69fyj325qwh5616in9y3lv32";
sgr-iosevka-term-ss15 = "0rx346bjrm33n9ww9bc4czn9dda16bkxjf6h9m4bnvlgxdflgd3y";
sgr-iosevka-term-ss16 = "14i3f4bwnsb3haai8003pi9hsahcmxm1r1vccbrzny5vx78892py";
sgr-iosevka-term-ss17 = "0idfiqxj0ixrmvfa0bhl1sg6pvaivcw0csjcfxpp7d406553a70i";
sgr-iosevka-term-ss18 = "1732sskv5jzpdaaf4dc6xcp45r5fpxxxdq35jlnxbwng0njww3qy";
iosevka = "1sd45spjccrqydamgi62ipn8yc378y44s7ikv1zrpfwl29vnnwhr";
iosevka-aile = "05dsr38f1gvxflna8hk3x61jdf2rl3qrh3bjy4vdffi76fvd1m73";
iosevka-curly = "1056j12bbljzazdwclj6a6l37h9lpj90kvs08rh6aqxb9hgjkdfy";
iosevka-curly-slab = "1y8kyz4a7yzdqf619vbgkbmrsyz005nihwkjwljhhnr7w577gm3q";
iosevka-etoile = "1wxdra9j7cdkxx92yvmkcf3i86iy2rp918aixpgnw50hpyz370qh";
iosevka-slab = "06xaxh77ghf327p9bc40n45c3bhc0vqgdpk3ym60gfbcxs7jrpxh";
iosevka-ss01 = "0wlwhl4dm2gg0z4vxkqhp076arkyv9bl8xiwhhif06w440b5nikw";
iosevka-ss02 = "10kk2n5p85haymfaf3viy4la6hz9kvpvr2a4wd5hs410sc0mkp7g";
iosevka-ss03 = "16skp5l65jkaz2c02g5slma0qd43v54lavi091z8p7sfl01c7mlk";
iosevka-ss04 = "0s5m76m9gk4a6b72abpdg4abvp85ymjhrfwmy69il4x02ffx3cih";
iosevka-ss05 = "1j5nm3rinincz50axxsd8rjrbmj8n8y09sxfj56fxxl9j9qq5vrx";
iosevka-ss06 = "0g96yj19kd5xx8fvnxjxp19bx8inhl9bsy8r03rlgc2c130xng3z";
iosevka-ss07 = "05h6knsms00akridmrrrbn2gph9i3gkn15z8snjni99apd1iy6hi";
iosevka-ss08 = "075m6hdmnsjcq0ybp0h7b5my1w4nbgvczba2a2hxpbh06qqbkyng";
iosevka-ss09 = "0shw8xwbh3v3sc5agrincx4mz3qpjgbr48alyffzfwrzy4divff7";
iosevka-ss10 = "08b1517kzfhvpbsbsz38wf5ddbnar55m0z43v4nm8zw76wfhbz9i";
iosevka-ss11 = "10hvldhxgzr9pyabi6kznh77gl1hkr7fkxmlrvrks4a5h406xq0q";
iosevka-ss12 = "10lbga8xr9dabvwkdq51xhnniyrlywj54a2ncwchikglyzfzz260";
iosevka-ss13 = "0h19ggacndxnkl5m7v3cc69mzzfqvyzkaa5al1njmipxfmwlw19c";
iosevka-ss14 = "04razagrzzpfgacv43nsq6ic7wj22lx0kwfcmlii3cpkyxmyfmhy";
iosevka-ss15 = "1dm673k51hpi1201yyc18wdb9blvh7ad2qcsn10vxsyi6j34nbdr";
iosevka-ss16 = "1bhljlji97r2b7lmkczv0v9l5kil70q3isvljgz0m40vbrnknsli";
iosevka-ss17 = "1nqkg0xx0q418981liv8smv8s1p2nnvrkwdmp2vp57q6gjiw2mf7";
iosevka-ss18 = "0jmff0f5h20md03as2gprbk74wgg2fwvzd45ap6a4w0cyf7wjpmm";
sgr-iosevka = "1asrysbc1ah8b7fas49md1b100jw09w13n8bvw9vbipk9zvbbzg5";
sgr-iosevka-aile = "1dpkakcbl1l5lzrl3bmgci1dyszhp1h38yvm0cfc51pwsy9a81c2";
sgr-iosevka-curly = "037vmrsqxzls4xdjzzddamxgxan0gx7rhflzwsc4izq5agv77605";
sgr-iosevka-curly-slab = "1faammvd4dj0nibgfh7xg01wp34ilmzls6azri0d3v9844wmm50a";
sgr-iosevka-etoile = "0kagsz04z9p5pqg6dvqsx4plrsspnk7pd0kffzxyspfc6h6j3lir";
sgr-iosevka-fixed = "1wxq1416z8kb22mqvqg2pgrvm9pb2rqalm48gjnyaxz1w15hdxf5";
sgr-iosevka-fixed-curly = "1i8nbm24hb8m7sj2igvsgil9ab5jwnsjgczypzwkmj559r1jlqzv";
sgr-iosevka-fixed-curly-slab = "1s1n771dq9w668i22107lmxh7hdjf2lvdcqj2d9lb2mipjawqhfd";
sgr-iosevka-fixed-slab = "1bldr80k7iwzzrniq7gfgdxnzd9lqwsdwyd19r3ryar8r7d93f9n";
sgr-iosevka-fixed-ss01 = "0daz5kpmkrjx1s0qvk0gcf0hh2q2sddngglr9v3ci8c026xnn04y";
sgr-iosevka-fixed-ss02 = "0rak6bnz90rnjb1977apkkabl65090c7iliggbg6g65ljqn3gkfc";
sgr-iosevka-fixed-ss03 = "1ilk06wvs2p6snzdcrvax7s51p0vyyb8vzzpikmrql1w1q1xdh60";
sgr-iosevka-fixed-ss04 = "1lmdj7wdxgfqjp348hpmgbc96dmigvdzw3hz1axq64wf18dw4hza";
sgr-iosevka-fixed-ss05 = "0y7z4v7xyvwzlg792jx8rsqdj7agl2s4z2syhkjrw77dd94mxi4x";
sgr-iosevka-fixed-ss06 = "1m55n2djfkzwz95xavlvkihcfn4liyiymllhibgh3sgza55gljnc";
sgr-iosevka-fixed-ss07 = "1dj2bab7rq9rr2n9q4siq8hgdf9pwmwf8hlpn1fkks1998yqshsp";
sgr-iosevka-fixed-ss08 = "0dmckvn1vd7v86q3rxrb1g6rvz0yfzcfzmyn10maddnrnwf8llfm";
sgr-iosevka-fixed-ss09 = "15gcw3cvbyvnqj66fp5c5475g9gfz38s98slvqwwhlzlg4g8xfnj";
sgr-iosevka-fixed-ss10 = "0dbd1yrcfwfr4dx01iwk8rhhh0f40lw5qncc6x5ihqrbsskaspn4";
sgr-iosevka-fixed-ss11 = "188yga2n0cv9xqdilc06ld1pl0v5k50fb5vr46s2l40p1dkd988i";
sgr-iosevka-fixed-ss12 = "06h82cd10ia4pdhgdkznli3brkkn8q4fxw3kbylp8c9lxbmrvi40";
sgr-iosevka-fixed-ss13 = "1xbwdxxpc762y9ghgf6g50mhydd1m7fiqjr62lsqs9811d2db0l4";
sgr-iosevka-fixed-ss14 = "0am6xg4c5x62s1670lgq7y2qyvc4g9lsffb8xbslvijqlp8k6q3z";
sgr-iosevka-fixed-ss15 = "0cnikxyl8jps6f2dipq8zry95dh1xqm8wvkdqsxpisnm9cfd7y1k";
sgr-iosevka-fixed-ss16 = "0dcgj4lcfnzcds8qbdi798qsrdpsi1wqiqpy39080h1908zyzyz2";
sgr-iosevka-fixed-ss17 = "1iidvrn0ij2wqglndl5a82pw81r4nzd921fsdr4rvklw7a6dlppq";
sgr-iosevka-fixed-ss18 = "0v73i320wrnlj25grhqz4acw7zbivnjhjj8bcly9ghgv1mzbbaga";
sgr-iosevka-slab = "0s4kwmic87sll394kynj1hc407mgk43kfakgpgv6x60miqmhp7pz";
sgr-iosevka-ss01 = "02bjnsjcjgj3418qfbkgbm43mfp3q8fh81ckgjxl6pj0r3cwqahd";
sgr-iosevka-ss02 = "1pzii9rgim4dz3yjv1hpa4qs2x4s180gkk4p3lkyfwn07kkrbwm6";
sgr-iosevka-ss03 = "18r4slc9p94w2db4n9d0pqln1v1mn8snfbw3bfpjza3470xfrdwd";
sgr-iosevka-ss04 = "0laypbvzsxfwpak6c3xhhzzbm1akkzpm9f2nyjgr0pfaix0kdhdi";
sgr-iosevka-ss05 = "0l9dn96mbv8ssgp6352dm5hykwn5z5457fwkxn6i91jiia693j7r";
sgr-iosevka-ss06 = "057lgnf1pcir8q76ya8819mg0mwdv7sam810qnrya31dc18dzj6z";
sgr-iosevka-ss07 = "0w04v61qnl8pwfsm2654w39x0a42c27qs5qc8xpah7j6flpmhk07";
sgr-iosevka-ss08 = "1nr14v36cq846k9km8sznbvacrnhf4nh62mxvnb3nr17csf85al2";
sgr-iosevka-ss09 = "1b3pkzv3hdzc2hsj3pzf135g109ln0wzic08kdzsqzsh4yb8q6dp";
sgr-iosevka-ss10 = "1nmb38l1p1ywccdiysw8mvn5gnm8lwfakvnxk4ya7s4k5p72wpi0";
sgr-iosevka-ss11 = "0449rzm07rfixsfd9ag3a2s4nl1wwf6q5h0zy9iq507af8ys29ji";
sgr-iosevka-ss12 = "0n198kxjq81ji3i1q2kg3hyg2p14bllzg7r4kqsz8bvf4ivhdbdl";
sgr-iosevka-ss13 = "0vm2w0ikhrxr5k6w3521vv6r028gg23iazzr0vg71l0yr05z6z83";
sgr-iosevka-ss14 = "0nnnzfzr4my9lxvahv8sn6dvj8b5jh0nwc0adq4ca2zpfp7py9qp";
sgr-iosevka-ss15 = "129v06xq7d0minhrmjm1sz6235khgfp7jc746lkk16dr3fsvajbq";
sgr-iosevka-ss16 = "0rvda1xpb0c35qhdh3lx84gdymb2hxp8s8zxxl6cmwjhpd2n8mwd";
sgr-iosevka-ss17 = "0a0y5fh97kqf7nvx1hn5727438y5g75dkqwzba2hy8shx14m9cqq";
sgr-iosevka-ss18 = "1phcfn83wj0dlh6l514s4nj67k0v919nbd79kg0lyn786lingggq";
sgr-iosevka-term = "178bp8r875ic65wx34y3193iz4pqp5cls1w534zkqkaw21ppl6gv";
sgr-iosevka-term-curly = "18fh2z87g1zlf7r5r9gk8cxfvdwrc57r7i1llfadh66xs928imps";
sgr-iosevka-term-curly-slab = "00sv5ibgwjwgm75lkk56n4ldc0hfk98lc04d45q5gi6rfqzy8bjj";
sgr-iosevka-term-slab = "1izygr56940q8w5gvgfhqyvamfgsz6g26fpm0lf3hm68ypz6vsx8";
sgr-iosevka-term-ss01 = "0iad3lzj1w84qrnh8yv9hr7kc7xa84m94r1w8j1yyjjqkf41kqzd";
sgr-iosevka-term-ss02 = "03lj938i8rilrmdki24xyd38hb83wbazqmkw677q8hbj2pw5j1ax";
sgr-iosevka-term-ss03 = "1svsffkkp3a3gfw8p1cqm6qc0bmadb5nyyg7jip52qil963bv7yx";
sgr-iosevka-term-ss04 = "1rndp4r7imysdlxrs0fka63v7dx6i5zsyw03hh0ij034qsnpjdxq";
sgr-iosevka-term-ss05 = "0013pwg24dzziixz16011zdsda37g65nl1ykd505l5527lgr1ypx";
sgr-iosevka-term-ss06 = "0ccspibjgbb2d7gp784c70cs4pv8hhzrjvr680v82si4siacshd7";
sgr-iosevka-term-ss07 = "193px84zyc2f6c7xrzzcpr31xn5h9bhbsygzp35rxma4pgs5qr3x";
sgr-iosevka-term-ss08 = "1v5gs1lphpbc1pwxg2a4vvwlbckpy9p40gwjsvf99q73mvvs7b4b";
sgr-iosevka-term-ss09 = "16kd1l9nbqcl1w11l9ppp1xhjhm3rihzm5ndpds0clyjacj2s71f";
sgr-iosevka-term-ss10 = "1l8jksvg3lq1ygrndh7l2nd2v1f7lsl7wr16g7n44acz94xqyj3i";
sgr-iosevka-term-ss11 = "005jcj0nk4n7gsl88ygxyncj51lxsh3fr1vdcyjp3d0ipmf9dybb";
sgr-iosevka-term-ss12 = "08850qi22mb6j48ack9091pgqgfagsyad4jzapn9skhfb04kzc13";
sgr-iosevka-term-ss13 = "0q85sr0dl93xdia9pdh5lfw11vnnvs9mb0xwrc6zikvakriw8zlb";
sgr-iosevka-term-ss14 = "0akawjz58qnynagnmf82ldnn6yxjxqyfn5fa9261k91lcrbkcils";
sgr-iosevka-term-ss15 = "18qmj66589nl68sg047d9hzfh485q6wbib5pa5gllgida92k9vw6";
sgr-iosevka-term-ss16 = "1baipchlrfj3h8aqcmws5s1s08g843na61p9ql17f86f1lib0gw4";
sgr-iosevka-term-ss17 = "0zfis06pg6b41gx79qrcl8mniirchfads3vrr1hxi37b9prqqi2y";
sgr-iosevka-term-ss18 = "0hh4ahrj54fpw3p0fiig6m8y69b2mgxv15qfm9j88fik2aps6b3i";
}

View file

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, dbus-python
, pygobject3
}:
buildPythonPackage rec {
pname = "gatt";
version = "0.2.6";
src = fetchFromGitHub {
owner = "getsenic";
repo = "gatt-python";
rev = "${version}";
hash = "sha256-GMLqQ9ojQ649hbbJB+KiQoOhiTWweOgv6zaCDzhIB5A=";
};
propagatedBuildInputs = [
dbus-python
pygobject3
];
pythonImportsCheck = [ "gatt" ];
meta = with lib; {
description = "Bluetooth (Generic Attribute Profile) GATT SDK for Python";
homepage = "https://github.com/getsenic/gatt-python/";
license = licenses.mit;
maintainers = with maintainers; [ tomfitzhenry ];
};
}

View file

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchPypi
, numpy
, tqdm
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "tiler";
version = "0.5.7";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-2HWO/iJ9RCWNVmw2slu9F/+Mchk3evB5/F8EfbuMI/Y=";
};
propagatedBuildInputs = [
numpy
tqdm
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "tiler" ];
meta = with lib; {
description = "N-dimensional NumPy array tiling and merging with overlapping, padding and tapering";
homepage = "https://the-lay.github.io/tiler/";
license = licenses.mit;
maintainers = with maintainers; [ atila ];
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "heroku";
version = "7.59.2";
version = "7.60.2";
src = fetchurl {
url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz";
sha256 = "dbb69d4b5df99ff47ed0f6f1f58d968b3b144b13deee1b33c82fef7ef4006903";
sha256 = "sha256-HKVfUT59TBrY9Sk/CxhD3ujT+Q3iEcBI50Bbu1MWOxY=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -2,19 +2,19 @@
buildGoModule rec {
pname = "jd-diff-patch";
version = "1.5.2";
version = "1.6.0";
src = fetchFromGitHub {
owner = "josephburnett";
repo = "jd";
rev = "v${version}";
sha256 = "sha256-NUga7Rxh/hCEw6bZvbxsqBoIKdG2TTfEXdwHY42cgxE=";
sha256 = "sha256-VxCsr7u7Ds3BMtZtnVS0VoLKM46NYLqVZGmRDSyqmtg=";
};
# not including web ui
excludedPackages = [ "gae" "pack" ];
vendorSha256 = "sha256-uoMOkCmJY417zxkTsXHGy+BZ/BH29nH4MhFaIKofh4k=";
vendorSha256 = null;
meta = with lib; {
description = "Commandline utility and Go library for diffing and patching JSON values";

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "editorconfig-checker";
version = "2.5.0";
version = "2.6.0";
src = fetchFromGitHub {
owner = "editorconfig-checker";
repo = "editorconfig-checker";
rev = version;
sha256 = "sha256-zbE/je5ZxCX83hxl88c8/FoZzOLatrSEjSAI+eIOVQQ=";
sha256 = "sha256-S/iIanLToWN4OsItvSLGSEhgoYRJgUt0w3QFp1+scfY=";
};
vendorSha256 = "sha256-SrBrYyExeDHXhezvtfGLtm8NM1eX4/8kzwUICQLZDjo=";
vendorSha256 = "sha256-ktyUuWW0xlhRLkertrc4/ZYCyDh/tfYBuHqIrdTkotQ=";
doCheck = false;

View file

@ -25,18 +25,18 @@ checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
[[package]]
name = "codegen-luajit"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"wasm-ast",
"wasmparser",
"wasmparser 0.86.0",
]
[[package]]
name = "codegen-luau"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"wasm-ast",
"wasmparser",
"wasmparser 0.86.0",
]
[[package]]
@ -52,7 +52,7 @@ dependencies = [
[[package]]
name = "dev-test"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"codegen-luajit",
"codegen-luau",
@ -77,9 +77,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
[[package]]
name = "hashbrown"
version = "0.12.1"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
[[package]]
name = "indexmap"
@ -116,9 +116,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "once_cell"
version = "1.12.0"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
[[package]]
name = "proc-macro2"
@ -192,9 +192,9 @@ dependencies = [
[[package]]
name = "unicode-ident"
version = "1.0.1"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7"
[[package]]
name = "unicode-width"
@ -210,9 +210,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
[[package]]
name = "wasm-ast"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"wasmparser",
"wasmparser 0.86.0",
]
[[package]]
@ -225,17 +225,26 @@ dependencies = [
]
[[package]]
name = "wasm-smith"
version = "0.11.1"
name = "wasm-encoder"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c85cf25be85aac46356216b4662eb5768347046449a45c938ae1443b788665bb"
checksum = "f76068e87fe9b837a6bc2ccded66784173eadb828c4168643e9fddf6f9ed2e61"
dependencies = [
"leb128",
]
[[package]]
name = "wasm-smith"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b73250e61e41d0e467b78559c7d761841005d724384bb0b78d52ff974acf5520"
dependencies = [
"arbitrary",
"flagset",
"indexmap",
"leb128",
"wasm-encoder",
"wasmparser",
"wasm-encoder 0.14.0",
"wasmparser 0.87.0",
]
[[package]]
@ -247,6 +256,15 @@ dependencies = [
"indexmap",
]
[[package]]
name = "wasmparser"
version = "0.87.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c04e207cd2e8ecb6f9bd28a2cf3119b4c6bfeee6fe3a25cc1daf8041d00a875"
dependencies = [
"indexmap",
]
[[package]]
name = "wast"
version = "42.0.0"
@ -256,5 +274,5 @@ dependencies = [
"leb128",
"memchr",
"unicode-width",
"wasm-encoder",
"wasm-encoder 0.13.0",
]

View file

@ -6,13 +6,13 @@
rustPlatform.buildRustPackage rec {
pname = "wasynth";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "Rerumu";
repo = "Wasynth";
rev = "v${version}";
sha256 = "sha256-QYWseogWHAjnNRi1OVtiJYOCxOLtHKjmlAd/U8Yv4tI=";
sha256 = "sha256-hbY+epUtYSQrvnAbCELsVcqd3UoXGn24FkzWfrM0K14=";
};
# A lock file isn't provided, so it must be added manually.

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
version = "0.105.0";
version = "0.106.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
sha256 = "sha256-ur9gMo/GR24mSWyNj+2uJJkp1neNMHrPk07l9rjrd1M=";
sha256 = "sha256-ZLgjXDyXt0DcfhzS/s2xsjFpTWU8sY8QRljRg0XQvtk=";
};
vendorSha256 = "sha256-mwQahKRHR9cy2Yb4IGCIRtA0j38QJoPKNtpS/T4ndC4=";
vendorSha256 = "sha256-ezRlIZGXAG8jUAHyf2QMFZ8yNGtH/gl7GQm88+D8KkQ=";
doCheck = false;

View file

@ -14,15 +14,15 @@ let
inherit (lib) last splitString;
pname = "winbox";
version = "3.35";
version = "3.37";
name = "${pname}-${version}";
executable = fetchurl (if use64 then {
url = "https://download.mikrotik.com/winbox/${version}/${pname}64.exe";
sha256 = "0jigjs4paci6h897hl1046ks5f812jfb2ihnp78lbah0294shjnj";
url = "https://download.mikrotik.com/winbox/${version}/winbox64.exe";
sha256 = "0fbl0i5ga9afg8mklm9xqidcr388sca00slj401npwh9b3j9drmb";
} else {
url = "https://download.mikrotik.com/winbox/${version}/${pname}.exe";
sha256 = "1a3cjhvh2z4n767aqqkv3a7wlda34ssgx9acigdcszgvbksbav1f";
url = "https://download.mikrotik.com/winbox/${version}/winbox.exe";
sha256 = "1zla30bc755x5gfv9ff1bgjvpsjmg2d7jsjxnwwy679fry4n4cwl";
});
# This is from the winbox AUR package:
# https://aur.archlinux.org/cgit/aur.git/tree/winbox64?h=winbox64&id=8edd93792af84e87592e8645ca09e9795931e60e

View file

@ -6,11 +6,11 @@
stdenv.mkDerivation {
pname = "pikchr";
# To update, use the last check-in in https://pikchr.org/home/timeline?r=trunk
version = "unstable-2022-01-30";
version = "unstable-2022-06-20";
src = fetchurl {
url = "https://pikchr.org/home/tarball/5db3aa1d294dcd16/pikchr.tar.gz";
sha256 = "sha256-xnT2oOx4LK9CElXeAuQIKlu6WvMB8Nv5+2kBzWQ5Gpc=";
url = "https://pikchr.org/home/tarball/d9ee756594b6eb64/pikchr.tar.gz";
sha256 = "sha256-ML+gymFrBay1kly7NYsxo0I1qNMoZPzNI3ClBTrWlHw=";
};
# can't open generated html files

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "mongo-tools";
version = "100.5.3";
version = "100.5.4";
src = fetchFromGitHub {
owner = "mongodb";
repo = "mongo-tools";
rev = version;
sha256 = "sha256-8RkpBCFVxKVsu4h2z+rhlwvYfbSDHZUg8erO4+2GRbw=";
sha256 = "sha256-/DbsQh0VinI71ev47hGKfB4PaBlzcOyGHRlmDzW0j7s=";
};
vendorSha256 = null;

View file

@ -16,6 +16,9 @@
, voms
, zlib
, enableTests ? true
# If not null, the builder will
# move "$out/etc" to "$out/etc.orig" and symlink "$out/etc" to externalEtc.
, externalEtc ? "/etc"
}:
stdenv.mkDerivation rec {
@ -68,10 +71,31 @@ stdenv.mkDerivation rec {
sed -i 's/set\((\s*CMAKE_INSTALL_[A-Z_]\+DIR\s\+"[^"]\+"\s*)\)/define_default\1/g' cmake/XRootDOSDefs.cmake
'';
# https://github.com/xrootd/xrootd/blob/master/packaging/rhel/xrootd.spec.in#L665-L675=
postInstall = ''
mkdir -p "$out/lib/tmpfiles.d"
install -m 644 -T ../packaging/rhel/xrootd.tmpfiles "$out/lib/tmpfiles.d/xrootd.conf"
mkdir -p "$out/etc/xrootd"
install -m 644 -t "$out/etc/xrootd" ../packaging/common/*.cfg
install -m 644 -t "$out/etc/xrootd" ../packaging/common/client.conf
mkdir -p "$out/etc/xrootd/client.plugins.d"
install -m 644 -t "$out/etc/xrootd/client.plugins.d" ../packaging/common/client-plugin.conf.example
mkdir -p "$out/etc/logrotate.d"
install -m 644 -T ../packaging/common/xrootd.logrotate "$out/etc/logrotate.d/xrootd"
'' + lib.optionalString stdenv.isLinux ''
mkdir -p "$out/lib/systemd/system"
install -m 644 -t "$out/lib/systemd/system" ../packaging/common/*.service ../packaging/common/*.socket
'';
cmakeFlags = lib.optionals enableTests [
"-DENABLE_TESTS=TRUE"
];
postFixup = lib.optionalString (externalEtc != null) ''
mv "$out"/etc{,.orig}
ln -s ${lib.escapeShellArg externalEtc} "$out/etc"
'';
meta = with lib; {
description = "High performance, scalable fault tolerant data access";
homepage = "https://xrootd.slac.stanford.edu";

View file

@ -4447,6 +4447,8 @@ with pkgs;
shisho = callPackage ../tools/security/shisho { };
siglo = callPackage ../applications/misc/siglo { };
simg2img = callPackage ../tools/filesystems/simg2img { };
snazy = callPackage ../development/tools/snazy { };
@ -21098,7 +21100,10 @@ with pkgs;
];
};
soapyrtlsdr = callPackage ../applications/radio/soapyrtlsdr { };
soapyrtlsdr = callPackage ../applications/radio/soapyrtlsdr {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) IOKit Security;
};
soapyuhd = callPackage ../applications/radio/soapyuhd { };

View file

@ -3418,6 +3418,8 @@ in {
garages-amsterdam = callPackage ../development/python-modules/garages-amsterdam { };
gatt = callPackage ../development/python-modules/gatt { };
gattlib = callPackage ../development/python-modules/gattlib {
inherit (pkgs) bluez glib pkg-config;
};
@ -10601,6 +10603,8 @@ in {
tilequant = callPackage ../development/python-modules/tilequant { };
tiler = callPackage ../development/python-modules/tiler { };
tilestache = callPackage ../development/python-modules/tilestache { };
timeago = callPackage ../development/python-modules/timeago { };