Merge master into staging-next

nixos/doc/manual/default.nix

@@ -166,7 +166,11 @@ let
         --manpage-urls ${manpageUrls} \
         --revision ${lib.escapeShellArg revision} \
         ./manual.md \
-        ./manual-combined.xml
+        ./manual-combined-pre.xml
+
+      ${pkgs.libxslt.bin}/bin/xsltproc \
+        -o manual-combined.xml ${./../../lib/make-options-doc/postprocess-option-descriptions.xsl} \
+        manual-combined-pre.xml
 
       ${linterFunctions}
 

nixos/tests/all-tests.nix

@@ -611,6 +611,7 @@ in {
   searx = handleTest ./searx.nix {};
   service-runner = handleTest ./service-runner.nix {};
   sfxr-qt = handleTest ./sfxr-qt.nix {};
+  sgtpuzzles = handleTest ./sgtpuzzles.nix {};
   shadow = handleTest ./shadow.nix {};
   shadowsocks = handleTest ./shadowsocks {};
   shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix {};

nixos/tests/sgtpuzzles.nix

@@ -0,0 +1,34 @@
+import ./make-test-python.nix ({ pkgs, ...} :
+{
+  name = "sgtpuzzles";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [ tomfitzhenry ];
+  };
+
+  nodes.machine = { ... }:
+
+  {
+    imports = [
+      ./common/x11.nix
+    ];
+
+    services.xserver.enable = true;
+    environment.systemPackages = with pkgs; [
+      sgtpuzzles
+    ];
+  };
+
+  enableOCR = true;
+
+  testScript = { nodes, ... }:
+  ''
+    start_all()
+    machine.wait_for_x()
+
+    machine.execute("mines >&2 &")
+
+    machine.wait_for_window("Mines")
+    machine.wait_for_text("Marked")
+    machine.screenshot("mines")
+  '';
+})

pkgs/applications/audio/sonic-visualiser/default.nix

@@ -5,19 +5,19 @@
 , libsndfile, pkg-config, libpulseaudio, qtbase, qtsvg, redland
 , rubberband, serd, sord, vamp-plugin-sdk, fftwFloat
 , capnproto, liboggz, libfishsound, libid3tag, opusfile
