From 48826482213c06937e400eadf89bcda6afea7eda Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 03:36:04 +0000 Subject: [PATCH 1/9] iosevka-bin: 10.0.0 -> 10.1.0 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 184 +++++++++++++-------------- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index cd12033b505f..a6915913ea35 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "10.0.0"; + version = "10.1.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index ce96f183375d..0ce5212b1311 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1730pcbxkcyzfw22hgqsv45sybd79pdsm7vb4l2gm9pfzasypjra"; - iosevka-aile = "1nm0s8zhmg5v181rik4d4nsygxrvfr9wdjwqz6gfl2dmg17r7cyi"; - iosevka-curly = "0kmvj1zhf0xs02rdf2x1f3lnahj36dpc91p6k4mbji5mn9klb547"; - iosevka-curly-slab = "0zklkypyh303gi5gqpdkwmj3g9m1f1xqda3ah232c3d6cfznbyqc"; - iosevka-etoile = "1nj0p25pbjkzc1lg8fp45zxj6r3q4k5yc882rra3jkjmlw2h65b7"; - iosevka-slab = "1vz9443swmxb27iqmimjyg3zs6q0pw7fpwiiaa7k1s7gc5xkyb5s"; - iosevka-ss01 = "1g2xxl9x5apyhhm7lsbmplh19c5aln3jwryzqvrqxpnsngkqmp0h"; - iosevka-ss02 = "1d2b8syvdx8i1dqw9k87yirkyg3wdvr7y2hy5c3nzj62sg7drfla"; - iosevka-ss03 = "0b4y1v6kri4d56h6m58qqmc50bh4r4151h72n1a2q0a0nwkgvlwm"; - iosevka-ss04 = "0fj7rj9xy9sfrzdhjqzv37v34lmkajz4d497i7lvdc2i0w4ia4gf"; - iosevka-ss05 = "0xncnrf8d78iqf3731z0midw4rlza8hdji0m3gvxnigbq3cqxhwd"; - iosevka-ss06 = "15vclj2m5brp1fnw82w5b53cwlwzzsr5hzxm6j2bj9bghc75cigm"; - iosevka-ss07 = "1hs7c5n5pcgmspwrhdxv69dc0wdycfcdfs1mxwbamnal77c9q0s8"; - iosevka-ss08 = "00fz1yb0g1rlzw3pxfpi88vh03k1q9nkzi8h6naqv0hngcbsz1ia"; - iosevka-ss09 = "1ig5lqpk86z7mwr45gqvsdxs00g7b0mvx1i8q8hx5x4pyr36y7yh"; - iosevka-ss10 = "12c50mh3xggz03lqqrkdcmdfvfq3m87x8xb9x0h8lwfslqaa0c0x"; - iosevka-ss11 = "1qvdsfviif8wyms0bkzm7vx0gf8vx5gic3ghincv4ignx8hmrbm9"; - iosevka-ss12 = "17qxrpmbrandlibhshycsgjlwspx7gz0x6mzhy1n8ccycrd7qlii"; - iosevka-ss13 = "07nz5wf99j6m72vkrnbhpr4yhn3pdgb898dinzi4n5k0rmky03zb"; - iosevka-ss14 = "1h9icwqz4qdzm99j17qxmrv1jvm3dzqrcghsffva9yvr32anc5y6"; - iosevka-ss15 = "06362h12vy48ib338dw7vjxx6vqpfzcc47f54f23pp1b73ygrkxp"; - iosevka-ss16 = "1sbby53vmjaq8h09a2izf4w5nha5knpgb0ljfyfd1wj1nnkdbisp"; - iosevka-ss17 = "13l3dindp0x76c3ddx7ibjins65f6xpv8zy7dfjyil8kg2570lfq"; - iosevka-ss18 = "1z0ypy19cj2hlg8qhvg0a54p0704f8szljf0lrrajprc8ws4cqy0"; - sgr-iosevka = "0cl08cxidpvrjy2ifhjb4cgrcjsldv86ipx4i8wh2kvs632hkz42"; - sgr-iosevka-aile = "01a7glrzrifwbfh05jynhmjd78cck4hw8aik3qf8pjr0lmyn8inz"; - sgr-iosevka-curly = "1wl80fn6zk1dvhqnfwxc74i2f925yf362s45d1bshi3n2qd7ixv4"; - sgr-iosevka-curly-slab = "18vvhkqhljnpv75v7cbw5z3d4xc418g0pgh39zyy1sdpq01h6ycj"; - sgr-iosevka-etoile = "0g7brirxpb2s0a94vc00jk8d45wafcimkd1dkilhpc5h862d7y3d"; - sgr-iosevka-fixed = "17g81448bjms88xph2h8cjfz2z2bhy4dc5ialy583zw9hafk0b6k"; - sgr-iosevka-fixed-curly = "18kfz4bdp81ylwjikdyj00m58bb5ykaxnxv288d9qr9r0wav14bf"; - sgr-iosevka-fixed-curly-slab = "1r1223m547ddpjrc0dpzkmkbw4851lvkc2g37yzd97i7g3da0q5g"; - sgr-iosevka-fixed-slab = "006d1cznz5ikclpz6kli69h5jnsr50yd08za3m6k07npnj4g9i9h"; - sgr-iosevka-fixed-ss01 = "0dxjmxvhq7dba7f4dcw2z85mgbx4qmy3w1nz99kbn729pjv3xbnr"; - sgr-iosevka-fixed-ss02 = "1ljq7dxj7dfg8bwmljykbl0lgkw4q9v5h41mflrvxhxkgblghji9"; - sgr-iosevka-fixed-ss03 = "14q5wi4af1mnm6g895zgpmf1qcnadv0mpiyydcizayqxnc015xr0"; - sgr-iosevka-fixed-ss04 = "0szy07dlv9ag7jqahlgyi9wgwpas73rg2vw74jg63fx06svwyx7z"; - sgr-iosevka-fixed-ss05 = "1bm6mqal8jni9za27dmbq9pdqs9j3x58w0cnzx7ma3gyaypfi5jc"; - sgr-iosevka-fixed-ss06 = "08a6mzrbx7wl4z147kv3289fbaccd7cs0r1gp3dnkkypsy4cw907"; - sgr-iosevka-fixed-ss07 = "05l0i4mblgx2zqfp5qvpwqp9671mkfj60i4pg0kznwd13j0ya8qs"; - sgr-iosevka-fixed-ss08 = "15ils79jpa1kibyh3ih5dkjk0qi0ppsy9iibyyl301c4vyhgypzb"; - sgr-iosevka-fixed-ss09 = "1s2m349m7560zz10r0w0nmgixxzn0ys4j8jwy3c1zxzphdq60a10"; - sgr-iosevka-fixed-ss10 = "1iby1afylism23cn70x0bb2qi8mdkf0ysgnmagdr47cgh6n8kgmy"; - sgr-iosevka-fixed-ss11 = "10zn26ijrdj2s0fzc1d1kyi0rpy6qw1bbp6qwf1x1mbhapj0mc8a"; - sgr-iosevka-fixed-ss12 = "1vdxn5qr1h192c1czxifvr4f2mv1jhkb20m5n3wgawyf75p7blcy"; - sgr-iosevka-fixed-ss13 = "1fdki2kf6xy2mvxnna1m77xgk5hm88i1g5ds8dzr6gc5mkm5mw8m"; - sgr-iosevka-fixed-ss14 = "1gaycm1zzm2qnriy76xnyy74rk9ccs54q71br2m55jlr4ifglanv"; - sgr-iosevka-fixed-ss15 = "07b9ss5a2vk4gndwc6zw8qwa4wgsrfnfq9cbrx9zlzj08143q9dr"; - sgr-iosevka-fixed-ss16 = "156yh0hbqqklhpf7czblk43nmq3cw0akgiy4z7jq0904b96v68zs"; - sgr-iosevka-fixed-ss17 = "0wj8j09wvf7m7m1ss47bqf6s0nvrn3vlzdhgnmzwc2jc4rkrvjpa"; - sgr-iosevka-fixed-ss18 = "0zsy2ql3r0419h6ganfdfhmwzn7lprypw26bq7iqzvld03vss45c"; - sgr-iosevka-slab = "10al24w3lglgdz9v86yx6q58mx4qyrxr8kffl0qvjiqvdcyyp460"; - sgr-iosevka-ss01 = "0ipwpjwg14wijzx0qb0zni8rzvw6wwfbwzqv8pzf2dmm6iwnmnqc"; - sgr-iosevka-ss02 = "0nfbw5smfarglma3cddzw397rjh72qjxqhz3g28l0sj26gk2bwma"; - sgr-iosevka-ss03 = "0cdvb5igir3c216niq3i0hbjvff1y9bnzf6fwny17303vjvfqg41"; - sgr-iosevka-ss04 = "0sj62id2ljwsms8xv17j474pdr881r6z8kb7a26gv48p08r225fq"; - sgr-iosevka-ss05 = "13pxfc2s2vxxkqp4jvzam6bx7ywn350phs5xhlzmcdk4sjgml9i2"; - sgr-iosevka-ss06 = "0xscng0a90vlr621pnl3hxpn2la862rgcx7xy8d1i6k47wpp1zbj"; - sgr-iosevka-ss07 = "0yj11jc8fzw9l2316y90mdj7hsqd46y5i1rckxlvih5nv300x1cp"; - sgr-iosevka-ss08 = "15jn1xjafawd5b4y2z4fkbaf22fgbvc861m3sjx4hib5vqjn41p3"; - sgr-iosevka-ss09 = "0kffxk8kr5giisfc10a5h889azgkqs4q9f0gggv8xlml4afdycd0"; - sgr-iosevka-ss10 = "1ldwpx2ysx0v79qfzhcqcc2cwylwnr6x81fy2yqqnv2319v1xrky"; - sgr-iosevka-ss11 = "1rd98yvky9wxgxcp4ps9p1k4ll8hnh9g9vgwf1r0bjlykhv7dhmf"; - sgr-iosevka-ss12 = "0439fg1pvxnv96v77rzrn0sbzna962ixgn8bx4ykpx0wkrigmyrk"; - sgr-iosevka-ss13 = "0qzbf4milkijhmxfkv3al2w5s2aa0a0aqqqxbv2wgza7g3i2glgv"; - sgr-iosevka-ss14 = "0vk8s71lyrdgngdbaasimdg0a5ygckciy7wxkkbixvxh18vi3mfr"; - sgr-iosevka-ss15 = "0c5sai8zbciwpkwrfliakf8091n5zcj7bilkbhzljpgfhalxg43v"; - sgr-iosevka-ss16 = "0a8q3ns3chw6kg77fxc03njlbr4slnq83381lwznhnsziyk7jb6r"; - sgr-iosevka-ss17 = "0bbfq7fjbr718fnmfy4nl7m9n7sjnra89chig9am7571ws66wbxc"; - sgr-iosevka-ss18 = "16sj1g5i75hfd07ghsm6zb655mypgwagxzpz5sk22dkrilxwrdix"; - sgr-iosevka-term = "1ncr05mprm8bar8v9saqsklgm36mymzhzw5x1viz04757s89cqnc"; - sgr-iosevka-term-curly = "0vwi4ccz0fnd7a3adfxffar5qxfzkx4pz23208kzc5zjidl9s9ka"; - sgr-iosevka-term-curly-slab = "0dwjcj8d4am5kqw35w68hm3qnxyk9w5k44z2n1mf9gsj411layi8"; - sgr-iosevka-term-slab = "1i7gp1lirdzzcmcv5lcrdf2mb2l9v3kjx1yhhdydfpapq85q5wma"; - sgr-iosevka-term-ss01 = "0zjx0r7sznzdw1diy88p6bkdki0ihqilvksil6qccbg4fn9f2swm"; - sgr-iosevka-term-ss02 = "1ma8366h42n5ij2czhkhmfyzmv23hmn165ihjxmwkxhg0c58l4jl"; - sgr-iosevka-term-ss03 = "0n23fy0ks0pid1m8z5vl9j7g607nl70h7bxfn015lryl7v8yj2dm"; - sgr-iosevka-term-ss04 = "1a7llxzf4cs9jr7ldnhxdc7r2jviaffq2kvhkj3spqan9bk6ymcx"; - sgr-iosevka-term-ss05 = "1d3sp99f6gycbmxk6z0raa7gk0is0m7bc7dqb4dy6zikra35kv4x"; - sgr-iosevka-term-ss06 = "1vjc785rzzrcbdbcp5j2dljk9flv9inmcjswyf7fyacn4ghszap6"; - sgr-iosevka-term-ss07 = "03pjbr7bp1av2pav1x913j1h18b4nhxvr7k62dg68b019rj1pvfg"; - sgr-iosevka-term-ss08 = "1b9qvkb4zpvwfygvh7i6b6dcwk8jk0y1kg078ma4vlpfag9ay4xb"; - sgr-iosevka-term-ss09 = "0zcg1b1j7113qp5q81s5dx34n1h3lmrshrx8xkvy6kn1n48b17b8"; - sgr-iosevka-term-ss10 = "1nrciywy8fr8x716w087pyyw0vkyd60j3lmxc7ixsr9yl3ff9bb0"; - sgr-iosevka-term-ss11 = "1k4xsl9x6195ap2zg0xxrla4svvzxhwas6xf0dbh7k2baiwyknb3"; - sgr-iosevka-term-ss12 = "16h0i0vj98l0l6hfyjsq4qy8mxkz5p8xpqxnpd56wxm7mnl2b7i9"; - sgr-iosevka-term-ss13 = "1i907injbdamdyfd1ydzdjsygn0b3syab0ahas7xmd438rfkcfj6"; - sgr-iosevka-term-ss14 = "1ypx059ws3pdhkn6lsc4cai4qhm8gzm9chmrsiqk2978yaf2z06c"; - sgr-iosevka-term-ss15 = "1nqbslx44ikj4wd3h1ycqsbk6sk72zz2n49pkn9r3khp9wwz7qwn"; - sgr-iosevka-term-ss16 = "1lpmph22gqzn3zf9zsr5hzb59573xkiz7yq9pfqg5bxnx248byr9"; - sgr-iosevka-term-ss17 = "02d3vs46cg4nbak1y64cw5jlhzgxmlxxkhlz3jzf5wzzb9kli4iv"; - sgr-iosevka-term-ss18 = "1z580s3icbzpivp766cqdc3j8ijgpp5f2yz9a4g4hpz3isa1lpy6"; + iosevka = "09fwk1sm2i0yf2qvwc99g46jhhi9jwmxrqm02m9n348gcsvml7k1"; + iosevka-aile = "07nykjvm5acnxc585y7qfs38d1mm4x654wykq24cwd0qdialz2yn"; + iosevka-curly = "1v9v5xhv4pdihb2q1hgzlw3z54vpg9lvjf753z95x97ah246kbyc"; + iosevka-curly-slab = "0av94y57pi9vy8skb96dbvlcbz7j6hz7cvhsrdpx50nbf9x2ya4b"; + iosevka-etoile = "0vinmfcxs16rx1i86sl7ig7hwwyfwv49vh12k6yx9gx56jyywj51"; + iosevka-slab = "18sjdj5gdg993a0mzvx43l3ll7q2l8w30j12934nlzlw5cadv8gf"; + iosevka-ss01 = "1k08nwzgdz78iiijd6bzfricjbwa23xmzjm6jq72q7cvcqrwpzfj"; + iosevka-ss02 = "139q7ps9y97qzmyqr45xqphw5szr4a119pm1jnwrc5scplnhiisb"; + iosevka-ss03 = "1rbsvrc11skznnk448nj0brfvj58zhgkczlq7skhb8rc3mznhgb8"; + iosevka-ss04 = "0rr7zy9n84lqxj7h0ljd091m8a5yjs0kzpyp3j68mvccsdwncqq4"; + iosevka-ss05 = "035rv0pq7741n6c7zkajjzis2rkdyb75z9zjzyiiylfx19j6d6a7"; + iosevka-ss06 = "0bvbl36zpk79f3h7svs51l0wbllmnnkgxmdk76ikfg4a490nz4g9"; + iosevka-ss07 = "061xngjvznr6syk1y996fmnjqpj0kvnnibibr46lgqcx5xb1w38x"; + iosevka-ss08 = "0szc3iydg3kkg6v42ym52b7nd6ljfwrfcw7n3j1av9vhf5gmn0rv"; + iosevka-ss09 = "1p0hsl6vihly2drh6yiniijcwvwjz35d34d6jfxavjhx028h92mw"; + iosevka-ss10 = "152asnmd7m7q1hligkv4ar8h71xn96586p9whplvmkgfrcr731p7"; + iosevka-ss11 = "0mf3gg1b9x3i1j8c3yqks7sc56j97fwx736pr01bf99lw4jchd2h"; + iosevka-ss12 = "136s3i5dwz0iv8mivq8fraadhbqzjjc5h2c5wqydvmw9i7rpyp2h"; + iosevka-ss13 = "0n9886kn9sr89rwnc0r0q9d2a16fykq5asd0cazrs95jbqq0acix"; + iosevka-ss14 = "128y8dgsawdz20lyjshdl7932222dph6qyiirim6rkh99bp2kdy6"; + iosevka-ss15 = "0h2ywzn2gmaj61n5gzdms7v3yqa3x474icdg10vqds7i86n6g8am"; + iosevka-ss16 = "1c1sr4lphwf8x5xdagciws8dr7ia8jh2cy3zv787g8dhflhzvc1i"; + iosevka-ss17 = "1gqbwx89hcnky7bi1xscz13ykh4srvycbfgf9z4b5j26wflfk2a9"; + iosevka-ss18 = "07h0zcf789g6qw5laznf5y67syh003lwhr6141ifz2zv2sgjl716"; + sgr-iosevka = "0h9yg63cjc0s4kbl5k9lpic48y5iz0hlm8bi7h2h850zhbj405fm"; + sgr-iosevka-aile = "1sv0lb2xb18skwvvw95qzdi9hqr1mr3gi2p4plqlbxq6bjpcvc57"; + sgr-iosevka-curly = "1irg71zrbqnw1r2ar5qkfzdjzb1ziwd22jyvm9g1gynjiwh1idaj"; + sgr-iosevka-curly-slab = "12lc9gqlbnp4crp9qrqf38dlzwaqanyj3l9xyasd96z33wmgnvcr"; + sgr-iosevka-etoile = "0j78cbrdsz9qnvs6y6vkv1ys2spfv9l207z20zkyw5m0i3yvhwi4"; + sgr-iosevka-fixed = "04lirldlmjlvz8q33xb2886d1jqaj1a7a94mnrm1ikw2gzbh7j1m"; + sgr-iosevka-fixed-curly = "1s4xyzlmg9s8jvpvc22bxqc6z9qn0bbgham9kp1w2nwlmlnhl712"; + sgr-iosevka-fixed-curly-slab = "01g6rk0n1xs0bv4vyqv9pwyndzk9k8cfhf0sd640zdkqi51p4raw"; + sgr-iosevka-fixed-slab = "1ipzwxs0jqk4cc8snyy9mxhak1zrj9qlicwwhhhv8pmxs2lcirgq"; + sgr-iosevka-fixed-ss01 = "1vpfgj496yzn5n8zb5hxzlx0kh0yfh27v2naz4zi4gci0k58mj4g"; + sgr-iosevka-fixed-ss02 = "122id78h9lvnm4abflng5572zjdn52wqci9jq88gh5iyk02kja6b"; + sgr-iosevka-fixed-ss03 = "0wa4q1zqp75ja5m34wy3zmx5in225ldr0ah23y7l9kh3x67lfykd"; + sgr-iosevka-fixed-ss04 = "11dxlc3r1gn3psf4bpsiwr283zjpc63d8fgswwbh5d6swk9nxm7v"; + sgr-iosevka-fixed-ss05 = "0jw57byz8rbdc5h1ig5d4kpjklqrm6880sx0z06gw97z3p4aqmb1"; + sgr-iosevka-fixed-ss06 = "0saxvswnrszi3kirv5j1pp96n9fhnqwrmsc8naqdgq342rcy13w5"; + sgr-iosevka-fixed-ss07 = "0bsrpfbcjf2g8vd6f6sv6yxvdi9s6wdjckbjb3m64mdgv25lpdwv"; + sgr-iosevka-fixed-ss08 = "1l5k2y0h4h3fsk2ac7akym4rash6bb63bj9vhh3f9igq062dk10a"; + sgr-iosevka-fixed-ss09 = "09s1x6q7lx4y0462m0ac3jp8jfy4x2sc2irfmxcz2rl5px2smgdg"; + sgr-iosevka-fixed-ss10 = "0j8h200gw60rzknxyg7nvcg9cw1nhvgy3n6n70lf3b8jnp5splzd"; + sgr-iosevka-fixed-ss11 = "0cgxy8gq5wak1a7z3j013l1kadph45ckl865dlkw5jnmndz7a684"; + sgr-iosevka-fixed-ss12 = "1y9grhh3ami6qwdm8a6r7m671n7c9bnxp7qgmk7qxgb8jax31qcp"; + sgr-iosevka-fixed-ss13 = "1a9in4ybl9vjyvxab0hdbjnq46rg3yx9gyalj6x8y3mxsfij0wh2"; + sgr-iosevka-fixed-ss14 = "0wc3yw6rf05wdh8kzz6af1apirvyspkb8bav4pbdxahsy1asij58"; + sgr-iosevka-fixed-ss15 = "1b7ns68lx267y9rwlv47yl0y48nvwyzqdpgpwdfwkmpl6vd9kmnn"; + sgr-iosevka-fixed-ss16 = "07h4zvcll7324r4l7kwwk13874hmjs7vdiiffbjwhi403vbiw1an"; + sgr-iosevka-fixed-ss17 = "1rjb0c3yvww8n3sam49ynj2f7h0xgbdsznk7xbj4sk5pkx3l5zr5"; + sgr-iosevka-fixed-ss18 = "0s39p9khjidasizg1ps3k87ldlkpy3cxy5l6r0c2bkvnfz63k66n"; + sgr-iosevka-slab = "10gx0hlr2iywj3nksc70idjha9wja3fw9fl8yvkmnpbqaxlrlzm8"; + sgr-iosevka-ss01 = "1fzxzx9ky4zrbv3zbjh7c57k8dm949xz356a4jk1lpbmwyd0gry4"; + sgr-iosevka-ss02 = "1qk9f257pq2r4jfilrh02viwgy80kqga4czpc1mvwwbqfalz2lg9"; + sgr-iosevka-ss03 = "0cj2xgpfcxdj4sh2sdp6cvbg08s6c8gvg0h01ylrqnazxddfv1xr"; + sgr-iosevka-ss04 = "02q2xqv1qvdijn53p3nbz2swn39yk2pp5ndq1wkakm5j3w5n52f9"; + sgr-iosevka-ss05 = "0y4f8zkzvxq512ns4qzbq5hnd6zzwdjlc1p2iify0f4m491msx5n"; + sgr-iosevka-ss06 = "154jzvb44h1njzkzsk9x6mk7g9sa5jr7kqjv26ylm0ax0i039ax2"; + sgr-iosevka-ss07 = "08025i39hkinrd0sq0yj3d9dc3fqhv5qfdvxaqg3wp89p5jz2q2q"; + sgr-iosevka-ss08 = "1hj80l9k1qi4cnw5dqfp431z3yiyqvrhby9f4ny84ppkpihp60xk"; + sgr-iosevka-ss09 = "0pl1fz70nx0ls0l4zr8j111flf2mh54miavb0422r2dzprvqaviq"; + sgr-iosevka-ss10 = "1wb03i26g36n6qgzkyza3sbdbgpari5sw0m4qm7yaz3c2f91ic69"; + sgr-iosevka-ss11 = "1mz1mg0pc3nidsl5pb6kvdmmga62fj8x77x0n1xjzcz2iwvdd616"; + sgr-iosevka-ss12 = "0g3i88rhax9am4nfjzq91kdkj1k6vzszia7g79hzsw8nfyrd1i52"; + sgr-iosevka-ss13 = "1jcg4y52xbig8npjd7jbjxqdr9nsbwh120mh9sjy9vvq3hxdsbqh"; + sgr-iosevka-ss14 = "1am7j9ymxgmyb50qziyd3xkal1f82cnx4m21gd2rqxijpa12x1r3"; + sgr-iosevka-ss15 = "0zpwz51xdbckldgycgbmrqf3g9wssanmb2z554n1vbmc5whhwkpp"; + sgr-iosevka-ss16 = "19jzkq3xj0cncs4mk11z8q8mmf6h75i0x2nj4ikcvk01mlrss6s8"; + sgr-iosevka-ss17 = "1zn0xh0h997afjsj6n97bmxanxk441iw6mcdliavfs9l6lj1zhns"; + sgr-iosevka-ss18 = "147w89y3p9s2qanm4wwxv3plpif50fs85hzhhdz23jin5zvh5lz2"; + sgr-iosevka-term = "01aqqniw3r2njv4fc114iymjzp9k5mdl7c5dyxypm71sdlpcjxqj"; + sgr-iosevka-term-curly = "0rh0k1svfsan04q50ihhf2xf2fa8isggpqmfps77q1xrbih9miyc"; + sgr-iosevka-term-curly-slab = "0ys2apprdz1awf6nad6phv2k2kf0qfigb22j930y1gya9vshxqx1"; + sgr-iosevka-term-slab = "0qbiwsllyim81ayh0whrkzc1nq06x9g7hnv8haxh91jg9nf327vw"; + sgr-iosevka-term-ss01 = "0mdgh9hdnz752d7sxv91ayi6lyp6czs6gq21dqigk3wmkgwaraz2"; + sgr-iosevka-term-ss02 = "0zxynyzbngng6ymajd7yf5pmagdzxnr19vnpbmqkvhjnsjmhqpcd"; + sgr-iosevka-term-ss03 = "192fjh0kc8jh0z8y7l74g41jvqfnax5p2shnn0ch1h824vraklvd"; + sgr-iosevka-term-ss04 = "0fjmy0wl8hh38gbhf5h6m064la1dp68lyfimmxvjpf1s2c3g5szd"; + sgr-iosevka-term-ss05 = "0w57k1kjn91srngy297fywi1wnc64bwyymclk0w704sqpx04jv4n"; + sgr-iosevka-term-ss06 = "0n2ifw444z606qm9w4il6inmf5zmbkhrk2wvldfx5bsgv2pfxnjd"; + sgr-iosevka-term-ss07 = "1wwky8pichvr467ypgxrxyfqgr27hqkpmx7c35fzka9c0kap483q"; + sgr-iosevka-term-ss08 = "117c54z898rmsclm23hn4x2wvhypc2vmncrq2mvkqck0wawkwaxw"; + sgr-iosevka-term-ss09 = "0lahhifnar8f716xq63xjhibay7cfqgaa7drxvz4pqxmzijv6r2r"; + sgr-iosevka-term-ss10 = "0fp149a4dn7wgdsms70k162g60jgdg5ric93rhxnkn83x3d5jam1"; + sgr-iosevka-term-ss11 = "16pvy63b194vig5vxy15ylmyl5422vrj9adqqwl82r0l9aqpkqlw"; + sgr-iosevka-term-ss12 = "1gldv3srnm7zx9gkyizi6gvf34b7z7xg17qk77882jczsv95hyh1"; + sgr-iosevka-term-ss13 = "0aznbica0yc4vhp4bp84dflfd6jhzw8lsakknfn8dz10kj1qq7vc"; + sgr-iosevka-term-ss14 = "0x73vwywxj7j6qg3armbhm6rjy308j1rk1fhjfriv51hnkm6ylz2"; + sgr-iosevka-term-ss15 = "0px9y25bx75ppsdaq0rfddd9ljxwa3fv5296kvvkw3mwd0ralflx"; + sgr-iosevka-term-ss16 = "1bmnf7z8v4mbcq97lj2qkf722ww1n500jgv2zgs36vxc22zjjrvk"; + sgr-iosevka-term-ss17 = "0lp5qz8j9xc8n959lm4sbfkjhm3ib79qnv69a57nkv5a10ddk20r"; + sgr-iosevka-term-ss18 = "0jkp6zjx9ih5m4pa95a2rn7j1wx4hvnxg2j24cib9dixr7sc81b6"; } From 6ae909d1839c2d40dcb05f596add39eccde1b690 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Sep 2021 10:51:57 -0300 Subject: [PATCH 2/9] vnote: 2.10 -> 3.7.0 --- pkgs/applications/office/vnote/default.nix | 26 +++++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/applications/office/vnote/default.nix index b266ce86e2ac..3519f015ffa1 100644 --- a/pkgs/applications/office/vnote/default.nix +++ b/pkgs/applications/office/vnote/default.nix @@ -1,27 +1,31 @@ -{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtwebengine }: +{ lib +, mkDerivation +, fetchFromGitHub +, qmake +, qtbase +, qtwebengine +}: -let - description = "A note-taking application that knows programmers and Markdown better"; -in mkDerivation rec { - version = "2.10"; +mkDerivation rec { pname = "vnote"; + version = "3.7.0"; src = fetchFromGitHub { - owner = "tamlok"; - repo = "vnote"; + owner = "vnotex"; + repo = pname; fetchSubmodules = true; rev = "v${version}"; - sha256 = "EeeVGnKI0irLO1zJQxlVlIUhqG987JIgxNvKpUgLxUQ="; + sha256 = "sha256-D9/4BakXTComvGTV8F131G5PzA8LhWfNSZRBOMo5t5c="; }; nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtwebengine ]; meta = with lib; { - inherit description; - homepage = "https://tamlok.github.io/vnote"; + homepage = "https://vnotex.github.io/vnote"; + description = "A pleasant note-taking platform"; license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; - maintainers = [ maintainers.kuznero ]; }; } From 0f77179bcfa2e821d98889423d1f8a18e22952ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Tue, 21 Sep 2021 23:01:26 -0300 Subject: [PATCH 3/9] quilt: wrap all required inputs Some quilt commands fail on darwin with this error: stat: illegal option -- c usage: stat [-FlLnqrsx] [-f format] [-t timefmt] [file ...] This is because at build time quilt is configured to use the coreutils version of 'stat', but the 'quilt' wrapper does not wrap this coreutils dependency and then at runtime the version from macOS is used (as found in $PATH). Fix by ensuring that coreutils is wrapped. Also add and wrap the missing inputs for the other programs used by the quilt commands: gawk, gnugrep, gnused, unixtools.column and unixtools.getopt. --- pkgs/development/tools/quilt/default.nix | 36 +++++++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix index 8dafe88005de..334737955832 100644 --- a/pkgs/development/tools/quilt/default.nix +++ b/pkgs/development/tools/quilt/default.nix @@ -1,4 +1,19 @@ -{ lib, stdenv, fetchurl, makeWrapper, bash, perl, diffstat, diffutils, patch, findutils }: +{ lib +, stdenv +, fetchurl +, makeWrapper +, bash +, coreutils +, diffstat +, diffutils +, findutils +, gawk +, gnugrep +, gnused +, patch +, perl +, unixtools +}: stdenv.mkDerivation rec { @@ -11,11 +26,24 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perl bash diffutils patch findutils diffstat ]; + + buildInputs = [ + bash + coreutils + diffstat + diffutils + findutils + gawk + gnugrep + gnused + patch + perl + unixtools.column + unixtools.getopt + ]; postInstall = '' - wrapProgram $out/bin/quilt --prefix PATH : \ - ${perl}/bin:${bash}/bin:${diffstat}/bin:${diffutils}/bin:${findutils}/bin:${patch}/bin + wrapProgram $out/bin/quilt --prefix PATH : ${lib.makeBinPath buildInputs} ''; meta = { From 89da7764efd809a2238a5d6e2788e8e523df7444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sat, 25 Sep 2021 17:14:57 -0300 Subject: [PATCH 4/9] quilt: add smancill as maintainer --- pkgs/development/tools/quilt/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix index 334737955832..eb7fa4488156 100644 --- a/pkgs/development/tools/quilt/default.nix +++ b/pkgs/development/tools/quilt/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/quilt --prefix PATH : ${lib.makeBinPath buildInputs} ''; - meta = { + meta = with lib; { homepage = "https://savannah.nongnu.org/projects/quilt"; description = "Easily manage large numbers of patches"; @@ -57,8 +57,9 @@ stdenv.mkDerivation rec { and more. ''; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.all; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ smancill ]; + platforms = platforms.all; }; } From 1ec1836dfeee36a4616e5a34b5e19fd28669a88e Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sun, 26 Sep 2021 20:05:04 +0200 Subject: [PATCH 5/9] vimPlugins.inkpot: init at 2013-02-10 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index df4942fdbd74..dbc5419abe52 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2517,6 +2517,18 @@ final: prev: meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; + inkpot = buildVimPluginFrom2Nix { + pname = "inkpot"; + version = "2013-02-10"; + src = fetchFromGitHub { + owner = "ciaranm"; + repo = "inkpot"; + rev = "b86ad4dc977d3e92ca713c83bc225526a7d77070"; + sha256 = "1s9hizzjfd6szj5961hmmi767b3mk92q7jq94dff8c6zlza829gy"; + }; + meta.homepage = "https://github.com/ciaranm/inkpot/"; + }; + intero-neovim = buildVimPluginFrom2Nix { pname = "intero-neovim"; version = "2019-11-15"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 5f275b07fb70..b433b04c7cba 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -75,6 +75,7 @@ chriskempson/base16-vim ChristianChiarulli/nvcode-color-schemes.vim christoomey/vim-sort-motion christoomey/vim-tmux-navigator +ciaranm/inkpot ckarnell/antonys-macro-repeater clojure-vim/vim-jack-in cloudhead/neovim-fuzzy From ca4e61d58607c65691f32c31e4add106b27dfd2b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 26 Sep 2021 00:55:09 +0200 Subject: [PATCH 6/9] yarn2nix: run `nix-prefetch-git` with `--fetch-submodules` `pkgs.fetchgit` uses `fetchSubmodules = true;` by default, however `nix-prefetch-git` doesn't. This means that hashes for a Git repository with fetched submodules will be wrong in `yarn.nix`. Considering that this got unnoticed before, it seems as if this case is an exception to a certain degree. An exemplary problem is the last `hedgedoc` update[1] where `js-sequence-diagrams` - a Git repo with submodules - from upstream's package.json caused a hash mismatch. This got unnoticed because `nix-build --check` doesn't seem to reveal these issues for fixed-output derivations. [1] https://github.com/NixOS/nixpkgs/pull/139238 --- .../tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js index b82372fd5b6d..407a602dc5a7 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js @@ -33,7 +33,7 @@ const { execFileSync } = require('child_process') function prefetchgit(url, rev) { return JSON.parse( - execFileSync("nix-prefetch-git", ["--rev", rev, url], { + execFileSync("nix-prefetch-git", ["--rev", rev, url, "--fetch-submodules"], { stdio: [ "ignore", "pipe", "ignore" ], timeout: 60000, }) From aa4c5bb7cf0eb2210bad93483a26a8bb155cd814 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 26 Sep 2021 01:01:37 +0200 Subject: [PATCH 7/9] hedgedoc: fix build by re-running `yarn2nix` Failing Hydra build: https://hydra.nixos.org/build/154209534 --- pkgs/servers/web-apps/hedgedoc/yarn.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/hedgedoc/yarn.nix b/pkgs/servers/web-apps/hedgedoc/yarn.nix index 8ba21d8f5f03..9c71c0695fd4 100644 --- a/pkgs/servers/web-apps/hedgedoc/yarn.nix +++ b/pkgs/servers/web-apps/hedgedoc/yarn.nix @@ -6168,7 +6168,7 @@ repo = fetchgit { url = "https://github.com/hedgedoc/js-sequence-diagrams.git"; rev = "bda0e49b6c2754f3c7158b1dfb9ccf26efc24b39"; - sha256 = "0rl29jmhv7vhadzb6d08hi9g64227r9j10fh3d0lbgxinrib5gma"; + sha256 = "0d2zf62fmad760rg9hrkyhp03k5apms3fm0mf64yy8q6p3iw7jvw"; }; in runCommand "js-sequence-diagrams.git" { buildInputs = [gnutar]; } '' From b20e68e6230cb137b0fc23b38423465fbd4ba82a Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Sat, 25 Sep 2021 09:22:10 +0200 Subject: [PATCH 8/9] trebleshot: remove upstream is archived and not compatible with recent versions for Android anymore --- .../networking/trebleshot/default.nix | 29 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/applications/networking/trebleshot/default.nix diff --git a/pkgs/applications/networking/trebleshot/default.nix b/pkgs/applications/networking/trebleshot/default.nix deleted file mode 100644 index 82f91ddef8b4..000000000000 --- a/pkgs/applications/networking/trebleshot/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ mkDerivation, lib, fetchFromGitHub -, cmake, qtbase, kdnssd -}: - -mkDerivation rec { - pname = "trebleshot"; - version = "0.1.0-alpha2-15-ga7ac23c"; - # name="${pname}-${version}"; - - src = fetchFromGitHub { - owner = "genonbeta"; - repo = "TrebleShot-Desktop"; - rev = version; - sha256 = "1k8wagw6arsi1lqkhn1nl6j11mb122vi1qs0q2np6nznwfy7pn1k"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ qtbase kdnssd ]; - - meta = with lib; { - description = "Android file transferring tool for desktop"; - homepage = "https://github.com/genonbeta/TrebleShot-Desktop"; - license = licenses.gpl2; - - platforms = platforms.linux; - maintainers = with maintainers; [ woffs ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ad615a67b8c7..60957b53324b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -944,6 +944,7 @@ mapAliases ({ transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 transmission-remote-cli = "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # added 2020-10-14 transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; + trebleshot = throw "trebleshot has been removed. It was archived upstream, so it's considered abandoned."; trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # added 2020-04-29 truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9933bfc4af47..17715424bcf7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9782,8 +9782,6 @@ with pkgs; trash-cli = callPackage ../tools/misc/trash-cli { }; - trebleshot = libsForQt5.callPackage ../applications/networking/trebleshot { }; - trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { inherit (xorg) libXxf86vm; }; From a3fa65e48f0cb03e83f8eb16f31fa2cfec0ab606 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 26 Sep 2021 14:27:09 -0700 Subject: [PATCH 9/9] linuxKernel.kernels.linux_xanmod: 5.14.7 -> 5.14.8 --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 3c02140d1357..4acb48479dda 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.14.7"; + version = "5.14.8"; release = "1"; suffix = "xanmod${release}-cacule"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-W3NAiKMs5ZO/OesWzvfzGqgGa/5A49Gy0a8E4yWY2c8="; + sha256 = "sha256-ikASMx5Lbp2BUfjMppnT8Y0UZdKMWqTze78XYoUTeiU="; }; structuredExtraConfig = with lib.kernel; {