From 62821edd2e685be68ece5dd50af4b493a4fa9dba Mon Sep 17 00:00:00 2001 From: nviets Date: Fri, 3 Mar 2023 18:31:19 -0600 Subject: This PR sets default SPARK_HOME and JAVA_HOME for R's sparklyr package using a patch in .onload. Preset value take precedence. SPARK_HOME points to python3Packages.pyspark rather than pkgs.spark because the former is actively maintained. --- pkgs/development/r-modules/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 7cfb8e54f275..82cc0955a4fb 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1275,6 +1275,17 @@ let ''; }); + sparklyr = old.sparklyr.overrideAttrs (attrs: { + # Pyspark's spark is full featured and better maintained than pkgs.spark + preConfigure = '' + substituteInPlace R/zzz.R \ + --replace ".onLoad <- function(...) {" \ + ".onLoad <- function(...) { + Sys.setenv(\"SPARK_HOME\" = Sys.getenv(\"SPARK_HOME\", unset = \"${pkgs.python3Packages.pyspark}/lib/${pkgs.python3Packages.python.libPrefix}/site-packages/pyspark\")) + Sys.setenv(\"JAVA_HOME\" = Sys.getenv(\"JAVA_HOME\", unset = \"${pkgs.openjdk}\"))" + ''; + }); + proj4 = old.proj4.overrideAttrs (attrs: { preConfigure = '' substituteInPlace configure \ -- cgit 1.4.1 From a6462d104a8d7004df933c892c9cf2d42c48ee97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 19:16:28 +0000 Subject: iosevka-bin: 19.0.1 -> 20.0.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 c8f9a44c2e51..9c2825630629 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "19.0.1"; + version = "20.0.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 2193c0832263..a90310037123 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 = "0h763gicj32dcwwcq976w81qyw5602vgybmicz0z6ryggm3r03bm"; - iosevka-aile = "13ihigp432jvlwgh3bb4nfv6yfav2dc0rc70l17dcirp746mw7ak"; - iosevka-curly = "1wx46yls9h179mlxcdhjbxl3s9w0pgrkr48mp97yg8dhpnpfckiv"; - iosevka-curly-slab = "0knqx70b1hhrvmwq72b199ql3gcby3cal7qhwvzfd9p238pla2lv"; - iosevka-etoile = "0lmx2wq0kvh0agfznqlmh2wj4hyc2cysbf4f60jiys78i81q5r8b"; - iosevka-slab = "08x6q0al6w73kbjwpkp8zbd7sgsbwdy8pg2i2n27iid4p10hhrd9"; - iosevka-ss01 = "1vqznn97s981mfx943m7bdvnh3h7v5syp8xq39jjb884c67ar5rg"; - iosevka-ss02 = "0vp85rwxgv2z2v2zxgr7fbqjxmp1zyg2bp1mdxxli6pamfrjb4yq"; - iosevka-ss03 = "131m574ngna9zyiqjgvpr64d6n7lbxnf045vs9i01agiqh7acp7p"; - iosevka-ss04 = "04i48dgzzpjgwca691ccd914mrw2xnhak2pwgaanac5ag90w9zv0"; - iosevka-ss05 = "1db7yn0x4vyvd2v06rmll48a842zwwigwf9jhs3m0lskiya5glaz"; - iosevka-ss06 = "1ymad9kpl0prbj220rnw5gchicb4hi731cgjn3lgjmw737kpg183"; - iosevka-ss07 = "1ljxbdswglw60z54px6fvk185l2h0zabgn96lgncb5wqhnn4zmd5"; - iosevka-ss08 = "10wj07g4yss3d1d81qrm1hy8dkjn5bqym61w4innqpljficqc8da"; - iosevka-ss09 = "0wf57sdyppba1ja5rbjn71fxlf2jh4d6m572jqqnz3fim729cll0"; - iosevka-ss10 = "1apffjqcfs1vaj6gg3svcjfc7n1b370h0bgra489bm1xv23lsxsv"; - iosevka-ss11 = "1zyiias5v4m7i9b2za2apkh8k7lynvyhqaxv5zha599w0di7q1zl"; - iosevka-ss12 = "1mh8gl078f9clkimpizycj2m2bi8jx2ckidrq2p2xdwhji068wjv"; - iosevka-ss13 = "0dhqiwdg9ng78nsr397v4ri3h682wn8yzjpw9ax5yfx7h9r85afm"; - iosevka-ss14 = "03xslqdwm5jn3ld89nvy2lxvxh35wlwijzg0q0pvl16d4a6n6pnh"; - iosevka-ss15 = "03v5miyz49838s5862jj2ssn7sixni91pb88ddzw47dhlwxyf8fy"; - iosevka-ss16 = "1hs5rv8kf7sscmdvmdxszy9y1zk4bd355789gfcgznxmsd4240ig"; - iosevka-ss17 = "0mv7ilvppwbc018fv2a6ghj0v1jd22n8z3al0hbhkn9gr9xixdj2"; - iosevka-ss18 = "0kyl0qqpn7l87cv40vgplqw1i0qncgxq0k8yxzgaz74ski48rf4y"; - sgr-iosevka = "0r19pllpdw3wah81ic0vzqbbrfl45cq401zx175arsxi38hz3lqa"; - sgr-iosevka-aile = "1w2gqj5s3v11n9pzifjjy0z7bdw3qx7pwyajajamqw75zb3jh0rf"; - sgr-iosevka-curly = "1v1q4chckiwzddcnpprsyxvii2kiim69iiim9xqx2wf3qp7sficp"; - sgr-iosevka-curly-slab = "1dbw51i7vqga65l2i9x1vvc098nqdqi396anwzbxpz0q32lv5s0p"; - sgr-iosevka-etoile = "1xx1q1j16fzi8z7xddbm38pm9xj71g4jyjkijqwzzfx7xphr5sk6"; - sgr-iosevka-fixed = "1vbsg6563q4xrr0mqf94ykaz6vdi3ns4c0qaryv8m60pqidvb11h"; - sgr-iosevka-fixed-curly = "14c4k9kbxqrrrmivfjxcmmaicmwflqph2z106s6zr6ifc8qxhk48"; - sgr-iosevka-fixed-curly-slab = "0krlp00b4pwwnfsigjfpi5ixvsllvr6kqj8r7hwlrq6xcqkb5wxd"; - sgr-iosevka-fixed-slab = "0zw26ldz2g1lwzman85wggb4igq8sllsi514cbi42firr16sa91q"; - sgr-iosevka-fixed-ss01 = "09igz4ax75gbqhvckr3l6j8lna81pqnql0bii3v0f41fjqk19w2z"; - sgr-iosevka-fixed-ss02 = "06p278qk1dq3kdq0nqbwspnxvrnhvxqssx8sa2cpcs2rp120a247"; - sgr-iosevka-fixed-ss03 = "1ipvi2sj5prbd11f7ihcgss5yd00aqgymzxqa6njh1j3c4hwacnr"; - sgr-iosevka-fixed-ss04 = "1pwx5r9avv97pcgsdpx5lw7lf19vg5kncn6viwrg659q0bar9bih"; - sgr-iosevka-fixed-ss05 = "0qmak7zdqmycbf3bndbhmkifcxy818w5vsp0pl2qnkklvq2y0v4r"; - sgr-iosevka-fixed-ss06 = "1b163h34h0yxh1jmpimjhjvj97dk2wvzcl7vnbiqwxvandlk6xrn"; - sgr-iosevka-fixed-ss07 = "0i4rc8424vjlqp38cj8h0c168419i0b5dxklsapbwahryzh1d1gp"; - sgr-iosevka-fixed-ss08 = "03kgjhin6cahbxgclckq8w05ax0nz4y392hwsxmvcz21p0cyglan"; - sgr-iosevka-fixed-ss09 = "1xbr1y8izvl36s7k0wbh1a9h5dlgn3dlpyjz3mic4a60xbf7l97d"; - sgr-iosevka-fixed-ss10 = "1kpi03gf30sfryvmi5syig7x0bcz0k2hpms0afrhaz0gprnnv2ap"; - sgr-iosevka-fixed-ss11 = "1v3yybp1aslp811ssjiglxknnnk7p1hymaa1lxdc5hn2hawxmzzn"; - sgr-iosevka-fixed-ss12 = "12yqrv9lvzwzps3zvhhyzdkf01j8h1abhgwnq1abma5h8mlydwkl"; - sgr-iosevka-fixed-ss13 = "08v2zjil62i01r3nqnvpbq51jsx3fxrcqzd1s625hbcywy4x6dvb"; - sgr-iosevka-fixed-ss14 = "1j97971kczdlkvwhcxj55yhqq5q4n1pk5k04pqffh2pl8zdzlj4h"; - sgr-iosevka-fixed-ss15 = "10l56ypqjnnxw33vgd8ajlwiyrvcglx0yh8faxj18if77pfsk82l"; - sgr-iosevka-fixed-ss16 = "0zfjld1s45ipwrxm1sv7kw2vs3f9lbs52zsgm31k8im6zr88rp0i"; - sgr-iosevka-fixed-ss17 = "0b0849jmbq8ync56bn6x7gld6sciyb72ffw95xjlsnfbx2gqyp8h"; - sgr-iosevka-fixed-ss18 = "0yyzc95b65427knjwas5yf4qsd831xz1fbwnvd0c6ngj9dc5xns0"; - sgr-iosevka-slab = "156n7pc9va263c4rg73cv8bizimkv6sabpk7784r423vahwv1s3v"; - sgr-iosevka-ss01 = "0bj0l93hgia8js7ikalm4ij3aa9yii1psnbymi9m5k3qxx8z4i2a"; - sgr-iosevka-ss02 = "0nrvx3grbf0j72gm749j3bpv92qd0g2riywflwa2nxdi9zgprwvh"; - sgr-iosevka-ss03 = "0a9k02r1fwb72dkvihm94s5fhgblz3lkjfwsywr81i5if3v7xnap"; - sgr-iosevka-ss04 = "04yd8zwibjqwc6ml52wwbg52aya2cxm2qk6czjb0rryvb7rx7bjy"; - sgr-iosevka-ss05 = "1syv7vigqzr42535fav2m945z4011xsnhm4sayxqkr4nx1vfx16i"; - sgr-iosevka-ss06 = "1qj2jf9550m37ssp4djmgqd5gk76kz15vxjaiyf2wmvwbl41iwl9"; - sgr-iosevka-ss07 = "1cx2lgqjy29wgb4a77j0ipy0ya3v8b6ipsdrdiqzpbl4j4bn0hbr"; - sgr-iosevka-ss08 = "005vzpcqwbgj4m8c8rd7qvjgjnzwh7napxxp9np5abwv4w6alnav"; - sgr-iosevka-ss09 = "0akhfl78fm8hxdhl4rd6d7bk7gin3hnk2y5cigxki403k415rwqc"; - sgr-iosevka-ss10 = "1aqw31vm4l5840nzg9dghkh33l8grsi7632qh9pm6rcj1x2vsqg4"; - sgr-iosevka-ss11 = "0gvc5rhb4291zy2zdp04ksqs65il3bwgdb4jkc8xq4v62h34i7cw"; - sgr-iosevka-ss12 = "0kra3lgzfbf2cf5p48djay22mwzgz604x9hxkmzq0h4r5rf41lfw"; - sgr-iosevka-ss13 = "1az0ficcg8i1fy37s8svrqi8fcqjz0rzqcprs5rz8m4qrhym0m9b"; - sgr-iosevka-ss14 = "1xg9is9l0dhzqaxq9dpkvdi4rsfkw5nr5jzccjvpvmw3d16kzjm2"; - sgr-iosevka-ss15 = "08r22a314aaqvsjca80k87kyi5nxwn0r63yvar6wn03sgay9hvlz"; - sgr-iosevka-ss16 = "1nqsf9y91llvsc5z1xhwlcnw499fl4n4zvmmsrp3l1gdcg7jcvyl"; - sgr-iosevka-ss17 = "1k5n0i2pffm403ra071ydyzvp5kiqj6q96yfwasqj2p39gjccp3j"; - sgr-iosevka-ss18 = "0kqdggh51x3djmmag485a0mygxckly3vxnzfi659fxfb8p6n0r1n"; - sgr-iosevka-term = "1k836142pkpwn3wnjxv329rbcycm66p24a7a0grnim9i8nsdq64g"; - sgr-iosevka-term-curly = "1sjz4xdvdxxd1d82mgrpafi081d13pvg2csl1g8hgv38x6n2s7j2"; - sgr-iosevka-term-curly-slab = "1vb7ccphwwl1rcb4xarigyj7jqfaglrxxa5p39vc0y3qa7rmjml6"; - sgr-iosevka-term-slab = "14l465qi0ap8qjyzydwda7zzw4xp5gvj6234hqr7p5g7wp8fv1nn"; - sgr-iosevka-term-ss01 = "0b0m1aa7mq0n8yv3m6bchjh50ixl32z1247vkfa7gi53qhprr4zn"; - sgr-iosevka-term-ss02 = "08cdlhgi6sidm62yw6v2n89bmwrgqx1rdwwx72lxhm1qmgzha7yz"; - sgr-iosevka-term-ss03 = "076vpwn8yzgx8r49fpcmbz2djqpr4wa4m6mfcfr5n733pczfnfj4"; - sgr-iosevka-term-ss04 = "13hyzzwhcsk7hsx8yn84zh2z1d6kzx7p7c820cfbgz2h6d6sag8j"; - sgr-iosevka-term-ss05 = "1j3wbf35h1f7qiypbw55fpq38qmp9z4wkvbzs4rhavhjihiw9jfs"; - sgr-iosevka-term-ss06 = "1cdphl4m1khjsi4a740jn7qcl2f7qqsbsngvpyvym1h6jxq8nm34"; - sgr-iosevka-term-ss07 = "1in8zdy791c9ghifgy0wrvsmkw6368h5kzgnqriy6rrabrrib8sq"; - sgr-iosevka-term-ss08 = "1ddxyz4s5rq5l9d1f1cazgcbgzbjzga1szm50l21vl5q11k8080i"; - sgr-iosevka-term-ss09 = "03rb552pqrzkki1xiqy4c06cbj7igdgi0sh8x6myycfikn8xjy32"; - sgr-iosevka-term-ss10 = "1cs03craw089c19wk1ia82i1461fyhxlrknk0bajqd5g1snl60by"; - sgr-iosevka-term-ss11 = "1l81kf1aq7i2lxas98i4xwzy71kjpx84l7gciwc18h41f3x2cs59"; - sgr-iosevka-term-ss12 = "1svp9v04m4v1njg89qjwxvarlvnxpfibxq40izig2gzimq534iyj"; - sgr-iosevka-term-ss13 = "0s9l2h3q6hazi9wrgf9xl9l9g38bb60k99dy219vzyfkl3y7vin4"; - sgr-iosevka-term-ss14 = "1ffmyh2sfnwrfn66x1wd8r00fnmm6v7mvzs3shigz971adgk61si"; - sgr-iosevka-term-ss15 = "12xygrna1g7jaz9hzkl0bnzxaky3gjmvbgy67fi65qk0fwhjb2yf"; - sgr-iosevka-term-ss16 = "13bnl8kg2dj7yr96ngm1y8hm5w56s4mgqpq1gi11667p95wil2sy"; - sgr-iosevka-term-ss17 = "07nh459pmfdcx6pcpzixr8d472zjqkp7122dxp6ifh0kmxnzys15"; - sgr-iosevka-term-ss18 = "0f4fg4sbvh35sf41z5lhg0af4rkm03vrgnkral5kdvvpabxznwwq"; + iosevka = "19f8p7zw7wbm8xbxm0kxv8k979bkqvx51hrckkc6nvddmigq1848"; + iosevka-aile = "0jcyx8wpw18d8igqr1hfrybrldkr0r9qs24jw4z0x5k4gbah7mmf"; + iosevka-curly = "0hj4lx8cyvib21cp065a56ag9jkwpzs74a93cf557j0x91k3wja0"; + iosevka-curly-slab = "10h58x5c32chvz4gdx8pifs1nd4ysnd4zq7pbjqsfv3h4lxz4r5h"; + iosevka-etoile = "16lbcms4rnx7dh016c15wpz94b932hfvlng78jv1lhdr13w7s60z"; + iosevka-slab = "0c8pxdz98xwd8sj1yc8gx2g2wfjyxk4951wmg55dibd3wj106rjp"; + iosevka-ss01 = "01awvcjp9yrvb57pr55ynp12kvjcjyl4yddbaqxh39if2hlp530n"; + iosevka-ss02 = "1j849rpz8lrarhnc020wy6m0lk3xizjrxihbc0bqld6pmjam6b7n"; + iosevka-ss03 = "118c1wfzkhg4918c246r5d8633qfcjz5356acl38jfz45nhhvls5"; + iosevka-ss04 = "0xsylys7ky1v0pb5w0d1dw9hsxpda4yqzjafbqgk98id3b08fvay"; + iosevka-ss05 = "0rpmw3cpzigv39nnirwmai118n5bnpmr58s90p20n4wgvr0rnfz2"; + iosevka-ss06 = "0pw41ncg2qjabi33ql2xp4a76gxxynybqbgrj7lk30dyr597v5v9"; + iosevka-ss07 = "0ww21ydwj0537xzk8f2przcd232fibzrsgil7pl5xmf2di226hx5"; + iosevka-ss08 = "195w4nd0901zlyjq7a6n7pwjwi2b5vnm4gj4y6692axi660jdv4j"; + iosevka-ss09 = "1h5jfrpply7ypc4h6ivxs30qkrbni51zkj78xz6nz4zbnp923yi0"; + iosevka-ss10 = "0j8i7ampwrlw8ka3vjad2z7ll2606ia8zp7c65i14m73v3vcyxfi"; + iosevka-ss11 = "1v76db3jfx82ifxs3mci6xsy6xkvadl40nnla1afb3d4ycd907ni"; + iosevka-ss12 = "0ax80i0nd7z5x92hrk8mpv3n1x6hhxgwlqm7niv9nqm78dgma8sz"; + iosevka-ss13 = "03nmlsgnphi3q5mm36l7a9rynijsjhh6g6b68xxxl3djmby613as"; + iosevka-ss14 = "1liapgr528qd88y6brhskcniddxanqqmx2qww21rqfyv9wl110wj"; + iosevka-ss15 = "19mhdl6dzb4003m00chnj9918l3mxrwfvfxh3wmvp6h4sfa6hymk"; + iosevka-ss16 = "0zsmjgv1i5bb3gk0zl0yi6lrrb8mikl1hlhi7p0vfapas7p5ylyy"; + iosevka-ss17 = "02p5q5wwn2awaifdknyki8q25c2f1mq59fa6w4vf6n3k95s8sys5"; + iosevka-ss18 = "1lpkcpqjpf2982pc9kk4dg788vwdpxg18i8mcwx6wa7wfkykrq24"; + sgr-iosevka = "0aar54rgmz9slpqj3vbwi6znmk2my3yc1kpmsv9yd2r4fk09s3ib"; + sgr-iosevka-aile = "0xc3n9xcmnkz6pb2z6jf4x0qn02hm5figa5w4ngmfn9zcpc4k7xs"; + sgr-iosevka-curly = "1daa9f6bkwqjg6wx87xnhj4hzmv5qbb8ggfhxwllkkw9q2ibv41k"; + sgr-iosevka-curly-slab = "0g4738nnkhzqj1mpg25f0jncrjqks0s1k8sjxl9478jdyh7i1ssz"; + sgr-iosevka-etoile = "0bf93cz940shiazdkg7cpvmwbdk7i8mcsafilvkm6pil71i9n54q"; + sgr-iosevka-fixed = "1025syksb3smhfbcarn00vhp5glz34cdyzsrnhxvm8xk7x285n0h"; + sgr-iosevka-fixed-curly = "1qhj71bn0j4wnv3hbk3557jzya0an79fyfaphbi1bqzcwxzlml42"; + sgr-iosevka-fixed-curly-slab = "1b4zgp8hyhqbzkgvy1dxrzgy0wbm2n95255j40xz88bflzj5ad4i"; + sgr-iosevka-fixed-slab = "04hiscy1y19rgwm837va9p6nr4vpsr0y45m5z6wpgd97fyylhdhz"; + sgr-iosevka-fixed-ss01 = "0iay9lrai7nrp6h1i1jhid50krdl1lq0fcn13lij39ppx0b5khdq"; + sgr-iosevka-fixed-ss02 = "10wja1qd12jvf3s1hd9z9qq9av86ds5ldk47b2nxzd31q704gk7l"; + sgr-iosevka-fixed-ss03 = "1lxz33da9wxlvjd75xrwxzyhr00i0iyg1r5myp8bdqxk58a20686"; + sgr-iosevka-fixed-ss04 = "1lghpzgb92hqm60djk2mg9cy55q2q8v1cdkc142iac6qdjk5q1yn"; + sgr-iosevka-fixed-ss05 = "14r08jnq04b8vg6svqzrswr3splmmkjni7jkz2zxhygpj8jacdq0"; + sgr-iosevka-fixed-ss06 = "1f70m7mxmazcg4rkh8bv06ykrj0qcxbaqkhaj0f9zmq9inw3fd7f"; + sgr-iosevka-fixed-ss07 = "03yp6zgp6020whzs3crhm63824413skxm4274aqy94f6853j5xlf"; + sgr-iosevka-fixed-ss08 = "1rjbnik2cp5r4n6w2bmr0cbcl7lvbrn4mwny43xljh84alsz8pa1"; + sgr-iosevka-fixed-ss09 = "1nzhqngfjagjajd5mlay12axvbzi35s7z8hyz254438w2a5dmqz2"; + sgr-iosevka-fixed-ss10 = "0p2d55aa8gkccpf49s0dwbfvmkr0ayvb7rli2hbn672m04kyjmia"; + sgr-iosevka-fixed-ss11 = "1y2jsj3fzim83x97nd3774qvgp91vmrdhad9ax9zg36wqzydipnz"; + sgr-iosevka-fixed-ss12 = "1rk8404ndbbhq310cn083q4p1f2k30gz5b26hb9r9q6782jadafl"; + sgr-iosevka-fixed-ss13 = "0p3jqjxglc0gk5r2cbp0xz7sfqh16y5hlq3rqx0nrx5bgpnqaglz"; + sgr-iosevka-fixed-ss14 = "14c5a4ib1f2nyfa062cicqxxqzrkrq3fxqckdi5rj2fc175c5rg8"; + sgr-iosevka-fixed-ss15 = "14v0a7pd4bfmw952j47xfdaf4vz3qimsy8dv7x0q1p3mgcy9nyni"; + sgr-iosevka-fixed-ss16 = "008rzn1gzc12cd0pxryylvqnim3gh9h74j5mv0idrv5z2yp8slai"; + sgr-iosevka-fixed-ss17 = "0x5cmsm0ixyl8chbxlz2dli6girhnxi678win9y6cvmi88jfiqs4"; + sgr-iosevka-fixed-ss18 = "1m5ryy02r44df69a95nf2r69a4pqgbhbn31c1zy3bi1fkww4xnrf"; + sgr-iosevka-slab = "0lwhsyb4p6bxk2vlvffzbn33ri89jy41jp89aanfgm64m8b9zswp"; + sgr-iosevka-ss01 = "1lgffhzkisqbqv5xy4b6qxram8dinxrzdrd7b4xf2vbvsp6pxrmg"; + sgr-iosevka-ss02 = "0g3fz7iliwk8zwmyklrschsmh8g4dg7p767ypmb576q580g2iin6"; + sgr-iosevka-ss03 = "1pdqmzjds8aa4ycyf95c5gri068x13xv66285z732gsrbbdmw6px"; + sgr-iosevka-ss04 = "17ps0wp1ibwhivl9h6j4n272cv8x6imd6vh85h48hqalr7lbmz5n"; + sgr-iosevka-ss05 = "0m73nzvi5dd1g3g0fq7bji5avq60kzpg53wc375nxkc7w1pygzhn"; + sgr-iosevka-ss06 = "1pfk3nbmbih553qba3w0281y2gnn1a86pmsz9zkmv16chjlwq9xn"; + sgr-iosevka-ss07 = "0g27zkj56hsmzj312fx47p8h4k4h37jm5jw7yz80lbj6cp2qyg1g"; + sgr-iosevka-ss08 = "0cykprs0p1m6pkpynix80lanwvspmmir5mgkjpd2bq1yn24krgcg"; + sgr-iosevka-ss09 = "04ajyvcv6d27ll75a09i0vw5731fgmqil1zs4vl5y96vnjzym270"; + sgr-iosevka-ss10 = "0gvjj5kskaf68svlygg2k1a59gzjbn8v2amp7krfdgcvzvi5rymw"; + sgr-iosevka-ss11 = "0gd6dbpmb345qly2fgl094cl24gpih2p0a9a1jj4qwf3fwj4i4kr"; + sgr-iosevka-ss12 = "0gf0hmdr2rgzx9ab0cgcpzx2wczn5c7qs3nblghazfyydi85na5y"; + sgr-iosevka-ss13 = "1lr9kjmq306q1ac745vnhs53c6mlqacx2qiq6j8ac26ny4fyp04k"; + sgr-iosevka-ss14 = "16q2gwysiqn1l49q6wm4g636alcljlbjn9xhqy8pf9jw0574rxbn"; + sgr-iosevka-ss15 = "0ic76dz64dqii1qix6hdw2pvzfphbd6lmh5j6ci4fb1m6n8gb17c"; + sgr-iosevka-ss16 = "1rxkd0yl9savj7ic3mnap9hi7lmsdnh3b3fylhnbx415cdyzcn4i"; + sgr-iosevka-ss17 = "1j8my340drr9llr5bws9zlz7m2nkj45p635irginpjrx8678l66q"; + sgr-iosevka-ss18 = "1r8kzdc8ibj7v0nm6yxssfl9mrcyz07fv8x1rqzh07bw66qwr1az"; + sgr-iosevka-term = "06r78ags2b9psayl1mk98i2n7r7mp5jrfs6bgydg8rw76wzms8pp"; + sgr-iosevka-term-curly = "1mrz6rcizk1w8f1hcbs001pmrhdxdw4mx5arg0csf42smrazwnah"; + sgr-iosevka-term-curly-slab = "014jqbcmw1779zg6kgxq5ag5830bspb0qfkwj024lj8h766msanr"; + sgr-iosevka-term-slab = "0kkz3hhrv769m4qbfxwahb3fv8zwj9vinzblbjjs0zv839kxw1s1"; + sgr-iosevka-term-ss01 = "1y6v2pnqxs8hlkp3zj078d1p9qfv33bmrg4n32mfqv6r843x079y"; + sgr-iosevka-term-ss02 = "162hd1p55z2r5svmhb3l79w8wgv3pwk2zsjqdz3idbp0hycn3nfv"; + sgr-iosevka-term-ss03 = "0azsdl46wmxv3rskdma16l631sjdg4gdb83998gmg4gaixxw6v0c"; + sgr-iosevka-term-ss04 = "05czhnpnxwbx3r6h6kpj9cs5766m49wr37g32dhxayk0yxwqdw3k"; + sgr-iosevka-term-ss05 = "0l090r9g1wzz05zc581qnlhs6j315vxgmwmn7xclifpq7q5hqbcf"; + sgr-iosevka-term-ss06 = "0g2m6g94j8js213ni73pxb8vw120fn6hrk9c2brr8xazpqfb0flh"; + sgr-iosevka-term-ss07 = "1gizqdwfji038wgziqzvqwnllid9x25q1v7hny9dv13cadg853yf"; + sgr-iosevka-term-ss08 = "0hgwxnrv51svqqyaf13w9gh27id8afvv83lf3s3dacif3sfnqmfl"; + sgr-iosevka-term-ss09 = "07w671y8754wwb09gjr3pllmgkwql9idv63w8qrjfs2r01vz4lly"; + sgr-iosevka-term-ss10 = "06d02iwk19nb3ayn21qmwlhvfsq9alrzh5xvgjgzcp86216rzfpw"; + sgr-iosevka-term-ss11 = "18vjdmaw45mcjp60yh6s2rwj0gbk7cqxk7chxhmac4yrw4nps2c9"; + sgr-iosevka-term-ss12 = "1r586535bphhnbr1ka5sffwcyd1fbfk9rkg3gjd5b329xsrr7ifc"; + sgr-iosevka-term-ss13 = "19q5gcz5rcv77gmy8z46mjs8ykx3zqf0wgb1a9izvzl0656fk6lp"; + sgr-iosevka-term-ss14 = "19sy7bmnnbpa677cwajr0wnpii4apz113xcdnw8nk734ivl3f8sb"; + sgr-iosevka-term-ss15 = "08c1zlmnvhvmy3312jf608j45g4mv1if46jh734mi7fk4q2ylxn5"; + sgr-iosevka-term-ss16 = "0x1vll4hyw9bkjvv88lnwvma46p7lvwlc2qb7pnjkx21cacdf9f1"; + sgr-iosevka-term-ss17 = "07wl4f4ysigi80s6pzznydnqzx426hhvwkn78jrc1sdvas78vml5"; + sgr-iosevka-term-ss18 = "1ha0mahcrxhqvbhcmfsfv49jbsz8w2s7kpvf8j22ws1v0fjnx3l6"; } -- cgit 1.4.1 From be1d82d5ca6c3e80442d91b1a45af66776326495 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Mon, 6 Mar 2023 18:57:55 -0800 Subject: python310Packages.openapi-schema-validator: 0.3.4 -> 0.4.3 Diff: https://github.com/p1c2u/openapi-schema-validator/compare/refs/tags/0.3.4...0.4.3 --- .../openapi-schema-validator/default.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index d3c121ed94e7..456f57e3309d 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -5,31 +5,38 @@ , pytestCheckHook , isodate , jsonschema -, pytest-cov , rfc3339-validator -, six -, strict-rfc3339 }: buildPythonPackage rec { pname = "openapi-schema-validator"; - version = "0.3.4"; + version = "0.4.3"; format = "pyproject"; src = fetchFromGitHub { owner = "p1c2u"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-0nKAeqZCfzYFsV18BDsSws/54FmRoy7lQSHguI6m3Sc="; + hash = "sha256-rp0Oq5WWPpna5rHrq/lfRNxjK5/FLgPZ5uzVfDT/YiI="; }; + postPatch = '' + sed -i "/--cov/d" pyproject.toml + ''; + nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ isodate jsonschema six strict-rfc3339 rfc3339-validator ]; + propagatedBuildInputs = [ + jsonschema + rfc3339-validator + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; - nativeCheckInputs = [ pytestCheckHook pytest-cov ]; pythonImportsCheck = [ "openapi_schema_validator" ]; meta = with lib; { -- cgit 1.4.1 From f1479a8e9ff0c57a4d90b7ea1a86777be152330c Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Mon, 6 Mar 2023 19:02:40 -0800 Subject: python310Packages.openapi-spec-validator: 0.5.1 -> 0.5.5 Diff: https://github.com/p1c2u/openapi-spec-validator/compare/0.5.1...0.5.5 --- .../python-modules/openapi-spec-validator/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 371661e2feb8..296bcd7b9932 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage +, pythonOlder , fetchFromGitHub , poetry-core -, setuptools # propagates , importlib-resources @@ -22,29 +22,30 @@ buildPythonPackage rec { pname = "openapi-spec-validator"; - version = "0.5.1"; + version = "0.5.5"; format = "pyproject"; + disabled = pythonOlder "3.7"; + # no tests via pypi sdist src = fetchFromGitHub { owner = "p1c2u"; repo = pname; rev = version; - hash = "sha256-8VhD57dNG0XrPUdcq39GEfHUAgdDwJ8nv+Lp57OpTLg="; + hash = "sha256-t7u0p6V2woqIFsqywv7k5s5pbbnmcn45YnlFWH1PEi4="; }; nativeBuildInputs = [ poetry-core - setuptools ]; propagatedBuildInputs = [ - importlib-resources jsonschema jsonschema-spec lazy-object-proxy openapi-schema-validator - pyyaml + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources ]; passthru.optional-dependencies.requests = [ -- cgit 1.4.1 From 9ca5356d8d4475a12e9ad4d3d611fddbc02d4aa6 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Mon, 6 Mar 2023 18:52:30 -0800 Subject: python310Packages.openapi-core: 0.16.6 -> 0.17.0 Diff: https://github.com/p1c2u/openapi-core/compare/refs/tags/0.16.6...0.17.0 Changelog: https://github.com/python-openapi/openapi-core/releases/tag/0.17.0 --- pkgs/development/python-modules/openapi-core/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index 987f5cf6b14d..e024138b4cfb 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "openapi-core"; - version = "0.16.6"; + version = "0.17.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = "openapi-core"; rev = "refs/tags/${version}"; - hash = "sha256-cpWEZ+gX4deTxMQ5BG+Qh863jcqUkOlNSY3KtOwOcBo="; + hash = "sha256-LxCaP8r+89UmV/VfqtA/mWV/CXd6ZfRQnNnM0Jde7ko="; }; postPatch = '' @@ -84,11 +84,7 @@ buildPythonPackage rec { pytestCheckHook responses webob - ] ++ passthru.optional-dependencies.flask - ++ passthru.optional-dependencies.falcon - ++ passthru.optional-dependencies.django - ++ passthru.optional-dependencies.starlette - ++ passthru.optional-dependencies.requests; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); disabledTestPaths = [ # Requires secrets and additional configuration -- cgit 1.4.1 From 7939447527bf256129c8b44883f31edb261de165 Mon Sep 17 00:00:00 2001 From: nviets Date: Tue, 7 Mar 2023 11:08:38 +0100 Subject: Update pkgs/development/r-modules/default.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Justin Bedő --- pkgs/development/r-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 82cc0955a4fb..3b41bb3e7c9d 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1282,7 +1282,7 @@ let --replace ".onLoad <- function(...) {" \ ".onLoad <- function(...) { Sys.setenv(\"SPARK_HOME\" = Sys.getenv(\"SPARK_HOME\", unset = \"${pkgs.python3Packages.pyspark}/lib/${pkgs.python3Packages.python.libPrefix}/site-packages/pyspark\")) - Sys.setenv(\"JAVA_HOME\" = Sys.getenv(\"JAVA_HOME\", unset = \"${pkgs.openjdk}\"))" + Sys.setenv(\"JAVA_HOME\" = Sys.getenv(\"JAVA_HOME\", unset = \"${pkgs.jdk}\"))" ''; }); -- cgit 1.4.1 From 2f430da1c6aaeb4306427b77f139f53dcd729e08 Mon Sep 17 00:00:00 2001 From: Nathan Viets Date: Thu, 2 Mar 2023 19:37:27 -0500 Subject: Replacing MRAN mirror with posit --- pkgs/development/r-modules/default.nix | 4 ++-- pkgs/development/r-modules/generate-r-packages.R | 6 ++++-- pkgs/development/r-modules/generate-shell.nix | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 7cfb8e54f275..6d6814e3f66a 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -68,9 +68,9 @@ let hydraPlatforms = []; }; deriveCran = mkDerive { - mkHomepage = {name, snapshot, ...}: "http://mran.revolutionanalytics.com/snapshot/${snapshot}/web/packages/${name}/"; + mkHomepage = {name, snapshot, ...}: "https://cran.r-project.org/${snapshot}/web/packages/${name}/"; mkUrls = {name, version, snapshot}: [ - "http://mran.revolutionanalytics.com/snapshot/${snapshot}/src/contrib/${name}_${version}.tar.gz" + "https://packagemanager.rstudio.com/cran/${snapshot}/src/contrib/${name}_${version}.tar.gz" ]; }; diff --git a/pkgs/development/r-modules/generate-r-packages.R b/pkgs/development/r-modules/generate-r-packages.R index 8c97c651e4c4..0b01c09a278e 100755 --- a/pkgs/development/r-modules/generate-r-packages.R +++ b/pkgs/development/r-modules/generate-r-packages.R @@ -1,5 +1,6 @@ #!/usr/bin/env Rscript library(data.table) +library(jsonlite) library(parallel) library(BiocManager) cl <- makeCluster(10) @@ -11,12 +12,13 @@ if ("release" %in% biocVersion$BiocStatus) { } else { biocVersion <- max(as.numeric(as.character(biocVersion$Bioc))) } -snapshotDate <- Sys.Date()-1 +dates <- stream_in(url("https://packagemanager.rstudio.com/__api__/repos/2/transaction-dates"), verbose = FALSE) +snapshotDate <- as.Date(dates[nrow(dates), "alias"]) mirrorUrls <- list( bioc=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", biocVersion, "/bioc/src/contrib/") , "bioc-annotation"=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", biocVersion, "/data/annotation/src/contrib/") , "bioc-experiment"=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", biocVersion, "/data/experiment/src/contrib/") - , cran=paste0("http://mran.revolutionanalytics.com/snapshot/", snapshotDate, "/src/contrib/") + , cran=paste0("https://packagemanager.rstudio.com/cran/", snapshotDate, "/src/contrib/") ) mirrorType <- commandArgs(trailingOnly=TRUE)[1] diff --git a/pkgs/development/r-modules/generate-shell.nix b/pkgs/development/r-modules/generate-shell.nix index 1c96cf05cb54..0ab3d6fb557f 100644 --- a/pkgs/development/r-modules/generate-shell.nix +++ b/pkgs/development/r-modules/generate-shell.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation { (rWrapper.override { packages = with rPackages; [ data_table + jsonlite parallel BiocManager ]; -- cgit 1.4.1 From 0c370aab6450244197fcd08814a42cdf560ea973 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Mar 2023 19:23:02 +0000 Subject: aws-sso-cli: 1.9.9 -> 1.9.10 --- pkgs/tools/admin/aws-sso-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aws-sso-cli/default.nix b/pkgs/tools/admin/aws-sso-cli/default.nix index 023a91df8332..25fd3b311ab5 100644 --- a/pkgs/tools/admin/aws-sso-cli/default.nix +++ b/pkgs/tools/admin/aws-sso-cli/default.nix @@ -6,15 +6,15 @@ }: buildGoModule rec { pname = "aws-sso-cli"; - version = "1.9.9"; + version = "1.9.10"; src = fetchFromGitHub { owner = "synfinatic"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ulnRVyfJ0L1iJ3zVvn3VUYGXDV/UwhqdcC8D4wnjNys="; + sha256 = "sha256-hDXCH5B4bc0SKv/qzk92bPm366LmdYWTuVVn8KI0avo="; }; - vendorSha256 = "sha256-myjHRZXTjsLXD8kibcdf1/Nhvx50fDsFtmZd63DpiiI="; + vendorHash = "sha256-myjHRZXTjsLXD8kibcdf1/Nhvx50fDsFtmZd63DpiiI="; nativeBuildInputs = [ makeWrapper ]; -- cgit 1.4.1 From 779db7898ca58416f6d1e5bc3c4ed4dafd32879c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 8 Mar 2023 08:44:59 +1000 Subject: go_1_20: 1.20.1 -> 1.20.2 Changelog: https://go.dev/doc/devel/release#go1.20 --- pkgs/development/compilers/go/1.20.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.20.nix b/pkgs/development/compilers/go/1.20.nix index f432e5468779..6d08c18b143e 100644 --- a/pkgs/development/compilers/go/1.20.nix +++ b/pkgs/development/compilers/go/1.20.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.20.1"; + version = "1.20.2"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - hash = "sha256-tcGjr1LDhabRx2rtU2HPJkWQI5gNAyDedli645FYMaI="; + hash = "sha256-TQ4oUNGXtN2tO9sBljABedCVuzrv1N+8OzZwLDco+Ks="; }; strictDeps = true; -- cgit 1.4.1 From 45a706c5991d6c305ed7942c7b3ec9e23242342e Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Tue, 7 Mar 2023 16:24:39 -0800 Subject: python310Packages.prance: 0.21.8.0 -> 0.22.02.22.0 Diff: https://github.com/RonnyPfannschmidt/prance/compare/v0.21.8.0...v0.22.02.22.0 Changelog: https://github.com/RonnyPfannschmidt/prance/blob/v0.22.02.22.0/CHANGES.rst --- pkgs/development/python-modules/prance/default.nix | 53 ++++++++++------------ 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 9f730b2f39f9..25ceb1259c5f 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -1,54 +1,39 @@ { lib , buildPythonPackage +, pythonOlder , fetchFromGitHub -, fetchpatch , chardet +, click +, flex +, packaging +, pyicu , requests , ruamel-yaml , setuptools-scm , six -, semver +, swagger-spec-validator , pytestCheckHook , openapi-spec-validator }: buildPythonPackage rec { pname = "prance"; - version = "0.21.8.0"; + version = "0.22.02.22.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "RonnyPfannschmidt"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-kGANMHfWwhW3ZBw2ZVCJZR/bV2EPhcydMKhDeDTVwcQ="; + hash = "sha256-NtIbZp34IcMYJzaNQVL9GLdNS3NYOCRoWS1wGg/gLVA="; }; - patches = [ - # Fix for openapi-spec-validator 0.5.0+: - # https://github.com/RonnyPfannschmidt/prance/pull/132 - (fetchpatch { - name = "1-openapi-spec-validator-upgrade.patch"; - url = "https://github.com/RonnyPfannschmidt/prance/commit/55503c9b12b685863c932ededac996369e7d288a.patch"; - hash = "sha256-7SOgFsk2aaaaAYS8WJ9axqQFyEprurn6Zn12NcdQ9Bg="; - }) - (fetchpatch { - name = "2-openapi-spec-validator-upgrade.patch"; - url = "https://github.com/RonnyPfannschmidt/prance/commit/7e59cc69c6c62fd04875105773d9d220bb58fea6.patch"; - hash = "sha256-j6vmY3NqDswp7v9682H+/MxMGtFObMxUeL9Wbiv9hYw="; - }) - (fetchpatch { - name = "3-openapi-spec-validator-upgrade.patch"; - url = "https://github.com/RonnyPfannschmidt/prance/commit/7e575781d83845d7ea0c2eff57644df9b465c7af.patch"; - hash = "sha256-rexKoQ+TH3QmP20c3bA+7BLMLc+fkVhn7xsq+gle1Aw="; - }) - ]; - postPatch = '' substituteInPlace setup.cfg \ - --replace "--cov=prance --cov-report=term-missing --cov-fail-under=90" "" \ - --replace "chardet>=3.0,<5.0" "chardet" + --replace "--cov=prance --cov-report=term-missing --cov-fail-under=90" "" ''; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -59,27 +44,37 @@ buildPythonPackage rec { propagatedBuildInputs = [ chardet + packaging requests ruamel-yaml six - semver ]; + passthru.optional-dependencies = { + cli = [ click ]; + flex = [ flex ]; + icu = [ pyicu ]; + osv = [ openapi-spec-validator ]; + ssv = [ swagger-spec-validator ]; + }; + nativeCheckInputs = [ pytestCheckHook - openapi-spec-validator - ]; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); # Disable tests that require network disabledTestPaths = [ "tests/test_convert.py" ]; disabledTests = [ + "test_convert_defaults" + "test_convert_output" "test_fetch_url_http" ]; pythonImportsCheck = [ "prance" ]; meta = with lib; { + changelog = "https://github.com/RonnyPfannschmidt/prance/blob/${src.rev}/CHANGES.rst"; description = "Resolving Swagger/OpenAPI 2.0 and 3.0.0 Parser"; homepage = "https://github.com/RonnyPfannschmidt/prance"; license = licenses.mit; -- cgit 1.4.1 From 34f4be4ad2e7d153f370570ccec8467bec1b23d4 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Tue, 7 Mar 2023 16:17:18 -0800 Subject: python310Packages.apispec: 6.1.0 -> 6.2.0 Changelog: https://github.com/marshmallow-code/apispec/blob/6.2.0/CHANGELOG.rst --- pkgs/development/python-modules/apispec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index f385c87d8558..e24e6c9279d9 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "apispec"; - version = "6.1.0"; + version = "6.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iB07kL//3tZZvApL8J6t7t+iVs0nFyaxVV11r54Kmmk="; + hash = "sha256-GpSaYLtMQr7leqr11DwYTfPi6W2WWORC513UQ1z2CWE="; }; propagatedBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { validation = [ openapi-spec-validator prance - ]; + ] ++ prance.optional-dependencies.osv; }; nativeCheckInputs = [ -- cgit 1.4.1 From 61852b7faa8b47aad422adca0fea90fe007e9ead Mon Sep 17 00:00:00 2001 From: pennae Date: Fri, 24 Feb 2023 16:28:06 +0100 Subject: lib: remove deprecated functions all of these have been deprecated and raising warnings since 18.09. it's about time we actually made good on "will be removed in the next release". --- lib/debug.nix | 86 --------------------------------------------------------- lib/default.nix | 9 +++--- 2 files changed, 4 insertions(+), 91 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index 35ca4c7dfb20..a851cd74778c 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -250,90 +250,4 @@ rec { { testX = allTrue [ true ]; } */ testAllTrue = expr: { inherit expr; expected = map (x: true) expr; }; - - - # -- DEPRECATED -- - - traceShowVal = x: trace (showVal x) x; - traceShowValMarked = str: x: trace (str + showVal x) x; - - attrNamesToStr = a: - trace ( "Warning: `attrNamesToStr` is deprecated " - + "and will be removed in the next release. " - + "Please use more specific concatenation " - + "for your uses (`lib.concat(Map)StringsSep`)." ) - (concatStringsSep "; " (map (x: "${x}=") (attrNames a))); - - showVal = - trace ( "Warning: `showVal` is deprecated " - + "and will be removed in the next release, " - + "please use `traceSeqN`" ) - (let - modify = v: - let pr = f: { __pretty = f; val = v; }; - in if isDerivation v then pr - (drv: "<δ:${drv.name}:${concatStringsSep "," - (attrNames drv)}>") - else if [] == v then pr (const "[]") - else if isList v then pr (l: "[ ${go (head l)}, … ]") - else if isAttrs v then pr - (a: "{ ${ concatStringsSep ", " (attrNames a)} }") - else v; - go = x: generators.toPretty - { allowPrettyValues = true; } - (modify x); - in go); - - traceXMLVal = x: - trace ( "Warning: `traceXMLVal` is deprecated " - + "and will be removed in the next release. " - + "Please use `traceValFn builtins.toXML`." ) - (trace (builtins.toXML x) x); - traceXMLValMarked = str: x: - trace ( "Warning: `traceXMLValMarked` is deprecated " - + "and will be removed in the next release. " - + "Please use `traceValFn (x: str + builtins.toXML x)`." ) - (trace (str + builtins.toXML x) x); - - # trace the arguments passed to function and its result - # maybe rewrite these functions in a traceCallXml like style. Then one function is enough - traceCall = n: f: a: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a)); - traceCall2 = n: f: a: b: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b)); - traceCall3 = n: f: a: b: c: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b) (t "arg 3" c)); - - traceValIfNot = c: x: - trace ( "Warning: `traceValIfNot` is deprecated " - + "and will be removed in the next release. " - + "Please use `if/then/else` and `traceValSeq 1`.") - (if c x then true else traceSeq (showVal x) false); - - - addErrorContextToAttrs = attrs: - trace ( "Warning: `addErrorContextToAttrs` is deprecated " - + "and will be removed in the next release. " - + "Please use `builtins.addErrorContext` directly." ) - (mapAttrs (a: v: addErrorContext "while evaluating ${a}" v) attrs); - - # example: (traceCallXml "myfun" id 3) will output something like - # calling myfun arg 1: 3 result: 3 - # this forces deep evaluation of all arguments and the result! - # note: if result doesn't evaluate you'll get no trace at all (FIXME) - # args should be printed in any case - traceCallXml = a: - trace ( "Warning: `traceCallXml` is deprecated " - + "and will be removed in the next release. " - + "Please complain if you use the function regularly." ) - (if !isInt a then - traceCallXml 1 "calling ${a}\n" - else - let nr = a; - in (str: expr: - if isFunction expr then - (arg: - traceCallXml (builtins.add 1 nr) "${str}\n arg ${builtins.toString nr} is \n ${builtins.toXML (builtins.seq arg arg)}" (expr arg) - ) - else - let r = builtins.seq expr expr; - in trace "${str}\n result:\n${builtins.toXML r}" r - )); } diff --git a/lib/default.nix b/lib/default.nix index 7948dbd5a1ef..85303e0a5abf 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -145,11 +145,10 @@ let isOptionType mkOptionType; inherit (self.asserts) assertMsg assertOneOf; - inherit (self.debug) addErrorContextToAttrs traceIf traceVal traceValFn - traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq - traceValSeqFn traceValSeqN traceValSeqNFn traceFnSeqN traceShowVal - traceShowValMarked showVal traceCall traceCall2 traceCall3 - traceValIfNot runTests testAllTrue traceCallXml attrNamesToStr; + inherit (self.debug) traceIf traceVal traceValFn + traceSeq traceSeqN traceValSeq + traceValSeqFn traceValSeqN traceValSeqNFn traceFnSeqN + runTests testAllTrue; inherit (self.misc) maybeEnv defaultMergeArg defaultMerge foldArgs maybeAttrNullable maybeAttr ifEnable checkFlag getValue checkReqs uniqList uniqListExt condConcat lazyGenericClosure -- cgit 1.4.1 From 194a380161f12b7b720d25527b06292b715ddaf2 Mon Sep 17 00:00:00 2001 From: SharzyL Date: Wed, 8 Mar 2023 11:20:55 +0800 Subject: nexttrace: init at 1.1.3 --- pkgs/tools/networking/nexttrace/default.nix | 30 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/networking/nexttrace/default.nix diff --git a/pkgs/tools/networking/nexttrace/default.nix b/pkgs/tools/networking/nexttrace/default.nix new file mode 100644 index 000000000000..931c229ae3aa --- /dev/null +++ b/pkgs/tools/networking/nexttrace/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "nexttrace"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "sjlleo"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-sOTQBh6j8od24s36J0e2aKW1mWmAD/ThfY6pd1SsSlY="; + }; + vendorHash = "sha256-ckGoDV4GNp0mG+bkCKoLBO+ap53R5zrq/ZSKiFmVf9U="; + + doCheck = false; # Tests require a network connection. + + ldflags = [ + "-s" + "-w" + "-X github.com/xgadget-lab/nexttrace/printer.version=v${version}" + ]; + + meta = with lib; { + description = "An open source visual route tracking CLI tool"; + homepage = "https://mtr.moe"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ sharzy ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e545c2a710b..ae25c97d6ae7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5317,6 +5317,8 @@ with pkgs; nextdns = callPackage ../applications/networking/nextdns { }; + nexttrace = callPackage ../tools/networking/nexttrace { }; + ngadmin = callPackage ../applications/networking/ngadmin { }; nfdump = callPackage ../tools/networking/nfdump { }; -- cgit 1.4.1 From 5e651fe37e98c69121609146ad5240663d0387df Mon Sep 17 00:00:00 2001 From: SharzyL Date: Wed, 8 Mar 2023 11:21:06 +0800 Subject: nixos/nexttrace: init --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/nexttrace.nix | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 nixos/modules/programs/nexttrace.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index de390d801478..2b046d19d758 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -205,6 +205,7 @@ ./programs/nbd.nix ./programs/neovim.nix ./programs/nethoscope.nix + ./programs/nexttrace.nix ./programs/nix-index.nix ./programs/nix-ld.nix ./programs/nm-applet.nix diff --git a/nixos/modules/programs/nexttrace.nix b/nixos/modules/programs/nexttrace.nix new file mode 100644 index 000000000000..091d4f17f9f6 --- /dev/null +++ b/nixos/modules/programs/nexttrace.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.programs.nexttrace; + +in +{ + options = { + programs.nexttrace = { + enable = lib.mkEnableOption (lib.mdDoc "Nexttrace to the global environment and configure a setcap wrapper for it"); + package = lib.mkPackageOptionMD pkgs "nexttrace" { }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + security.wrappers.nexttrace = { + owner = "root"; + group = "root"; + capabilities = "cap_net_raw,cap_net_admin+eip"; + source = "${cfg.package}/bin/nexttrace"; + }; + }; +} -- cgit 1.4.1 From 392c79dece5491dd62471da85df6adec1edcd29c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 03:12:20 +0000 Subject: terraform-providers.aviatrix: 3.0.1 → 3.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a9963b0f2eb3..ec798456aa78 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -101,11 +101,11 @@ "vendorHash": "sha256-0k1BYRQWp4iU9DRwPbluOg3S5VzL981PpFrgiQaYWNw=" }, "aviatrix": { - "hash": "sha256-jZXTsCa1TDwdOFGJKX4xM3sB0zfix5nTBuBdBGtwOOs=", + "hash": "sha256-vlDpubfBnNPFsU/kJl7GpSH4SKs1CDlgPVlPnCBb/lM=", "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix", "owner": "AviatrixSystems", "repo": "terraform-provider-aviatrix", - "rev": "v3.0.1", + "rev": "v3.0.2", "spdx": "MPL-2.0", "vendorHash": null }, -- cgit 1.4.1 From 35ebb2dc8341d34b01e5cf5092c29af180925391 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 03:12:47 +0000 Subject: terraform-providers.aiven: 4.0.0 → 4.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ec798456aa78..115f807d1aae 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -28,11 +28,11 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-ahqp63zzO4+TvdXk2e4r3r0VG7Cys3lhE+wkEkjN+vI=", + "hash": "sha256-InYRBUjOJ29dbnXTcz/ErPhEMyRdKn+YxHrAyBZNLdo=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.0.0", + "rev": "v4.1.0", "spdx": "MIT", "vendorHash": "sha256-VAYCx0DHG+J8zzYFP2UyZ+W6cOgi8G+PQktEBOWbjSk=" }, -- cgit 1.4.1 From 5f93b9774eb22fc13275d89a081a0acc14a82ca9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 03:14:42 +0000 Subject: terraform-providers.cloudfoundry: 0.50.4 → 0.50.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 115f807d1aae..f6988361e895 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -228,13 +228,13 @@ "vendorHash": "sha256-jIQcgGknigQFUkLjLoxUjq+Mqjb085v6Zqgd49Dxivo=" }, "cloudfoundry": { - "hash": "sha256-/Zxj9cous0SjYxeDo+8/u61pqDwMGt/UsS/OC1oSR2U=", + "hash": "sha256-Js/UBblHkCkfaBVOpYFGyrleOjpNE1mo+Sf3OpXLkfM=", "homepage": "https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry", "owner": "cloudfoundry-community", "repo": "terraform-provider-cloudfoundry", - "rev": "v0.50.4", + "rev": "v0.50.5", "spdx": "MPL-2.0", - "vendorHash": "sha256-mEWhLh4E3SI7xfmal1sJ5PdAYbYJrW/YFoBjTW9w4bA=" + "vendorHash": "sha256-2ulAzgDBdcYTqGRmEL9+h9MglZ9bt5WRXzNP099g2kk=" }, "cloudinit": { "hash": "sha256-fdtUKD8XC1Y72IzrsCfTZYVYZwLqY3gV2sajiw4Krzw=", -- cgit 1.4.1 From c242f5c89d42cef004ea0f8d155121b848b5b764 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 03:14:46 +0000 Subject: terraform-providers.cloudamqp: 1.23.0 → 1.24.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f6988361e895..8665b61f087b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -210,13 +210,13 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-xua8ZJjc+y6bzF/I2N752Cv22XAXvOjrH9Du1TdipM0=", + "hash": "sha256-gUOWUvdlmn+u6IL6UrzA8MKErl43VmtIqnilzUTKuis=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.23.0", + "rev": "v1.24.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-PALZGyGZ6Ggccl4V9gG+gsEdNipYG+DCaZkqF0W1IMQ=" + "vendorHash": "sha256-V5nI7B45VJb7j7AoPrKQknJbVW5C9oyDs9q2u8LXD+M=" }, "cloudflare": { "hash": "sha256-fHugf+nvel/bSyh+l94q0iE7E+ZYBt2qfGSoot9xI8w=", -- cgit 1.4.1 From 54c038d693d78fec48eb45ad34c6df14e5907f9c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 03:16:40 +0000 Subject: terraform-providers.datadog: 3.21.0 → 3.22.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8665b61f087b..d7723b5f9676 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -283,13 +283,13 @@ "vendorHash": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM=" }, "datadog": { - "hash": "sha256-gZdjbW2yz3TmnGfCLiveUpTcMeKBUUSV6CnugnkdoZ8=", + "hash": "sha256-7z7NjQ6JBZOCEn8ZiyrgiAlzbzWpzNEhveydBmh841E=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.21.0", + "rev": "v3.22.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-6aBwtm4p/sJyH9jT7wT+utHIlOSgOilOk0AZSI9RzD8=" + "vendorHash": "sha256-2cv7ffNuis91C2iUaYqq5uKx7wwpi2ohwU1q7wjurbA=" }, "dhall": { "hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=", -- cgit 1.4.1 From 59d19cf0a1e47595f4f38db20c00df5c7ef1db80 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 03:18:36 +0000 Subject: terraform-providers.okta: 3.42.0 → 3.43.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d7723b5f9676..2bf0022822e6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -820,13 +820,13 @@ "vendorHash": null }, "okta": { - "hash": "sha256-UMQ1YEXYdaLwYZBhGzbikhExW/HT/u4QSNk08vhmbwA=", + "hash": "sha256-3Ym2Q3Y2f26ioiB3N2HZiPsrgVe4zszJDR7e0gzxOHU=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v3.42.0", + "rev": "v3.43.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-KWSHVI51YHHF3HXpyd1WB5Za721ak+cFhwDIfvC/ax4=" + "vendorHash": "sha256-7jA44ZcBGCeLrr+On8F9er+ch2qf6vbijTRtu+aHrB4=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", -- cgit 1.4.1 From 75725216fd4480420f45ff0437ca408965e7ea93 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 03:18:40 +0000 Subject: terraform-providers.mongodbatlas: 1.8.0 → 1.8.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2bf0022822e6..207245103f2b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -738,13 +738,13 @@ "vendorHash": "sha256-MLhHRMahJjTgQBzYkSaVv6wFm6b+YgpkitBHuj5B6po=" }, "mongodbatlas": { - "hash": "sha256-OR9bvtg3DoJ4hFP/iqzQ1cFwWZYrUrzykN6sycd0Z6o=", + "hash": "sha256-HkY2X6EbgObgXH2jLhQ96edlxMHytSGfXETQ5oXPI6M=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.8.0", + "rev": "v1.8.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-cvTIFjKYrIohRjUTxGOxgla2t/elj3Aw79kbVdaQbrY=" + "vendorHash": "sha256-/DQsnKuRHO/SUyL+mCDP619iHLtWanqNyZkB2ryLSaA=" }, "namecheap": { "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=", -- cgit 1.4.1 From 2369bf3d444bfd84a8b31e28ca867618e81d0077 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 03:20:30 +0000 Subject: terraform-providers.scaleway: 2.12.0 → 2.12.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 207245103f2b..0056e3139ed8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -964,13 +964,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-rkDNV58mN/7pgQC1WBnrggHtq7q3O7r3v+huB4oPVLM=", + "hash": "sha256-gscuuaohIOIdDAAUWKg82fm9iY51ZxoN4EeAxAzTvjI=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.12.0", + "rev": "v2.12.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-zice1rGuZH9kmQJQ8RdIONJXVXu1BIuRUKjTGLPK7Ns=" + "vendorHash": "sha256-kh1wv7cuWCC1rP0WBQW95pFg53gZTakqGoMIDMDSmt0=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", -- cgit 1.4.1 From 1599fe767a9636c79b431420a20e0bf44f7e6787 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 03:22:45 +0000 Subject: terraform-providers.yandex: 0.85.0 → 0.86.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0056e3139ed8..8ac7cd692ee6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1254,13 +1254,13 @@ "vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ=" }, "yandex": { - "hash": "sha256-aBWcxC6mHM/3GOjnN/Qi0DNoZjehh5i3C2+XRZ2Igdo=", + "hash": "sha256-0P8R0L5PGrDKWGd92OkKi9WCfMK5IrdYJyoINaZWZjc=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "proxyVendor": true, "repo": "terraform-provider-yandex", - "rev": "v0.85.0", + "rev": "v0.86.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-eLCFnBGAvH0ZEzOb5xVCY0Yy4U5V407AhpGSFpa9t7I=" + "vendorHash": "sha256-r2+ARKvTghscGBhmZpz84vdBudiy2OsmQR03oDz5gbs=" } } -- cgit 1.4.1 From 76c0e3ef55c937f83bbe6ba6543d430d7e6412a9 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Tue, 7 Mar 2023 20:22:38 -0800 Subject: python310Packages.klein: don't test on multiple cores Tests time out otherwise. --- pkgs/development/python-modules/klein/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix index 0fda816533cf..641388fbdd57 100644 --- a/pkgs/development/python-modules/klein/default.nix +++ b/pkgs/development/python-modules/klein/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; checkPhase = '' - ${python.interpreter} -m twisted.trial -j $NIX_BUILD_CORES klein + ${python.interpreter} -m twisted.trial klein ''; pythonImportsCheck = [ -- cgit 1.4.1 From fb8251822c6236d95629cfc4800f5eea9ee9932b Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Sat, 4 Mar 2023 09:15:58 -0800 Subject: libadwaita: 1.2.2 -> 1.2.3 Diff: https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.2.2...1.2.3 Changelog: https://gitlab.gnome.org/GNOME/libadwaita/-/blob/1.2.3/NEWS --- pkgs/development/libraries/libadwaita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index d6917fe7f2da..75e70ff1dddc 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.2.2"; + version = "1.2.3"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-ftq7PLbTmhAAAhAYfrwicWn8t88+dG45G8q/vQa2cKw="; + hash = "sha256-m69TpXCs6QpVrN+6auig71ik+HvVprHi0OnlyDwTL7U="; }; depsBuildBuild = [ -- cgit 1.4.1