-, wrapQtAppsHook
+, wrapQtAppsHook, meson, ninja, cmake
 }:
 
 stdenv.mkDerivation rec {
   pname = "sonic-visualiser";
-  version = "4.2";
+  version = "4.5.1";
 
   src = fetchurl {
-    url = "https://code.soundsoftware.ac.uk/attachments/download/2755/${pname}-${version}.tar.gz";
+    url = "https://code.soundsoftware.ac.uk/attachments/download/2841/${pname}-${version}.tar.gz";
-    sha256 = "1wsvranhvdl21ksbinbgb55qvs3g2d4i57ssj1vx2aln6m01ms9q";
+    sha256 = "1sgg4m3035a03ldipgysz7zqfa9pqaqa4j024gyvvcwh4ml8iasr";
   };
 
-  nativeBuildInputs = [ pkg-config wrapQtAppsHook ];
+  nativeBuildInputs = [ meson ninja cmake pkg-config wrapQtAppsHook ];
   buildInputs =
     [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 lrdf rubberband
       libsamplerate vamp-plugin-sdk alsa-lib librdf_raptor librdf_rasqal redland
@@ -37,11 +37,6 @@ stdenv.mkDerivation rec {
       opusfile
     ];
 
-  # comment out the tests
-  preConfigure = ''
-    sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-visualiser.pro
-  '';
-
   enableParallelBuilding = true;
 
   meta = with lib; {

pkgs/applications/editors/neovim/utils.nix

@@ -107,6 +107,7 @@ let
           # vim accepts a limited number of commands so we join them all
           flags = [
             "--cmd" (lib.intersperse "|" hostProviderViml)
+          ] ++ lib.optionals (myVimPackage.start != [] || myVimPackage.opt != []) [
             "--cmd" "set packpath^=${vimUtils.packDir packDirArgs}"
             "--cmd" "set rtp^=${vimUtils.packDir packDirArgs}"
           ];

pkgs/applications/office/timeline/default.nix

@@ -9,6 +9,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "timeline";
   version = "2.6.0";
+  format = "other";
 
   src = fetchurl {
     url = "mirror://sourceforge/thetimelineproj/${pname}-${version}.zip";
@@ -18,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
   nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ];
 
   pythonPath = with python3.pkgs; [
-    wxPython_4_0
+    wxPython_4_2
     humblewx
     icalendar
     markdown

pkgs/applications/science/biology/trf/default.nix

@@ -0,0 +1,21 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "trf";
+  version = "4.09.1";
+
+  src = fetchFromGitHub {
+    owner = "Benson-Genomics-Lab";
+    repo = "trf";
+    rev = "v${version}";
+    sha256 = "sha256-73LypVqBdlRdDCblf9JNZQmS5Za8xpId4ha5GjTJHDo=";
+  };
+
+  meta = with lib; {
+    description = "Tandem Repeats Finder: a program to analyze DNA sequences";
+    homepage = "https://tandem.bu.edu/trf/trf.html";
+    license = licenses.agpl3Plus;
+    maintainers = with maintainers; [ natsukium ];
+    platforms = platforms.unix;
+  };
+}

pkgs/applications/science/robotics/mavproxy/default.nix

@@ -1,5 +1,5 @@
 { stdenv, lib, buildPythonApplication, fetchPypi, lxml, matplotlib, numpy
-, opencv4, pymavlink, pyserial, setuptools, wxPython_4_0, billiard
+, opencv4, pymavlink, pyserial, setuptools, wxPython_4_2, billiard
 , gnureadline }:
 
 buildPythonApplication rec {
@@ -24,7 +24,7 @@ buildPythonApplication rec {
     pymavlink
     pyserial
     setuptools
-    wxPython_4_0
+    wxPython_4_2
   ] ++ lib.optionals stdenv.isDarwin [ billiard gnureadline ];
 
   # No tests

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 = "21.0.0";
+  version = "21.1.0";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";

pkgs/data/fonts/iosevka/variants.nix

@@ -1,95 +1,95 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  iosevka = "120a4b0ywmiwi2rl2kwbv38ws1sazjxx153z3jnxhb94k2bwd97w";
+  iosevka = "0kw1jynkl3dfvs8pm54sr1rlg1zd0g57jqnnfnlm1jrpwh28b1ba";
-  iosevka-aile = "1561vshhkwina9vfj1a8081xxx4sx43khwmfnkp2vscfnbd5mmm1";
+  iosevka-aile = "1jsp3nhkf9a5vgnxq57p7fqqj352r7kvqvdmzvw8y3snppxk3czf";
-  iosevka-curly = "05n9n0x8scn0v1d4gyg61q5ga22bpsz1dhvpci2xp8xya9n8sj9m";
+  iosevka-curly = "1bdwgadvwksyrq5m209jliwr3ywfkn090j5q07hm9zzpygnwgw8m";
-  iosevka-curly-slab = "12qm0vpycpgqw3p0akl7mgj7rhy3mk1j6dwy2k5xv8h77mxbx7x5";
+  iosevka-curly-slab = "059yv1b1h8ksglaly20mf5jyhsbfi3y2lvr8jhg5fhmcp6mginqj";
-  iosevka-etoile = "06x9q985vic0zqsrmj9664czlw7ka6x4av5sz3jq74xm0pw8ss8a";
+  iosevka-etoile = "11l29xc4s9yb56f6n2q7hh6bvzq9pjfc3j9zpd15y11cm382a70s";
-  iosevka-slab = "14d94zd20v9yiwkrkp5kh99i8dzw947a0lvnzcc568xlfadyjmkv";
+  iosevka-slab = "1vzansf0a8zfif7i2g5znwgdzkcjj16qga19y1386fci0z1vm9ib";
-  iosevka-ss01 = "04xll8a7c1v36w2zrjvc1h24kxrhv3fq89p70niyi75rsrcfh7gq";
+  iosevka-ss01 = "0179zprfy8l27jyk4hjb0da2z5qq4pgkvnbmnxvlrf5mqbrmph6v";
-  iosevka-ss02 = "0wfwzcybp1bh1ka7ky099yy58bg8z4bk0ih1xv63l9rcsyr01jki";
+  iosevka-ss02 = "0kmfyp3hgacgdrbh6rkyig9m95j33nxx1xlmcsi7rq7i6rxj9ixs";
-  iosevka-ss03 = "1k8qn7hwzn15md92fhc2j2kbfbi19l8apah80vrc6mrix0kik2m3";
+  iosevka-ss03 = "0irlr2r1lnlb56zmq3blq84r5sy4gsmr50chw5g6b01ygx6263hk";
-  iosevka-ss04 = "0vcv4l26vbi7sagsf7kicpkif9kz05hm9xfhdqim1mglb3m1ixpb";
+  iosevka-ss04 = "0dyw52i73msayy76w77r79pgali1rjas8zgpfq2l2q9z2d7m945i";
-  iosevka-ss05 = "128c89afpvy58kn3cca7iwwq451ihv1f0x0485sm9r0hbm0ql007";
+  iosevka-ss05 = "0ynm24xdhsl9jkdhjadc7ks4rrrl8ri2fj1vndw7ymrp95mh8kia";
-  iosevka-ss06 = "1qsjzza08bvhvgfhcwki7ikayj0di78slm659xhwzj05lh83pzvz";
+  iosevka-ss06 = "1md6zgvj30fw6hbsx6vx5n56lxavlr5wzsmyw0a4y37lb9q5ch61";
-  iosevka-ss07 = "0jrkfri5basrlp1q8hy1sadj2j7p76nbj8madw8xq29l60nwkr47";
+  iosevka-ss07 = "09qyxicbq7kalxxll5mcs5vgd9g80lxzw8zin6yrclm5hghz9x8x";
-  iosevka-ss08 = "18jka9jnckszb0s9r681bmvd9nxxcajz46wpf0hmxfbnrwzwdqh5";
+  iosevka-ss08 = "14mvfpc17n5lzn3amp3s27c3r513jlbffcw084wsppjbvaqyv063";
-  iosevka-ss09 = "1131i5vxbd6wwvwidm2xqsgp1mrpnvkmcqzyws88izgya7fywhfj";
+  iosevka-ss09 = "1h06sp9s6dqn0inki37h3qv350a6jaf82xjad8wlx3kbgbs5vr7d";
-  iosevka-ss10 = "0rsxkhidna7w4r5x6d8gjv7f137f123iswj1i9bbr8grd62x3lii";
+  iosevka-ss10 = "0j0ryw12c21z7qijplws7fhhvd3p0xvfvx17b38i9yf1m3i9lswv";
-  iosevka-ss11 = "1fzm8g72r2chaq10a3jmnv59j8cbkms107i056yxly8jgc79ajxx";
+  iosevka-ss11 = "0kknvqqxhp9qdjg172s75j8mhm49204528xsylabifpf9225qxm7";
-  iosevka-ss12 = "0c8cxqyni0vg1ywfcm2hdn4djjbfz2g7cj7ikr68v8v4prpc6pkv";
+  iosevka-ss12 = "1skvr7vp9p0ndbic5l2j3zp5rq1mnfjv91s15msi96pqdsg3acr4";
-  iosevka-ss13 = "18a88v8g3hlq0g26pcz9xj072dki3whb6ls4jqzsdmvs5lrs1msg";
+  iosevka-ss13 = "185b0zyg0gz3560fpr7crzan3jdymvhap2hw789yzygswl6mqz8b";
-  iosevka-ss14 = "11h75i727q3g3s1332nl507bllbddrqgh3vvyhfzny5ryq2z2826";
+  iosevka-ss14 = "1sdzi8ncm6mypqza7yl2c3f25jf9596d8a0z6d6ppad9x00jrx32";
-  iosevka-ss15 = "15isyshl0wjdp6h4cp0birhff2ma53ss3sh5xwpj8jp3ndyjlk37";
+  iosevka-ss15 = "1jkjcag0zx5rnh2hv847q6fvh0v2vypc6l981kkrql3qbqd4lk9q";
-  iosevka-ss16 = "00jjwqk2n6ig06v1h7w7j19f14y3l58ckaci2x3fnsj810vqhpmg";
+  iosevka-ss16 = "1dbkc950lw5iv3rh0x1zxlr52iwsvvxpr1cilr54hqiq8qjv6rc9";
-  iosevka-ss17 = "1jk0840q7lgw1jn115jsdxkw133g3c7yp7jqffvl760p1447b328";
+  iosevka-ss17 = "0iyfis5mfmf7s1k45a8pbmdz5wj2q444vgqj1a4ndk0r1aphvrnp";
-  iosevka-ss18 = "0jk6vm4clxcq9f60wa49vhyvxsk66plbawcj57cyj6nb4ihigmdx";
+  iosevka-ss18 = "0jdi9vgq07sf9s1fs1syd6acj37s1cymrm0i9id2g2yjnr1vm947";
-  sgr-iosevka = "14gkjca8mmkp0j02k5i2x8rs8nz9nj81s1w4qczn4a9dnzj0si63";
+  sgr-iosevka = "0cihnnf51a3kwjmpd7iblwjanj0x9w69l7yx2isn3fs9y7r6dzbm";
-  sgr-iosevka-aile = "102wd1bpy1bfsijn607r5qhpjnxs4hlp5hfzvy1s37jmvm632sd0";
+  sgr-iosevka-aile = "0bgcbm900j20yh6jkmqx1aji87410j2nfz84p96rdzcq8zyicf6i";
-  sgr-iosevka-curly = "0qcbj4ccvbf6dj7z76hzmynv5p6dsm6zd43qd4vxcdb06g8gg3g0";
+  sgr-iosevka-curly = "0hf8hbn61pb5b9p0dnx5vzhx0ivb8x8x9abf91dlr5n20qs8gyzg";
-  sgr-iosevka-curly-slab = "0s9mkfn5j035iy0yjr3j9fd3064km5l8614r9js55zcbw00lq2xk";
+  sgr-iosevka-curly-slab = "0kc19qapsqq9l6g59k3kjbz4x6c4fl3xyg6wirp5p2nfiyhb8ww1";
-  sgr-iosevka-etoile = "0qg874iq1acadwjnqzks2kb8ywx1wpri96w9jl4z8r7wwwj1g91p";
+  sgr-iosevka-etoile = "1w9znis6f59x2l0i2x94qmvawxx3jzwz4d06b4sw066329fazbbx";
-  sgr-iosevka-fixed = "1hp3bjnp6qbb0pv32d37cg3l69f1jnyd58wjvwxyh0jr02pazska";
+  sgr-iosevka-fixed = "0xymjy1i2472p741iv5gr6366s6g9llmvkdkpx579dyk3shpabnl";
-  sgr-iosevka-fixed-curly = "0idfwlnrk4wdz5k994s94y51gza56nfdl0y23lv6iyj2zahqz5jc";
+  sgr-iosevka-fixed-curly = "14sgb2j66hv64nslhy5cq0zdv0yr4x3175w8dkyzvhagvlx3ra5h";
-  sgr-iosevka-fixed-curly-slab = "1k13vc81s32yh180h9cjqclg4dsy9dhjxdw9zi5zmm6vgf08120z";
+  sgr-iosevka-fixed-curly-slab = "096b9jykaf2l9mqyji462ga4hy8s25qb5j0c000lsja8674f1mip";
-  sgr-iosevka-fixed-slab = "01cfk6jsahjg78840gci3fb02475jrk9lvz0llpfkpzyckbjdch3";
+  sgr-iosevka-fixed-slab = "12cim6i3wydx6adzvcdg8knfajjzxvgxq021m65k7icw5yi47rpk";
-  sgr-iosevka-fixed-ss01 = "1bd4069myw7bgpldy82fkz2p65i02smhnbns0n5gw0k8d7q22b07";
+  sgr-iosevka-fixed-ss01 = "1gjl7swgg5vkrzq7fsr80bpnw68a0gsq2dhm3mfcjv24rqdhprxf";
-  sgr-iosevka-fixed-ss02 = "0svvrf0wdq2s96gk53n4r5cpgb7zsj0z7d41wdjj208h0pdlpdd3";
+  sgr-iosevka-fixed-ss02 = "1cih7cp5lp1456d4q7nk6zk0yk6iybhrhixx926yc04vjl3iaali";
-  sgr-iosevka-fixed-ss03 = "0kwix24d5xw7g5wjvim8f51wp747k64w1r1ycf0375lakyz3h1dv";
+  sgr-iosevka-fixed-ss03 = "02i8wipf12dxkkh92g2yqdh3cy6nvcl77q67pzl5746zgy48h987";
-  sgr-iosevka-fixed-ss04 = "173rxlnvj7cakfll01dz9a3c7mv3jp4w5yfkyw6x3ydbhsnh8wgs";
+  sgr-iosevka-fixed-ss04 = "01cl31s26lzfdrf5k8r4rgbwp69gczg0m107psda903x95hiyd6a";
-  sgr-iosevka-fixed-ss05 = "0r6mgz4hbca39izxbdsr56v1f9v700qdmr1qid36kd6nqd22lwrm";
+  sgr-iosevka-fixed-ss05 = "10cd8hvjzflkcv929radp9hj08hdr1a6da01fvr3gg59m1jg7hkp";
-  sgr-iosevka-fixed-ss06 = "0mda1y26w76ha1bpy53ch93p21z4ccz62g0dcqjwsalimq6nnfj4";
+  sgr-iosevka-fixed-ss06 = "01mpq5qsiws9ag4izq34mj15cilxkp529in29v2zc0vsi68a3n1s";
-  sgr-iosevka-fixed-ss07 = "1xz24srcdw03xifvh6bfrx89n2xra3bl2zyyfalpwcnw0r2ck1kh";
+  sgr-iosevka-fixed-ss07 = "00wd0valk2jhw82hlv9zdcdp97ysc361bm665rsncplnd97nx2jj";
-  sgr-iosevka-fixed-ss08 = "0rxfp13pjypb2alhh56mymbzss307lgjljcci4fmbpd3bfdndnp7";
+  sgr-iosevka-fixed-ss08 = "0ihgx6arv585k8p1rk5byhqm2f6ypbq26rnzihm2r11lg8hxyvqj";
-  sgr-iosevka-fixed-ss09 = "1s1xgmr68gblmyn5zkj5w8rl99rvv23ykyyh2w6bk5vp4zra75rx";
+  sgr-iosevka-fixed-ss09 = "05zl4wz61sfjfa68zpjbvq7awibkxfkdnpimf5mikivhb13rmjjn";
-  sgr-iosevka-fixed-ss10 = "0jr9jd7x6kfiil61dz1gldnyj8v0gc5fvfhvpgsbk8a9q3w4qqz4";
+  sgr-iosevka-fixed-ss10 = "0k8p1ld2i9xiagahxhfabb7fhr9sq7cv7dpcyrja20hmwnm28qrl";
-  sgr-iosevka-fixed-ss11 = "1bbwgwrqcyqc3ghcpmprprpp5y4kp6wa07dw97qmi52v86mdghp3";
+  sgr-iosevka-fixed-ss11 = "159zaybnlrxd4q5iwhq7dsp09skvh13g734zk2l89xwsk5h2w4ns";
-  sgr-iosevka-fixed-ss12 = "1l12hvf02f29656k7pnwsbij9avp99jgzrqy1i1zz50cg2qk8jsa";
+  sgr-iosevka-fixed-ss12 = "0d2hzhlpl6rb9nqyygifbd09ylfvj4a9wlpmzpibbx06mrqcinri";
-  sgr-iosevka-fixed-ss13 = "1ynbi1wd9nbx2drd6dwlmr1g0753bwx6cxf3ldddcz6hhvi1glgz";
+  sgr-iosevka-fixed-ss13 = "0p99i58cwj39h1r2qhdrs3fasr75nw50m47iqjijn9mvgd01k82z";
-  sgr-iosevka-fixed-ss14 = "008anx3skj8yfxpjpfcp76b4isn8sx0bykqxhc14wp9jfdg603n5";
+  sgr-iosevka-fixed-ss14 = "1m2s9wclk6xjxf4kjw0w0nffzx41s16www2nhm1v0lx1ikyj5pvl";
-  sgr-iosevka-fixed-ss15 = "0gpmsp70xbc88gl39jqbzli1vpab2776lziyk41zjy09y1sg34sd";
+  sgr-iosevka-fixed-ss15 = "04ykxwxibl1k3zxr9swywrg9v78hbf8vm4cbgscv78nm88srwykw";
-  sgr-iosevka-fixed-ss16 = "0xc4nbdgfkixxw8wj3gyxwrca82605nwwmfz1kq513xjyr3ggj05";
+  sgr-iosevka-fixed-ss16 = "1kzj8b3356mh0ls2w5mv5hbqv3fwxk3izlw7xxd8q65cvrfs3gzq";
-  sgr-iosevka-fixed-ss17 = "17fc32zr89kfb3gfpj6s8rk6p3nzri0qcyq0b5dwgi0wl9kc89x6";
+  sgr-iosevka-fixed-ss17 = "1hnbni2f3lhr15j3y80rwihwjc4vvvnidjswan3ahwhh2qc8krlf";
-  sgr-iosevka-fixed-ss18 = "1yfjkjyyvxpr546sgc960qqf7j6q36aj79p004279c4anxj8m585";
+  sgr-iosevka-fixed-ss18 = "1cd5lhpkjcqlv0cr7nzh24xlc9912pnjfcppkcvmg7p0slg0zlkn";
-  sgr-iosevka-slab = "0l1ws8ig2kv7rixss3yd5294wiwa8gd6mqpcsmmm37zh107m7lqk";
+  sgr-iosevka-slab = "1zpmn157j5jpc9xmjqv0jga1hh8bc4b86f1xq651633ckf6ly6cq";
-  sgr-iosevka-ss01 = "1241smh42xifvz4asyjk9q497v8jy7jiq8sak3sp1xi60r3vdlp7";
+  sgr-iosevka-ss01 = "0nacmqlh8rzkzhlzrsnpgrsznr8grd9kyxz77sfxyvn4d2i6lnwy";
-  sgr-iosevka-ss02 = "0rlhzclwzcdjl00kj4hhvrvjyw423a9cxih02hs0p3mg5ak7blkz";
+  sgr-iosevka-ss02 = "07hpwpbxj8z0zzya0zs1c5i4yssjmgv05w7q1xr64zsjffpd7m9k";
-  sgr-iosevka-ss03 = "1bva2jp4g5a3rf492c1giy7lbbxgp0vbjgs518r0bdwgmnw133ms";
+  sgr-iosevka-ss03 = "19pcnyspbyq0bc33l9jsnmc808d9q20aglxnwv2jx97rwg2sv2mh";
-  sgr-iosevka-ss04 = "07470abd2mg4ws5g18755zw1graf09jcbp16b4n7887mksib0m5j";
+  sgr-iosevka-ss04 = "0wg8hi2465agxvx3yyflff5mbwfgvgayx2zvvjwakiy4sq0ymib6";
-  sgr-iosevka-ss05 = "0s8r4c46r4qdly566zx1nhavsipbbr68dwqs8yfi4qxxlywjqi23";
+  sgr-iosevka-ss05 = "1lr9brpkhb28ziw56idyk2k5vx5bw4zwbg6d1p4iwrirmwrxrjgi";
-  sgr-iosevka-ss06 = "1h490zwghdfgjp1ijmb5wl5r91byz3xg07jlyp6hdfx75csxqpzb";
+  sgr-iosevka-ss06 = "1bwgmsdirfhqnri6lnrmwjiwm4xy0qscbkx3j6rx68j9x4fk4991";
-  sgr-iosevka-ss07 = "170633416ci2rkbqr60f528zz2id6xk46x5s301jlf9ywafcnzmx";
+  sgr-iosevka-ss07 = "00p8slkgzivkikc9nxlhsda50vxm7bdj1gh95p7kvmnkxksckx7f";
-  sgr-iosevka-ss08 = "034cafgcm3iklnf6rjwdhvscgh9bf3p5l55zg4jmrcjvvazj35f5";
+  sgr-iosevka-ss08 = "0yas5iq36dckl0zzgkz8qbqz4zlzapg4cgq89676n64wmhxpifci";
-  sgr-iosevka-ss09 = "0h9dv2awr9vrxinncizpjz044mxx6v4cfr24fpalbazr67q123la";
+  sgr-iosevka-ss09 = "1ds6gkm9rpxwg5vafm0vaadv6ww9hrh51q30n1f7vblk3mvj6wz4";
-  sgr-iosevka-ss10 = "0ixbhqrglkbdid4xcfbwgxvd9pzq31b1307926pjiwsh0fwsfnjj";
+  sgr-iosevka-ss10 = "01qldfwld13n1j340a3kl4b9ixd0y4kjws9ym4cp8l84p4ylk9h5";
-  sgr-iosevka-ss11 = "1jap6jk1zr2910p8i6x7k996zfpd196y577lmq0xpc3cr2zzz9sz";
+  sgr-iosevka-ss11 = "0z57jq0l5f7nqi04i9hr22hxwx350pkkhcis7lzh799gc9av2rp5";
-  sgr-iosevka-ss12 = "1bh3g7grvf9rk8vyiprryj7kf1jr5qbf1v14zwlidmjr56s144fj";
+  sgr-iosevka-ss12 = "1zvns2g30918hcgwbhswp2645mqkkq3b07i8z6w7vg61y1zylgqp";
-  sgr-iosevka-ss13 = "0v55a62a4ffia7ai8b7gh70mf67ndwzcknrsv6p427jfyc9vx4pp";
+  sgr-iosevka-ss13 = "1gydqrscy94v6iidhz7vak5xr5aln5127b3f3m1bb3x6gz5154wz";
-  sgr-iosevka-ss14 = "086bim6dvjx7v7q9qy4c9jwgfc6bjgxml8mal6drjhg3bfrk2l0b";
+  sgr-iosevka-ss14 = "1g91lbmkw1r7prs7wbfdqhkrixil71zgnsd2zrr9v68g75r3gwyl";
-  sgr-iosevka-ss15 = "1llxs2xszcivy4y0x32177vgi7qq412mk8g26npxlxgqjlid5qdf";
+  sgr-iosevka-ss15 = "0zpb2jk7r6kfmjgirkyxcilxw92hya8v10xd7ad28cvr9p4jngwj";
-  sgr-iosevka-ss16 = "07dh2hkdf4bfhywlclmpph7f0sbz3hhpgczm51xrqxnda3rdn7cr";
+  sgr-iosevka-ss16 = "056rnnnzqc5wwfk92wik8sndyj7mlwmzvz0vd4imx5pa0x7cgznk";
-  sgr-iosevka-ss17 = "11468pqx6qhma6cdm7bhr44kamh6n890pq2fla9bxf4dvv1jk4xb";
+  sgr-iosevka-ss17 = "0qg7rm664anvsjbnrh3r039md3a68b5pxvgkpq9ls9mard4jd2zr";
-  sgr-iosevka-ss18 = "0bmbrwwxsyi3ad1b2f95y09kmn2a32da936p77rwbzki81351qqy";
+  sgr-iosevka-ss18 = "19hgnj7afpsy2n8ydqrkyl97s10893qxyaqg898xs2552prazcx5";
-  sgr-iosevka-term = "19hc7hygnizk4i9dv3y276fangrz759wnvj1vzvzfid4s7drjipj";
+  sgr-iosevka-term = "0qd1dx0q4x8km3222g9znimvzw9nzhhj4g3d4n2dq3hir0biwvkw";
-  sgr-iosevka-term-curly = "09ialv6dvh3cdk74b3lwm330ra2d8j1hx0by19xx7i1j3njiqxk3";
+  sgr-iosevka-term-curly = "111lriaizsg80c4qljxsflm7p9la68kkh7ssqykkjs91a6qfsfs0";
-  sgr-iosevka-term-curly-slab = "0rgarx80vfrfyyqd341s8ddvqji1gwqhg4wcxl7z77rmdqfj1mw8";
+  sgr-iosevka-term-curly-slab = "08qbpwzzmnql92vwisb4bmsa9ajnffa50qy4kan34qpanrkgnps7";
-  sgr-iosevka-term-slab = "05sdmkqbgr9pix9na6ac7xqw1q6nbbjq0kyqkar7cbsal82b1jbx";
+  sgr-iosevka-term-slab = "1gkfvp97vv3p2llxzk1zpvfr5lm0npg56gac083wy8jds837wzl9";
-  sgr-iosevka-term-ss01 = "1wgapryk0659s7dxaasfyyl4vhbq5sg5nvkczqd016fzi23syr78";
+  sgr-iosevka-term-ss01 = "123r80pciasa1gvyri4gn7706zf0f7shv5w0jyn88cgpklrbpjgx";
-  sgr-iosevka-term-ss02 = "0gcgvpw5d8s9wpd0yh574s5ww3lh6wf2xp1sf4bfs1n3d7ym7gdi";
+  sgr-iosevka-term-ss02 = "0l4fzq1g93bmv24r7r9fjkkyzyyp8sgzq7501ayrzdc9yxj3hcs4";
-  sgr-iosevka-term-ss03 = "00qfvwj4p2ld14i4v6qjjcs6k4vr5c97jiq1wx8yxd3hm462n0h6";
+  sgr-iosevka-term-ss03 = "1jq9xm7qfx3jf603njfm9y1dbhj3dv2gbsyx1plch8q5x2kfpn49";
-  sgr-iosevka-term-ss04 = "1jxnvsadf17k1shr84329knkys3675lv8ls8m1xld7r39fh1ysqr";
+  sgr-iosevka-term-ss04 = "07mv1pxy0smk7p549iz7jn030h3f6c2k5km62v54xhd47zmkmcqz";
-  sgr-iosevka-term-ss05 = "0alpg5qf61bf5dg84jkvl96llsfiyn3viz1yzlz6rzzp0f83khlr";
+  sgr-iosevka-term-ss05 = "1n0szq4h32qbmrsyn942gn2w3rwbv2wa9l3nrrpdqn6bn33dhisl";
-  sgr-iosevka-term-ss06 = "1hsh3bl465v1xsz4aihc87q4aff4k1p934sh5yr4nkfjfk1hgw1f";
+  sgr-iosevka-term-ss06 = "1rhhk2cbmd3yr6pry8v1hl1kw84dgv84mbs9qi4lvfjfj5pknai9";
-  sgr-iosevka-term-ss07 = "0707bcxcy2j3bx5jgcf2rvz3f8iy2vqc1m4l3mm5k0xkfx4yx3nw";
+  sgr-iosevka-term-ss07 = "1fnhld17m9ggfvjajm3cygx9n07w0bazdxz5jv6d2whczhbqgiqs";
-  sgr-iosevka-term-ss08 = "1lmw903nb6anzpigsc6d1vcxb1xrw9s6ylxsdka05vd18rlhg93x";
+  sgr-iosevka-term-ss08 = "0w4fmznj9i7qg2ygzcnia1l0wg5sm85vqlij22g55ycw87fxi1l2";
-  sgr-iosevka-term-ss09 = "09pyywsigqaaa1gz3480nvvpcc4lgdcrrxg06kad5ai216mh7r3j";
+  sgr-iosevka-term-ss09 = "19z86rbdmszd5qzxlfsacdvg4dmcsm6fl17yna8sgkxhh562x7kj";
-  sgr-iosevka-term-ss10 = "1h523adv39z29lh5d5l5n58b68gz8w7cq5x33ncpdvlz5wqhnwja";
+  sgr-iosevka-term-ss10 = "19mhyqqbs7jfnlpx5dl5p7gp2i0kslmb9wzvkm4i3fs7cy06hzc7";
-  sgr-iosevka-term-ss11 = "09sz03cdgba5j2gjq45ll3f9z3xghy1xvdcm6ki1px1wgs43298j";
+  sgr-iosevka-term-ss11 = "1kg67yhc3adw0ahm940bsabnsr46k0z8m2d8q7jmml1w45llfxsf";
-  sgr-iosevka-term-ss12 = "1q1gl5l42bgxxkn839ilfzqw5nxfjq4d9rf84k084dn9a0293840";
+  sgr-iosevka-term-ss12 = "1jc8d0hm0hh7p6wixr37qg36nb3jr5vfkwwc9qfvjv3snq38z139";
-  sgr-iosevka-term-ss13 = "12qvrjr1lilfgnzdciy485iqalcxwkrd4ckxgbaq15sfc7bicz6b";
+  sgr-iosevka-term-ss13 = "1ksyzlafcph69a2mqajdavd2r5f88dfq3hbglwm3b14ijifgzj92";
-  sgr-iosevka-term-ss14 = "0172qzqxqs2fisg847nnda94nyairiz6wikgkil3rrwdscdvcvi8";
+  sgr-iosevka-term-ss14 = "11ay1smy18qbn3qh6nbxyr58ldzc7x7aib51hvbnjrgx666f4lhp";
-  sgr-iosevka-term-ss15 = "1kww6qsln0y0l8i31hfss2h1b4pjpmspvplpb9j7lbv5fyhyyqdn";
+  sgr-iosevka-term-ss15 = "0dnspjglxshn9qrc5ib5ygma03djj2n3kvkqss6sxl7lp27b9nz0";
-  sgr-iosevka-term-ss16 = "0vwaal8y4jry3syzlm1dvprr8r7hapddak59jh7vi3hcggfwavi4";
+  sgr-iosevka-term-ss16 = "17hvq2x0zmpr93dym2i1izy3nnkplpszwjlwq35r07k7nikcs4ir";
-  sgr-iosevka-term-ss17 = "0v1w58bi7hcj8i3b2k1w6y6j5wjjadvclpk2r7k6qi3g7jvs0zj0";
+  sgr-iosevka-term-ss17 = "1jdk38a1q0s4my3n7kjrpas010j85yxxy1qylz48h0makw4vfmfy";
-  sgr-iosevka-term-ss18 = "1jddxa01qp95dkhli7ckv3nafanfywlslw21w3pmcdgyss3z4z7h";
+  sgr-iosevka-term-ss18 = "1n57dzf7ks5plk6zprk8yyjvsj87l6jfkhsh4xmmzvwk78rkn4w4";
 }

pkgs/data/themes/jade1/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "theme-jade1";
-  version = "1.14";
+  version = "1.15";
 
   src = fetchurl {
     url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz";
-    sha256 = "01p1g0gy6d1c8aa9y7inhn6zhm0qy0fzmwlniiv07h15g32appvd";
+    sha256 = "sha256-VfV3dVpA3P0ChRjpxuh6C9loxr5t3s1xK0BP3DOCeQ4=";
   };
 
   sourceRoot = ".";

pkgs/development/embedded/arduino/arduino-cli/default.nix

@@ -4,13 +4,13 @@ let
 
   pkg = buildGoModule rec {
     pname = "arduino-cli";
-    version = "0.29.0";
+    version = "0.31.0";
 
     src = fetchFromGitHub {
       owner = "arduino";
       repo = pname;
       rev = version;
-      sha256 = "sha256-jew4KLpOOXE9N/h4qFqof8y26DQrvm78E/ARbbwocD4=";
+      hash = "sha256-y51/5Gu6nTaL+XLP7hLk/gaksIdRahecl5q5jYBWATE=";
     };
 
     nativeBuildInputs = [
@@ -19,7 +19,7 @@ let
 
     subPackages = [ "." ];
 
-    vendorSha256 = "sha256-BunonnjzGnpcmGJXxEQXvjJLGvdSXUOK9zAhXoAemHY=";
+    vendorSha256 = "sha256-JuuGJuSax2tfuQHH/Hqk1JpQE2OboYJKJjzPjIZ1UD8=";
 
     doCheck = false;
 

pkgs/development/libraries/gdal/default.nix

@@ -61,13 +61,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gdal";
-  version = "3.6.2";
+  version = "3.6.3";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "gdal";
     rev = "v${version}";
-    hash = "sha256-fdj/o+dm7V8QLrjnaQobaFX80+penn+ohx/yNmUryRA=";
+    hash = "sha256-Rg/dvSkq1Hn8NgZEE0ID92Vihyw7MA78OBnON8Riy38=";
   };
 
   nativeBuildInputs = [

pkgs/development/libraries/hipfort/default.nix

@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hipfort";
-  version = "5.4.2";
+  version = "5.4.3";
 
   src = fetchFromGitHub {
     owner = "ROCmSoftwarePlatform";

pkgs/development/libraries/libvirt/default.nix

@@ -22,6 +22,7 @@
 , makeWrapper
 , meson
 , ninja
+, openssh
 , perl
 , perlPackages
 , polkit
@@ -91,6 +92,7 @@ let
     lvm2
     numactl
     numad
+    openssh
     pmutils
     systemd
   ] ++ lib.optionals enableIscsi [

pkgs/development/libraries/proj/default.nix

@@ -17,22 +17,18 @@
 
 stdenv.mkDerivation (finalAttrs: rec {
   pname = "proj";
-  version = "9.1.1";
+  version = "9.2.0";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "PROJ";
     rev = version;
-    hash = "sha256-yw7eSm64qFFt9egJWKVyVo0e7xQRSmfUY7pk6Cwvwdk=";
+    hash = "sha256-NC5H7ufIXit+PVDwNDhz5cv44fduTytsdmNOWyqDDYQ=";
   };
 
   patches = [
     # https://github.com/OSGeo/PROJ/pull/3252
-    (fetchpatch {
+    ./only-add-curl-for-static-builds.patch
-      name = "only-add-find_dependencyCURL-for-static-builds.patch";
-      url = "https://github.com/OSGeo/PROJ/commit/11f4597bbb7069bd5d4391597808703bd96df849.patch";
-      hash = "sha256-4w5Cu2m5VJZr6E2dUVRyWJdED2TyS8cI8G20EwfQ4u0=";
-    })
   ];
 
   outputs = [ "out" "dev" ];
@@ -68,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   };
 
   meta = with lib; {
+    changelog = "https://github.com/OSGeo/PROJ/blob/${src.rev}/docs/source/news.rst";
     description = "Cartographic Projections Library";
     homepage = "https://proj.org/";
     license = licenses.mit;

pkgs/development/libraries/proj/only-add-curl-for-static-builds.patch

@@ -0,0 +1,55 @@
+From 831063f8206cab1ad3e90b204a1c3f8c87c3d5cc Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Tue, 5 Jul 2022 19:40:53 +0200
+Subject: [PATCH] proj-config.cmake generation: only add find_dependency(CURL)
+ for static builds
+
+---
+ cmake/project-config.cmake.in | 30 +++++++++++++++++-------------
+ 1 file changed, 17 insertions(+), 13 deletions(-)
+
+diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in
+index 40dbaaa2..c1ecd601 100644
+--- a/cmake/project-config.cmake.in
++++ b/cmake/project-config.cmake.in
+@@ -15,20 +15,24 @@ include(CMakeFindDependencyMacro)
+ 
+ cmake_policy(PUSH)
+ cmake_policy(SET CMP0012 NEW)
+-if("@ENABLE_TIFF@")
+-    find_dependency(TIFF)
++if(NOT "@BUILD_SHARED_LIBS@")
++    if("@ENABLE_TIFF@")
++        find_dependency(TIFF)
++    endif()
+ endif()
+-if("@CURL_ENABLED@")
+-  # Chainload CURL usage requirements
+-  find_dependency(CURL)
+-  # Target CURL::libcurl only defined since CMake 3.12
+-  if(NOT TARGET CURL::libcurl)
+-      add_library(CURL::libcurl INTERFACE IMPORTED)
+-      set_target_properties(CURL::libcurl PROPERTIES
+-        INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}"
+-        INTERFACE_LINK_LIBRARIES      "${CURL_LIBRARIES}"
+-      )
+-  endif()
++if(NOT "@BUILD_SHARED_LIBS@")
++    if("@CURL_ENABLED@")
++      # Chainload CURL usage requirements
++      find_dependency(CURL)
++      # Target CURL::libcurl only defined since CMake 3.12
++      if(NOT TARGET CURL::libcurl)
++          add_library(CURL::libcurl INTERFACE IMPORTED)
++          set_target_properties(CURL::libcurl PROPERTIES
++            INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}"
++            INTERFACE_LINK_LIBRARIES      "${CURL_LIBRARIES}"
++          )
++      endif()
++    endif()
+ endif()
+ cmake_policy(POP)
+ 
+-- 
+2.39.2
+

pkgs/development/python-modules/affine/default.nix

@@ -1,21 +1,37 @@
-{ buildPythonPackage, pytest, lib, fetchPypi }:
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchPypi
+, flit-core
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "affine";
   version = "2.4.0";
 
+  disabled = pythonOlder "3.7";
+
+  format = "pyproject";
+
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-ok2BjWqDbBMZdtIvjCe408oy0K9kwdjSnet7r6TaHuo=";
   };
 
-  nativeCheckInputs = [ pytest ];
+  nativeBuildInputs = [
-  checkPhase = "py.test";
+    flit-core
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   meta = with lib; {
+    changelog = "https://github.com/rasterio/affine/blob/${version}/CHANGES.txt";
     description = "Matrices describing affine transformation of the plane";
     license = licenses.bsd3;
-    homepage = "https://github.com/sgillies/affine";
+    homepage = "https://github.com/rasterio/affine";
     maintainers = with maintainers; [ mredaelli ];
   };
 

pkgs/development/python-modules/basemap/default.nix

@@ -11,6 +11,7 @@
 , pyproj
 , pyshp
 , python
+, pythonRelaxDepsHook
 , setuptools
 }:
 
@@ -30,9 +31,12 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     cython
     geos
+    pythonRelaxDepsHook
     setuptools
   ];
 
+  pythonRelaxDeps = true;
+
   propagatedBuildInputs = [
     basemap-data
     numpy

pkgs/development/python-modules/humblewx/default.nix

@@ -1,7 +1,7 @@
 { lib
 , fetchFromGitHub
 , buildPythonPackage
-, wxPython_4_0
+, wxPython_4_2
 , python
 }:
 
@@ -16,8 +16,7 @@ buildPythonPackage rec {
     sha256 = "0fv8gwlbcj000qq34inbwgxf0xgibs590dsyqnw0mmyb7f1iq210";
   };
 
-  # timeline is not compatible with wxPython_4_1. reported upstream
+  propagatedBuildInputs = [ wxPython_4_2 ];
-  propagatedBuildInputs = [ wxPython_4_0 ];
 
   checkPhase = ''
     runHook preCheck

pkgs/development/python-modules/labelbox/default.nix

@@ -5,6 +5,8 @@
 , geojson
 , google-api-core
 , imagesize
+, nbconvert
+, nbformat
 , ndjson
 , numpy
 , opencv
@@ -42,7 +44,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pytest.ini \
-      --replace "-s -vv -x --reruns 5 --reruns-delay 10 --durations=20" "-s -vv -x --durations=20"
+      --replace "--reruns 5 --reruns-delay 10" ""
   '';
 
   nativeBuildInputs = [
@@ -79,6 +81,8 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [
+    nbconvert
+    nbformat
     pytest-cases
     pytestCheckHook
   ] ++ passthru.optional-dependencies.data;
@@ -90,6 +94,11 @@ buildPythonPackage rec {
     "tests/data"
   ];
 
+  pytestFlagsArray = [
+    # see tox.ini
+    "-k 'not notebooks'"
+  ];
+
   pythonImportsCheck = [
     "labelbox"
   ];

pkgs/development/python-modules/pyproj/default.nix

@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , python
 , proj
 , pythonOlder
@@ -34,6 +35,23 @@ buildPythonPackage rec {
       proj = proj;
       projdev = proj.dev;
     })
+    # update tests for PROJ 9.2
+    (fetchpatch {
+      url = "https://github.com/pyproj4/pyproj/commit/59d16f57387bbd09b4d61ab95ac520cfec103af1.patch";
+      hash = "sha256-pSDkb+c02KNNlGPwBN/9TQdVJorLr2xvvFB92h84OsQ=";
+    })
+    (fetchpatch {
+      url = "https://github.com/pyproj4/pyproj/commit/dd06b3fee4eaafe80da3414560107ecdda42f5e0.patch";
+      hash = "sha256-6CFVdtovfGqWGXq4auX2DtY7sT4Y0amTJ7phjq5emYM=";
+    })
+    (fetchpatch {
+      url = "https://github.com/pyproj4/pyproj/commit/9283f962e4792da2a7f05ba3735c1ed7f3479502.patch";
+      hash = "sha256-GVYXOAQBHL5WkAF7OczHyGxo7vq8LmT7I/R1jUPCxi4=";
+    })
+    (fetchpatch {
+      url = "https://github.com/pyproj4/pyproj/commit/9dfbb2465296cc8f0de2ff1d68a9b65f7cef52e1.patch";
+      hash = "sha256-F+qS9JZF0JjqyapFhEhIcZ/WHJyfI3jiMC8K7uTpWUA=";
+    })
   ];
 
   nativeBuildInputs = [ cython ];

pkgs/development/python-modules/transaction/default.nix

@@ -3,23 +3,35 @@
 , buildPythonPackage
 , zope_interface
 , mock
+, pythonOlder
 }:
 
-
 buildPythonPackage rec {
   pname = "transaction";
-  version = "3.0.1";
+  version = "3.1.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0c15ef0b7ff3518357ceea75722a30d974c3f85e11aa5cec5d5a2b6a40cfcf68";
+    hash = "sha256-ZdCx6pLb58Tjsjf7a9i0Heoj10Wee92MOIC//a+RL6Q=";
   };
 
-  propagatedBuildInputs = [ zope_interface mock ];
+  propagatedBuildInputs = [
+    zope_interface
+    mock
+  ];
+
+  pythonImportsCheck = [
+    "transaction"
+  ];
 
   meta = with lib; {
     description = "Transaction management";
-    homepage = "https://pypi.python.org/pypi/transaction";
+    homepage = "https://transaction.readthedocs.io/";
+    changelog = "https://github.com/zopefoundation/transaction/blob/${version}/CHANGES.rst";
     license = licenses.zpl20;
+    maintainers = with maintainers; [ ];
   };
 }

pkgs/development/tools/continuous-integration/cirrus-cli/default.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "cirrus-cli";
-  version = "0.95.0";
+  version = "0.96.0";
 
   src = fetchFromGitHub {
     owner = "cirruslabs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-s+mScSSVjzCZ+9lwFdcC/F5oCdT51JNxlqP7uKlx+Y8=";
+    sha256 = "sha256-gX1c10oDGt3n+W6/s4k5JX7V6SuYL8lNRewAmJf8gqQ=";
   };
 
-  vendorHash = "sha256-TZOBIivaoaO7EWBqV2zuL3Em5o4MButq4+TxvePu+qY=";
+  vendorHash = "sha256-Qirv06KhisEmQ+v9Z5jgkJFV4McnH+5r2xbU3wRc0DI=";
 
   ldflags = [
     "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"

pkgs/development/tools/database/sqlcmd/default.nix

@@ -0,0 +1,55 @@
+{ buildGoModule
+, fetchFromGitHub
+, installShellFiles
+, lib
+, sqlcmd
+, testers
+}:
+
+buildGoModule rec {
+  pname = "sqlcmd";
+  version = "0.15.3";
+
+  src = fetchFromGitHub {
+    repo = "go-sqlcmd";
+    owner = "microsoft";
+    rev = "v${version}";
+    sha256 = "sha256-1CdZVh7pbupCNOE1ydgYEqX4rYo2LRddlNRNf0QjlN0=";
+  };
+
+  vendorSha256 = "sha256-6JfxKzYAjSQ9JFuFGDUZ0ALS1D7f2LK3bP0Fbl2ivo0=";
+  proxyVendor = true;
+
+  ldflags = [ "-s" "-w" "-X main.version=${version}" ];
+
+  subPackages = [ "cmd/modern" ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  postInstall = ''
+    mv $out/bin/modern $out/bin/sqlcmd
+
+    installShellCompletion --cmd sqlcmd \
+      --bash <($out/bin/sqlcmd completion bash) \
+      --fish <($out/bin/sqlcmd completion fish) \
+      --zsh <($out/bin/sqlcmd completion zsh)
+  '';
+
+  passthru.tests.version = testers.testVersion {
+    package = sqlcmd;
+    command = "sqlcmd --version";
+    inherit version;
+  };
+
+  meta = {
+    description = "A command line tool for working with Microsoft SQL Server, Azure SQL Database, and Azure Synapse";
+    homepage = "https://github.com/microsoft/go-sqlcmd";
+    changelog = "https://github.com/microsoft/go-sqlcmd/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.ratsclub ];
+  };
+}

pkgs/development/tools/goa/default.nix

@@ -5,15 +5,15 @@
 
 buildGoModule rec {
   pname = "goa";
-  version = "3.11.0";
+  version = "3.11.2";
 
   src = fetchFromGitHub {
     owner = "goadesign";
     repo = "goa";
     rev = "v${version}";
-    sha256 = "sha256-KgCF44kpr8dAHzLgoRKXfd9warQUiFggGZ/Dy/49j1Q=";
+    sha256 = "sha256-zKiGPXkVAeWj9RXuFWvlSz1SYO+uGNBM65+ypIPZpmc=";
   };
-  vendorHash = "sha256-d76aeiSkW0sZeFylWIkCoquWzX78s2iaDeX3VE8cYfI=";
+  vendorHash = "sha256-vND29xb5bG+MnBiOCP9PWC+VGqIwdUO0uVOcP5Wc4zA=";
 
   subPackages = [ "cmd/goa" ];
 

pkgs/development/tools/rust/cargo-update/default.nix

@@ -1,33 +1,48 @@
-{ lib, stdenv
+{ lib
 , rustPlatform
 , fetchCrate
 , cmake
-, pkg-config
 , installShellFiles
+, pkg-config
 , ronn
+, stdenv
 , curl
-, libgit2
+, libgit2_1_5
 , libssh2
 , openssl
-, Security
 , zlib
+, darwin
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-update";
-  version = "11.1.2";
+  version = "12.0.0";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-Hil4v9EUVEH1j7LV1icct6ggFzGVy3f8p+LuFrlBOVA=";
+    sha256 = "sha256-01XtxPVYamXBwn4zwqiRvpD+mHjpIUp+JT0fu3+Peq8=";
   };
 
-  cargoHash = "sha256-gOhZUJHBYti/kqfhyopRsY1PbXZdiGJZpjohMUbO/28=";
+  cargoHash = "sha256-x7RK6Wix5TB5/Ff2qWis3HAhBReWekeoxjcFUv19oB4=";
 
-  nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ];
+  nativeBuildInputs = [
+    cmake
+    installShellFiles
+    pkg-config
+    ronn
+  ] ++ lib.optionals stdenv.isDarwin [
+    curl
+  ];
 
-  buildInputs = [ libgit2 libssh2 openssl zlib ]
+  buildInputs = [
-    ++ lib.optionals stdenv.isDarwin [ curl Security ];
+    libgit2_1_5
+    libssh2
+    openssl
+    zlib
+  ] ++ lib.optionals stdenv.isDarwin [
+    curl
+    darwin.apple_sdk.frameworks.Security
+  ];
 
   postBuild = ''
     # Man pages contain non-ASCII, so explicitly set encoding to UTF-8.
@@ -43,6 +58,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "A cargo subcommand for checking and applying updates to installed executables";
     homepage = "https://github.com/nabijaczleweli/cargo-update";
+    changelog = "https://github.com/nabijaczleweli/cargo-update/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ gerschtli Br1ght0ne johntitor ];
   };

pkgs/development/tools/worker-build/default.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "worker-build";
-  version = "0.0.13";
+  version = "0.0.14";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "workers-rs";
     rev = "v${version}";
-    sha256 = "sha256-eJLYe6H8g2ZM3gWt0GMzj0X7+7e7pFtCRCqDJfVzvms=";
+    sha256 = "sha256-e0nnemaAcgy5tHaAZFIKJCa2c6763Vynlj34j+qjMdk=";
   };
 
-  cargoHash = "sha256-DjWVJH0XeSPesqQr0Rb9Bd+8Q39I1rUoS4dg7KT4mo4=";
+  cargoHash = "sha256-GtX46K99Il+KBQV6jbQYz0ba2HDaAUS4ZGa0fMUUO1s=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 

pkgs/games/minecraft-servers/versions.json

@@ -1,8 +1,8 @@
 {
   "1.19": {
-    "url": "https://piston-data.mojang.com/v1/objects/c9df48efed58511cdd0213c56b9013a7b5c9ac1f/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/8f3112a1049751cc472ec13e397eade5336ca7ae/server.jar",
-    "sha1": "c9df48efed58511cdd0213c56b9013a7b5c9ac1f",
+    "sha1": "8f3112a1049751cc472ec13e397eade5336ca7ae",
-    "version": "1.19.3",
+    "version": "1.19.4",
     "javaVersion": 17
   },
   "1.18": {

pkgs/games/sgt-puzzles/default.nix

@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, desktop-file-utils
 , gtk3, libX11, cmake, imagemagick
-, pkg-config, perl, wrapGAppsHook
+, pkg-config, perl, wrapGAppsHook, nixosTests
 , isMobile ? false
 }:
 
@@ -59,6 +59,8 @@ stdenv.mkDerivation rec {
     install -Dm644 ${sgt-puzzles-menu} -t $out/etc/xdg/menus/applications-merged/
   '';
 
+  passthru.tests.sgtpuzzles = nixosTests.sgtpuzzles;
+
   meta = with lib; {
     description = "Simon Tatham's portable puzzle collection";
     license = licenses.mit;

pkgs/servers/gemini/agate/default.nix

@@ -2,15 +2,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "agate";
-  version = "3.2.4";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "mbrubeck";
-    repo = pname;
+    repo = "agate";
     rev = "v${version}";
-    sha256 = "sha256-NyHs/9kRBGqmh44MSRzYb7CSvEB0RlmL9l5QpGEwDhY=";
+    hash = "sha256-B0hbXar/RulfBJUR1Jtczf3p1H6Zj5OVCXVCaj5zf/U=";
   };
-  cargoSha256 = "sha256-V0MLXOLLmKnk4Iyhbu+EomsxOX6RLYHIsi/IwWiqmcg=";
+  cargoHash = "sha256-6Z+mcQAJwW7tm4SBbrHwHIwiqlFV+PIa5I2onU2rPts=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
 

pkgs/servers/mqtt/nanomq/default.nix

@@ -1,27 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, pkg-config
+{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config
 , cyclonedds, libmysqlclient, mariadb, mbedtls, sqlite, zeromq
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nanomq";
-  version = "0.15.5";
+  version = "0.16.3";
 
   src = fetchFromGitHub {
     owner = "emqx";
     repo = "nanomq";
     rev = finalAttrs.version;
-    hash = "sha256-eIwUsYPpRZMl1oCuuZeOj0SCBHDaJdmdWdoI4yuqxrg=";
+    hash = "sha256-9w4afVxuJbYrkagpAe1diftDnjrRjunyhJdJ0BZq3K0=";
     fetchSubmodules = true;
   };
 
-  patches = [
-    # Fix the conflict on function naming in ddsproxy
-    (fetchpatch {
-      url = "https://github.com/emqx/nanomq/commit/20f436a3b9d45f9809d7c7f0714905c657354631.patch";
-      hash = "sha256-ISMlf9QW73oogMTlifi/r08uSxBpzRYvBSJBB1hn2xY=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace CMakeLists.txt \
       --replace "DESTINATION /etc" "DESTINATION $out/etc"

pkgs/tools/graphics/wgpu-utils/default.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wgpu-utils";
-  version = "0.15.1";
+  version = "0.15.2";
 
   src = fetchFromGitHub {
     owner = "gfx-rs";
     repo = "wgpu";
     rev = "v${version}";
-    hash = "sha256-MdomiE/qHpyVFlgH5wGsFDiXIp6p1wHXsAtmlo/XfEg=";
+    hash = "sha256-U2e7uOGaVpT/c9EXubkaKkROjog073hVfot2bbB34AY=";
   };
 
-  cargoHash = "sha256-83iQ/YcItRsTfp73xi5LZF8AyvyAXJCHuNWXgc1wHkM=";
+  cargoHash = "sha256-QMw3jTZ5XmX9VBe5uiD7yoUIkWGqZcE1pOS6ljZ5qd0=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/tools/misc/woeusb-ng/default.nix

@@ -1,25 +1,49 @@
-{ lib, python3Packages, fetchFromGitHub, p7zip, parted, grub2 }:
+{ lib
+, python3Packages
+, fetchFromGitHub
+, wrapGAppsHook
+, p7zip
+, parted
+, grub2
+}:
+
 with python3Packages;
 
 buildPythonApplication rec {
   pname = "woeusb-ng";
-  version = "0.2.10";
+  version = "0.2.12";
-
-  propagatedBuildInputs = [ p7zip parted grub2 termcolor wxPython_4_0 six ];
 
   src = fetchFromGitHub {
     owner = "WoeUSB";
     repo = "WoeUSB-ng";
     rev = "v${version}";
-    sha256 = "sha256-Nsdk3SMRzj1fqLrp5Na5V3rRDMcIReL8uDb8K2GQNWI=";
+    hash = "sha256-2opSiXbbk0zDRt6WqMh97iAt6/KhwNDopOas+OZn6TU=";
   };
 
-  postInstall = ''
+  postPatch = ''
-    # TODO: the gui requires additional polkit-actions to work correctly, therefore it is currently disabled
+    substituteInPlace setup.py WoeUSB/*.py miscellaneous/* \
-    rm $out/bin/woeusbgui
+      --replace "/usr/local/" "$out/" \
+      --replace "/usr/" "$out/"
   '';
 
-  # checks fail, because of polkit-actions and should be reenabled when the gui is fixed.
+  nativeBuildInputs = [
+    wrapGAppsHook
+  ];
+
+  propagatedBuildInputs = [
+    p7zip
+    parted
+    grub2
+    termcolor
+    wxPython_4_2
+    six
+  ];
+
+  preConfigure = ''
+    mkdir -p $out/bin $out/share/applications $out/share/polkit-1/actions
+  '';
+
+  # Unable to access the X Display, is $DISPLAY set properly?
   doCheck = false;
 
   meta = with lib; {

pkgs/tools/networking/gemget/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gemget";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "makeworld-the-better-one";
     repo = pname;
     rev = "v${version}";
-    sha256 = "PmtIgxnzfLduNGTx8SNDky6juv+NTJ8Cr++SOCk/QNU=";
+    sha256 = "sha256-P5+yRaf2HioKOclJMMm8bJ8/BtBbNEeYU57TceZVqQ8=";
   };
 
-  vendorSha256 = "sha256-Ep6HAJgurxFbA4L77z8V2ar06BBVWlAJS9VoSSUg27U=";
+  vendorHash = "sha256-l8UwkFCCNUB5zyhlyu8YC++MhmcR6midnElCgdj50OU=";
 
   meta = with lib; {
     description = "Command line downloader for the Gemini protocol";

pkgs/tools/security/openpgp-card-tools/default.nix

@@ -12,14 +12,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "openpgp-card-tools";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-Wgj6YZSQj8+BcyPboUTadUOg6Gq6VxV4GRW8TWbnRfc=";
+    sha256 = "sha256-dpXoUJaTrBr4QMehE03BD+704lTNBvfGoAIv9d17A6Q=";
   };
 
-  cargoHash = "sha256-u6xzKDCtv5FzaYgn5wab6ZPICJ/DaqUxiRS80xaEa1A=";
+  cargoHash = "sha256-qxKLpxYQTb+8NxOeimnR2SlyfPiZPl0gX8JCSqjZyM0=";
 
   nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
   buildInputs = [ pcsclite nettle ] ++ lib.optionals stdenv.isDarwin [ PCSC ];

pkgs/tools/security/yubihsm-connector/default.nix

@@ -2,22 +2,16 @@
 
 buildGoModule rec {
   pname = "yubihsm-connector";
-  version = "3.0.2";
+  version = "3.0.4";
 
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = "yubihsm-connector";
     rev = version;
-    sha256 = "FQ64tSZN55QpXjMZITzlWOPTKSgnoCpkRngQUQHVavc=";
+    hash = "sha256-snoQZsmKQPcsB5EpZc4yon02QbxNU5B5TAwRPjs1O5I=";
   };
 
-  vendorSha256 = "kVBzdJk/1LvjdUtLqHAw9ZxDfCo3mBWVMYG/nQXpDrk=";
+  vendorHash = "sha256-XW7rEHY3S+M3b6QjmINgrCak+BqCEV3PJP90jz7J47A=";
-
-  patches = [
-    # Awaiting a new release to fix the upstream lockfile
-    # https://github.com/Yubico/yubihsm-connector/issues/36
-    ./lockfile-fix.patch
-  ];
 
   nativeBuildInputs = [
     pkg-config
@@ -27,6 +21,8 @@ buildGoModule rec {
     libusb1
   ];
 
+  ldflags = [ "-s" "-w" ];
+
   preBuild = ''
     go generate
   '';

pkgs/tools/security/yubihsm-connector/lockfile-fix.patch

@@ -1,115 +0,0 @@
-diff --git a/go.mod b/go.mod
-index ac22dc6..0ef56b2 100644
---- a/go.mod
-+++ b/go.mod
-@@ -1,21 +1,32 @@
- module github.com/Yubico/yubihsm-connector
-
-+go 1.17
-+
- require (
- 	github.com/google/gousb v1.1.0
- 	github.com/google/uuid v1.1.1
- 	github.com/kardianos/service v1.0.0
-+	github.com/notdpate/evloghook v0.0.0-20180503050227-f202fa6c9ebb
-+	github.com/sirupsen/logrus v1.4.2
-+	github.com/spf13/cobra v0.0.5
-+	github.com/spf13/viper v1.4.0
-+	gopkg.in/yaml.v2 v2.2.2
-+)
-+
-+require (
-+	github.com/fsnotify/fsnotify v1.4.7 // indirect
-+	github.com/hashicorp/hcl v1.0.0 // indirect
-+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
- 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
- 	github.com/magiconair/properties v1.8.1 // indirect
--	github.com/notdpate/evloghook v0.0.0-20180503050227-f202fa6c9ebb
-+	github.com/mitchellh/mapstructure v1.1.2 // indirect
- 	github.com/pelletier/go-toml v1.4.0 // indirect
--	github.com/sirupsen/logrus v1.4.2
- 	github.com/spf13/afero v1.2.2 // indirect
--	github.com/spf13/cobra v0.0.5
-+	github.com/spf13/cast v1.3.0 // indirect
- 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
--	github.com/spf13/viper v1.4.0
-+	github.com/spf13/pflag v1.0.3 // indirect
- 	github.com/stretchr/testify v1.4.0 // indirect
- 	golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3 // indirect
- 	golang.org/x/text v0.3.2 // indirect
- 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
--	gopkg.in/yaml.v2 v2.2.2
- )
-diff --git a/go.sum b/go.sum
-index 71df42d..8d977ff 100644
---- a/go.sum
-+++ b/go.sum
-@@ -1,4 +1,5 @@
- cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
- github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
- github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
- github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-@@ -16,6 +17,7 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7
- github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
- github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
- github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
- github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
- github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
- github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-@@ -45,6 +47,7 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf
- github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
- github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
- github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
- github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
- github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
- github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-@@ -53,10 +56,13 @@ github.com/kardianos/service v1.0.0/go.mod h1:8CzDhVuCuugtsHyZoTvsOBuvonN/UDBvl0
- github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
- github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
- github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-+github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
- github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
- github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
- github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
- github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
- github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
- github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
- github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
-@@ -66,12 +72,14 @@ github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrk
- github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
- github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
- github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-+github.com/notdpate/evloghook v0.0.0-20180503050227-f202fa6c9ebb h1:GFmMJZvdCkRfbfo07+lUKrB+jh2cJ+a2l6qD/3hxZ6M=
- github.com/notdpate/evloghook v0.0.0-20180503050227-f202fa6c9ebb/go.mod h1:ukoRZyzBppMQypxM7KqEvHc4DB5uNW6NXFp1sVeXamM=
- github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
- github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
- github.com/pelletier/go-toml v1.4.0 h1:u3Z1r+oOXJIkxqw34zVhyPgjBsm6X2wn21NWs/HfSeg=
- github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo=
- github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
- github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
- github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
- github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
-@@ -107,6 +115,7 @@ github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/y
- github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
- github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
- github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
- github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
- github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
- github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
-@@ -156,6 +165,7 @@ google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ij
- gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
- gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
- gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
- gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
- gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
- gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
-
-

pkgs/tools/system/goreman/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "goreman";
-  version = "0.3.13";
+  version = "0.3.14";
 
   src = fetchFromGitHub {
     owner = "mattn";
     repo = "goreman";
     rev = "v${version}";
-    sha256 = "sha256-BQMRkXHac2Is3VvqrBFA+/NrR3sw/gA1k3fPi3EzONQ=";
+    sha256 = "sha256-FskP0/mqmPTkI0Pj22aweOcr9SqlcFfFaZYgot2wY90=";
   };
 
-  vendorSha256 = "sha256-BWfhvJ6kPz3X3TpHNvRIBgfUAQJB2f/lngRvHq91uyw=";
+  vendorHash = "sha256-Qbi2GfBrVLFbH9SMZOd1JqvD/afkrVOjU4ECkFK+dFA=";
 
   ldflags = [ "-s" "-w" ];
 

pkgs/tools/system/nkeys/default.nix

@@ -5,20 +5,21 @@
 
 buildGoModule rec {
   pname = "nkeys";
-  version = "0.3.0";
+  version = "0.4.4";
 
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
-    sha256 = "06wbmb3cxjrcfvgfbn6rdfzb4pfaaw11bnvl1r4kig4ag22qcz7b";
+    hash = "sha256-ePpFzwjFKcm/xgt9TBl1CVnJYxO389rV9uLONeUeX0c=";
   };
 
-  vendorSha256 = "0kiqlw2411x5c1pamq3mn5wcm8mdn91avwg8xh2a7sy3kqw5d26d";
+  vendorHash = "sha256-ozK0vimYs7wGplw1QhSu+q8R+YsIYHU4m08a7K6i78I=";
 
   meta = with lib; {
     description = "Public-key signature system for NATS";
     homepage = "https://github.com/nats-io/nkeys";
+    changelog = "https://github.com/nats-io/nkeys/releases/tag/v${version}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
     mainProgram = "nk";

pkgs/top-level/all-packages.nix

@@ -15998,9 +15998,7 @@ with pkgs;
   cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  cargo-update = callPackage ../development/tools/rust/cargo-update {
+  cargo-update = callPackage ../development/tools/rust/cargo-update { };
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
 
   cargo-asm = callPackage ../development/tools/rust/cargo-asm {
     inherit (darwin.apple_sdk.frameworks) Security;
@@ -18885,6 +18883,8 @@ with pkgs;
 
   sqlcheck = callPackage ../development/tools/database/sqlcheck { };
 
+  sqlcmd = callPackage ../development/tools/database/sqlcmd { };
+
   sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { };
 
   sqlite-utils = with python3Packages; toPythonApplication sqlite-utils;
@@ -36893,6 +36893,8 @@ with pkgs;
 
   treemix = callPackage ../applications/science/biology/treemix { };
 
+  trf = callPackage ../applications/science/biology/trf { };
+
   trimal = callPackage ../applications/science/biology/trimal { };
 
   truvari = callPackage ../applications/science/biology/truvari { };