Merge master into staging-next

2024-11-23 07:23:20 +00:00 · 2022-07-27 12:01:18 +00:00 · 2022-07-27 12:01:18 +00:00 · 9ed58a6fb6
commit 9ed58a6fb6
parent ce0b1b2db7 6688a347b4
16 changed files with 219 additions and 190 deletions
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@ -5,20 +5,20 @@

 stdenv.mkDerivation rec {
  pname = "emacs";
-  version = "27.2";
+  version = "28.1";

  emacsName = "emacs-${version}";
-  macportVersion = "8.3";
+  macportVersion = "9.0";
  name = "emacs-mac-${version}-${macportVersion}";

  src = fetchurl {
    url = "mirror://gnu/emacs/${emacsName}.tar.xz";
-    sha256 = "1ff182gjw9wqsbx1kj5gl2r5pbqhp4ar54g04j33fgz6g17cr9xl";
+    sha256 = "1qbmmmhnjhn4lvzsnyk7l5ganbi6wzbm38jc1a7hhyh3k78b7c98";
  };

  macportSrc = fetchurl {
    url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
-    sha256 = "0q4lbk3nb8rz1ibmf23plgsh8sx2wvhry5bf5mivgz4m4b6s2yij";
+    sha256 = "10gyynz8wblz6r6dkk12m98kjbsmdwcbrhxpmsjylmdqmjxhlj4m";
    name = "${emacsName}-mac-${macportVersion}.tar.xz"; # It's actually compressed with xz, not gz
  };

@ -57,7 +57,6 @@ stdenv.mkDerivation rec {
    substituteInPlace Makefile.in --replace '/bin/pwd' 'pwd'
    substituteInPlace lib-src/Makefile.in --replace '/bin/pwd' 'pwd'

-
    # Reduce closure size by cleaning the environment of the emacs dumper
    substituteInPlace src/Makefile.in \
      --replace 'RUN_TEMACS = ./temacs' 'RUN_TEMACS = env -i ./temacs'
@ -114,7 +113,7 @@ stdenv.mkDerivation rec {
      extensions are distributed with GNU Emacs; others are available
      separately.

-      This is the "Mac port" addition to GNU Emacs 26. This provides a native
+      This is the "Mac port" addition to GNU Emacs. This provides a native
      GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later
      already contain the official GUI support via the NS (Cocoa) port for
      Mac OS X 10.4 and later. So if it is good enough for you, then you
--- a/pkgs/applications/editors/jetbrains/versions.json
+++ b/pkgs/applications/editors/jetbrains/versions.json
@ -3,294 +3,330 @@
    "clion": {
      "update-channel": "CLion RELEASE",
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
-      "version": "2022.1",
-      "sha256": "a8ad8db6362d60a5ce60a7552110887dbd12e8420c839c368b55808b68dea38b",
-      "url": "https://download.jetbrains.com/cpp/CLion-2022.1.tar.gz",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "6f0234d41c4ca1cf8eaa4ea5585ba4cfc17d86c16c78edc59501e0ca05a80d56",
+      "url": "https://download.jetbrains.com/cpp/CLion-2022.1.3.tar.gz",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.27"
    },
    "datagrip": {
      "update-channel": "DataGrip RELEASE",
      "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
-      "version": "2022.1.1",
-      "sha256": "d4ffcb4371ee6e9f03704fa6282630349fd4ff4759846c02d43bb37e3caeae67",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1.tar.gz",
-      "version-major-minor": "2022.1.1"
+      "version": "2022.1.5",
+      "sha256": "688fcb5996d9bdffd0735e14d10171cfefc72bc482dd773102dcc9e28e245ab8",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.5.tar.gz",
+      "version-major-minor": "2022.1.1",
+      "build_number": "221.5787.39"
    },
    "goland": {
      "update-channel": "GoLand RELEASE",
      "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
-      "version": "2022.1",
-      "sha256": "7803f432b62b7b9a9f340fd48375f50d60b0e5412b052b70e175de8edf82a947",
-      "url": "https://download.jetbrains.com/go/goland-2022.1.tar.gz",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "b96a1cb1b6be1d1e55c85de551fbd94b9a8c0566193d784f3bc408da60e6904e",
+      "url": "https://download.jetbrains.com/go/goland-2022.1.3.tar.gz",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.26"
    },
    "idea-community": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
-      "version": "2022.1",
-      "sha256": "0400e6152fa0173e4e9a514c6398eef8f19150893298658c0b3eb1427e5bcbe5",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2022.1.tar.gz",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "f8a14e3ab100cf745dc7e329e13bd31961cd728c6b7676493b9ffb4e290a9543",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2022.1.3.tar.gz",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.22"
    },
    "idea-ultimate": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-no-jbr.tar.gz",
-      "version": "2022.1",
-      "sha256": "f786bbd4a7c82273f6871996584fb7b37aa2b32fb07c7f554076f203284c77b6",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2022.1-no-jbr.tar.gz",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "97748cd2dacf74701eb4ec30227d96a9b5ab5c09afc7e59443669ab839d20d02",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2022.1.3-no-jbr.tar.gz",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.22"
    },
    "mps": {
      "update-channel": "MPS RELEASE",
      "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
-      "version": "2021.3",
-      "sha256": "e9aeb62f0d667dd285f808e3ba308f572797dbf11d51e9aa06cf49481bee857f",
-      "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3.tar.gz",
-      "version-major-minor": "2021.3"
+      "version": "2021.3.1",
+      "sha256": "b7d41c4362e71f30adeaed9f0ec30afd5ac0e6eea9650ee4a19d70a5783db3e6",
+      "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3.1.tar.gz",
+      "version-major-minor": "2021.3",
+      "build_number": "213.7172.958"
    },
    "phpstorm": {
      "update-channel": "PhpStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
-      "version": "2022.1",
-      "sha256": "e30d6991c98addcc02ab05c623d0c42797d605db73c01b7c153bf2246c877395",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.tar.gz",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "ea5d005f3aee2588dd725bd3aa87d5e3beb51ac87b1505f34263f9da3babd360",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.3.tar.gz",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.28"
    },
    "pycharm-community": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
-      "version": "2022.1",
-      "sha256": "35d857df0ac4bd76caba60ac329c9183594be142094d0592f2afa40534be85eb",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.tar.gz",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "888595caa9510d31fd1b56009b6346fd705e8e7cd36d07205f8bf510b92f26a5",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.3.tar.gz",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.27"
    },
    "pycharm-professional": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
-      "version": "2022.1",
-      "sha256": "9b160ed74f384be31ff376af73f91924a212e6440ce142a581b22f261e6cf605",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.tar.gz",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "f8b9a761529358e97d1b77510a8ef81314bccdfb0fa450f2adcd466ba1fd0bf5",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.3.tar.gz",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.27"
    },
    "rider": {
      "update-channel": "Rider RELEASE",
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
-      "version": "2022.1",
-      "sha256": "e5d2018bf352f4ff17299d2ee4f286d654946fe4dac2ff47d3dc853820364673",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.tar.gz",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.2",
+      "sha256": "4513e55d3db013986bdfda52854f89fb127a153f2588ae456d6e7a182987b741",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.2.tar.gz",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5787.36"
    },
    "ruby-mine": {
      "update-channel": "RubyMine RELEASE",
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
-      "version": "2022.1",
-      "sha256": "495c0d86eb7f3bed0ed692a7ae37e8b3b333c58ae891ca3891a311db6b951401",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.tar.gz",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "9d9c729bd1908a865c72c215b25525e3b82ffee46986b58b747cb502dc6ec2f4",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.3.tar.gz",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.22"
    },
    "webstorm": {
      "update-channel": "WebStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
-      "version": "2022.1",
-      "sha256": "d9dd5815cc456d74f7dc47533ade3990d0f2f9ce0c4dab3d5ae9b04e01d1746c",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.tar.gz",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "cc32c57753f1846f2679cef27a365aebcdacfbbffaea9f33bef1d0da6032ed6c",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.3.tar.gz",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.27"
    }
  },
  "x86_64-darwin": {
    "clion": {
      "update-channel": "CLion RELEASE",
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
-      "version": "2022.1",
-      "sha256": "4972403e5ed7587ad76dcfb08b975879a2a955e9be9f88344e369cd4006b2d52",
-      "url": "https://download.jetbrains.com/cpp/CLion-2022.1.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "6358b42546906c43e46499ea176f901df83ed8c922af65aad068ed048248138d",
+      "url": "https://download.jetbrains.com/cpp/CLion-2022.1.3.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.27"
    },
    "datagrip": {
      "update-channel": "DataGrip RELEASE",
      "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
-      "version": "2022.1.1",
-      "sha256": "6ea0c0c972bad06fd0378a2c1e9a1cb1b3ec50d52cc98d0f9c98327cc7af2a1e",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1.dmg",
-      "version-major-minor": "2022.1.1"
+      "version": "2022.1.5",
+      "sha256": "ac96ab12d7b4593df21cd466b3cea26bcce0db2c2eb92b5d31456887f500032b",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.5.dmg",
+      "version-major-minor": "2022.1.1",
+      "build_number": "221.5787.39"
    },
    "goland": {
      "update-channel": "GoLand RELEASE",
      "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
-      "version": "2022.1",
-      "sha256": "ec44455e83b8c8d85614b63815245a0dff984796a432e05801787c7f8474900b",
-      "url": "https://download.jetbrains.com/go/goland-2022.1.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "5a6821d54cd8777c937fe4dc1ef1d6cab528a24419ac0c751df6bd877a264610",
+      "url": "https://download.jetbrains.com/go/goland-2022.1.3.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.26"
    },
    "idea-community": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
-      "version": "2022.1",
-      "sha256": "6f9dddab5c280bb2ad6bb8d46bcc85c1b167974ce4b412a68faf31f7f7d1c194",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2022.1.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "63637f764018d50717a54c7088be6038f14fbdc8240b3e84fddecf9747471f01",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2022.1.3.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.22"
    },
    "idea-ultimate": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
-      "version": "2022.1",
-      "sha256": "2f1e51db514b39b54cb4029815b7f92764b378f2cf2eb16e69e2ee3c0b35f416",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2022.1.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "7297867bb7c5041015ff2e68415e35537c37bf500c53a5e003c82fc6af9515ab",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2022.1.3.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.22"
    },
    "mps": {
      "update-channel": "MPS RELEASE",
      "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg",
-      "version": "2021.3",
+      "version": "2021.3.1",
      "sha256": "2c5517518fec31ac960e4309fa848ad831f9048ef15df1b362e12aa8f41d9dbd",
-      "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3-macos.dmg",
-      "version-major-minor": "2021.3"
+      "url": "https://download.jetbrains.com/mps/2021.3.1/MPS-2021.3.1-macos.dmg",
+      "version-major-minor": "2021.3",
+      "build_number": "213.7172.958"
    },
    "phpstorm": {
      "update-channel": "PhpStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
-      "version": "2022.1",
-      "sha256": "daa3c749b3a41e106384ac8e003957a46f38dfc844cebfce8c802c4a223535b8",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "306e3bb8224bfb538d02fa33c777d744d369814f460fe254150d722507827abf",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.3.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.28"
    },
    "pycharm-community": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
-      "version": "2022.1",
-      "sha256": "99ba20a8b0752ca58e1fc814fb19766fd19c376b42e3cbfa4102c67bc21942ec",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "d653aaf52be86d7327d566f03a61a5ce4dfd8059948d1d612833215410dde09b",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.3.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.27"
    },
    "pycharm-professional": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
-      "version": "2022.1",
-      "sha256": "ab5496370a6145073dbd423e47d6112d9c726a4a286d2528e66711f865d92d56",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "af7594948effdbe5c9a704185d8abd65a23aab5098059f3fbfef4f29c777fd98",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.3.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.27"
    },
    "rider": {
      "update-channel": "Rider RELEASE",
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
-      "version": "2022.1",
-      "sha256": "38867fb7ca4b5af013f33b4db3b15994b6e732b121176f98480b5ff1b49ef17e",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.2",
+      "sha256": "ddcf6544e7302632a117ec00cf2e20688b53a47319114418fa55f7304bf49b82",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.2.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5787.36"
    },
    "ruby-mine": {
      "update-channel": "RubyMine RELEASE",
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
-      "version": "2022.1",
-      "sha256": "b33f34b889fde6ebe6348499e2ad15bb85937aba1e2a8a9543c411b2476ec4ff",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "1088ef00fef9e63cc3b24c90b4b86e20a473b1d3c72c18b0926e76a41218956f",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.3.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.22"
    },
    "webstorm": {
      "update-channel": "WebStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
-      "version": "2022.1",
-      "sha256": "0bd2be5ea0ccabfb7a806ca4c46d33f1e9106c2256243c48091ff61d5ac29a08",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "85c73a9c5415eecb18d11e22e8b6aced4c16908aaec129c5a1a7241e5f354c2a",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.3.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.27"
    }
  },
  "aarch64-darwin": {
    "clion": {
      "update-channel": "CLion RELEASE",
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
-      "version": "2022.1",
-      "sha256": "333d4ac5757f537ad67863dd6fb03644722ab8fce1596976fa99e5ae9de7991c",
-      "url": "https://download.jetbrains.com/cpp/CLion-2022.1-aarch64.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "60f3f83cc1e526f126c89c444928c2ab5dfaf26aab109de5f05baca2fdf20a24",
+      "url": "https://download.jetbrains.com/cpp/CLion-2022.1.3-aarch64.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.27"
    },
    "datagrip": {
      "update-channel": "DataGrip RELEASE",
      "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg",
-      "version": "2022.1.1",
-      "sha256": "2ba92ed34366b111a39ba0632d91dbaf232633f5f5557a208dd8ab7696179b6f",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1-aarch64.dmg",
-      "version-major-minor": "2022.1.1"
+      "version": "2022.1.5",
+      "sha256": "31df43a4f1adab562730adade212916091fc7f7090121001840c1453d2037694",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.5-aarch64.dmg",
+      "version-major-minor": "2022.1.1",
+      "build_number": "221.5787.39"
    },
    "goland": {
      "update-channel": "GoLand RELEASE",
      "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
-      "version": "2022.1",
-      "sha256": "0506a817e35a80d3d776484a88bf4136628b589a8f5754833387a8dec99798d3",
-      "url": "https://download.jetbrains.com/go/goland-2022.1-aarch64.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "5e29fbd0b2ed2ea06445ee378fd12f8172cfffb122652d26579b7dfea6c774e5",
+      "url": "https://download.jetbrains.com/go/goland-2022.1.3-aarch64.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.26"
    },
    "idea-community": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
-      "version": "2022.1",
-      "sha256": "f61bdf70e373a948a71331e68a7303bf90cf47ea4e2f97338aaf96d19e8862c4",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2022.1-aarch64.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "b436120ee2bb380f30e29582c3958e110d9c85186bde6af6fe5c571c75e99df8",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2022.1.3-aarch64.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.22"
    },
    "idea-ultimate": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
-      "version": "2022.1",
-      "sha256": "af9c0e8d47fcded5f567293b7991fd0ac8df838b83884149109fd91ec2dec769",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2022.1-aarch64.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "0f0ec167c0394b7d4969cb0b95e08e2b469e811a1aa515971bc84d5ef4d54def",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2022.1.3-aarch64.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.22"
    },
    "mps": {
      "update-channel": "MPS RELEASE",
      "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg",
-      "version": "2021.3",
-      "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3-macos-aarch64.dmg",
+      "version": "2021.3.1",
+      "url": "https://download.jetbrains.com/mps/2021.3.1/MPS-2021.3.1-macos-aarch64.dmg",
      "sha256": "3ace6d45db718dffd80bf126a76735fb65099de292112a01cc078aa61c475a70",
-      "version-major-minor": "2021.3"
+      "version-major-minor": "2021.3",
+      "build_number": "213.7172.958"
    },
    "phpstorm": {
      "update-channel": "PhpStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
-      "version": "2022.1",
-      "sha256": "d13744e7a70a9716f1b99cb9b77c77e17cb4710466a29db490ef6e707a54ae21",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1-aarch64.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "68c6093701f86b6a31601e159569629ceea87c7db20b8b98089bf8efadb0310e",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.3-aarch64.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.28"
    },
    "pycharm-community": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
-      "version": "2022.1",
-      "sha256": "1873565756716cb0eee23c60068dd5d394413b2b2e54b4b75cbe8b882540a0b7",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2022.1-aarch64.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "0d578b5ab3140ac20e6a0250c2733cc2fa6888b8ab478a046181c273ac6a66cb",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.3-aarch64.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.27"
    },
    "pycharm-professional": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
-      "version": "2022.1",
-      "sha256": "ba0ea4ff52703a53a9c7e14d42c9ae12688b94364ced77a28d4ed0c417c9642f",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1-aarch64.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "88bcc8acc6bb7bc189466da427cc049df62062e8590108f17b080208a8008a07",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.3-aarch64.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.27"
    },
    "rider": {
      "update-channel": "Rider RELEASE",
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
-      "version": "2022.1",
-      "sha256": "273f40eda119a034ada821db2257e3b5c2bfb835c287365398237f5d9a9daad3",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1-aarch64.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.2",
+      "sha256": "81ce9020cc2b20f50ce73efe80969b054fce2a62a1736aed877a1141eaf07d4b",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.2-aarch64.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5787.36"
    },
    "ruby-mine": {
      "update-channel": "RubyMine RELEASE",
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
-      "version": "2022.1",
-      "sha256": "06d932a587adcd25b4e70d0b27c2c229381144deaef90cbcdc345edd822e04ed",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1-aarch64.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "ed4b77ad69207872190b3200143c8bca50234c19539fcaaf55bfa4643e7be3b0",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.3-aarch64.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.22"
    },
    "webstorm": {
      "update-channel": "WebStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
-      "version": "2022.1",
-      "sha256": "96ec148af1b20ea9d2cb6f8b1f268f96607269e8dd3caf521b48464fe21a7177",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1-aarch64.dmg",
-      "version-major-minor": "2022.1"
+      "version": "2022.1.3",
+      "sha256": "60de3524c32fbc6dde2989b7ffcfce861c069ce79bded6206dbc587c94f411a2",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.3-aarch64.dmg",
+      "version-major-minor": "2022.1",
+      "build_number": "221.5921.27"
    }
  }
 }
--- a/pkgs/applications/misc/kanboard/default.nix
+++ b/pkgs/applications/misc/kanboard/default.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    owner = "kanboard";
    repo = "kanboard";
    rev = "v${version}";
-    sha256 = "sha256-pLxCm+T9jdn0FFqbTFe1tsIPTaVTT+QDeLHDxrbpGBg=";
+    sha256 = "sha256-WG2lTPpRG9KQpRdb+cS7CqF4ZDV7JZ8XtNqAI6eVzm0=";
  };

  dontBuild = true;
--- a/pkgs/applications/networking/cluster/talosctl/default.nix
+++ b/pkgs/applications/networking/cluster/talosctl/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "talosctl";
-  version = "1.1.1";
+  version = "1.1.2";

  src = fetchFromGitHub {
    owner = "siderolabs";
    repo = "talos";
    rev = "v${version}";
-    sha256 = "sha256-pCdcgQC6oihHKyrq9MkJr0c3EErPrMImNsk+TX9Z5GA=";
+    sha256 = "sha256-20dbBRJ0OwRiYoLVmXyV8XApOzGsyppaTW079TGK5fI=";
  };

-  vendorSha256 = "sha256-BhLksvv5j3fSqHj7gY+aWPN9Uni7/B5/ltIAMJ/ljEE=";
+  vendorSha256 = "sha256-Xb4gkYBDTSFPwxCSxVqXLxDLn75xyy/k6Vwy+ot59KU=";

  ldflags = [ "-s" "-w" ];

--- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix
@ -3,10 +3,10 @@
 mkFranzDerivation rec {
  pname = "ferdium";
  name = "Ferdium";
-  version = "6.0.0-nightly.65";
+  version = "6.0.0";
  src = fetchurl {
-    url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/ferdium_${version}_amd64.deb";
-    sha256 = "sha256-vmu74aLAKGbmRf9hkMUL5VOfi/Cbvdix9MzsZK1qW80=";
+    url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb";
+    sha256 = "sha256-395rleN2T8iUejLRjl51N+lgqtWwHXad36WpIT1BFGQ=";
  };

  extraBuildInputs = [ xorg.libxshmfence ];
--- a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
+++ b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
@ -24,7 +24,7 @@ while read pkg_spec; do
  pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)"

  pkg_src="$(jq --raw-output '.source' "$(dirname "$pkg_spec")/.nupkg.metadata")"
-  if [[ $pkg_src != https://api.nuget.org/* ]]; then
+  if [[ $pkg_src != https://api.nuget.org/* ]] && [[ ! -d $pkg_src ]]; then
    pkg_source_url="${nuget_sources_cache[$pkg_src]:=$(curl -n --fail "$pkg_src" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')}"
    pkg_url="$pkg_source_url${pkg_name,,}/${pkg_version,,}/${pkg_name,,}.${pkg_version,,}.nupkg"
    echo "  (fetchNuGet { pname = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; url = \"$pkg_url\"; })" >> ${tmpfile}
--- a/pkgs/development/python-modules/azure-core/default.nix
+++ b/pkgs/development/python-modules/azure-core/default.nix
@ -1,4 +1,8 @@
-{ lib, stdenv, buildPythonPackage, fetchpatch, fetchPypi, pythonOlder
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
 , aiodns
 , aiohttp
 , flask
@ -11,30 +15,19 @@
 , requests
 , six
 , trio
-, typing-extensions
-}:
+, typing-extensions }:

 buildPythonPackage rec {
-  version = "1.24.0";
+  version = "1.24.2";
  pname = "azure-core";
  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
    extension = "zip";
-    sha256 = "sha256-NFsbBB+q19AgWyDVaX8dDfNEMC56qoUBkFWA/4e9C+U=";
+    sha256 = "sha256-Dzog0kVlm/gfs2cAcKVBDI1KQymNWpgeYtzjkwAKkIQ=";
  };

-  patches = [
-    # FIXME: fixes tests with new versions of flask/werkzeug
-    # upstream PR: https://github.com/Azure/azure-sdk-for-python/pull/24450
-    (fetchpatch {
-      url = "https://github.com/Azure/azure-sdk-for-python/commit/fb20b0b985f614bb7bcd84f3f5f6f3105de25fd9.patch";
-      stripLen = 3;
-      sha256 = "sha256-Gt5T/UkQT1yml8bqYbeUpimfOPlmzpN1KKKUnbU9xJw=";
-    })
-  ];
-
  propagatedBuildInputs = [
    requests
    six
--- a/pkgs/development/python-modules/meross-iot/default.nix
+++ b/pkgs/development/python-modules/meross-iot/default.nix
@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "meross-iot";
-  version = "0.4.4.7";
+  version = "0.4.5.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "albertogeniola";
    repo = "MerossIot";
    rev = "refs/tags/${version}";
-    sha256 = "sha256-9kRiBYlOX+TcI8+fk+cQ3ehbrV8NnptWa+HN62sKscA=";
+    sha256 = "sha256-6TWtqPYbHZKiAEHAGxZrPxvIiLdNhwOtqtgG+HtQGjI=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/peaqevcore/default.nix
+++ b/pkgs/development/python-modules/peaqevcore/default.nix
@ -6,14 +6,14 @@

 buildPythonPackage rec {
  pname = "peaqevcore";
-  version = "3.2.0";
+  version = "3.3.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-cNbCGz/mXR7xrwdxmtD36v8ROCvLe5w1sD0M6aSrONE=";
+    hash = "sha256-0Smw0WyGWgGR+NunWT06y2OpKmMA84cxrn01CvE655A=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/types-requests/default.nix
+++ b/pkgs/development/python-modules/types-requests/default.nix
@ -6,12 +6,12 @@

 buildPythonPackage rec {
  pname = "types-requests";
-  version = "2.28.4";
+  version = "2.28.5";
  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-G5vt1g54nbYrc6Sl5fWnjDEG5TWtafq6l7C72x6ja48=";
+    sha256 = "sha256-rGGL/vyzdC6vl8lh4T6eWiJuVF7aSj2+KTuJjUCTOtE=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/types-urllib3/default.nix
+++ b/pkgs/development/python-modules/types-urllib3/default.nix
@ -5,12 +5,12 @@

 buildPythonPackage rec {
  pname = "types-urllib3";
-  version = "1.26.16";
+  version = "1.26.17";
  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-i7ODLGhMMMvtQLluKLwEcDvssrl9gqxlukuWh4NFOw4=";
+    hash = "sha256-c/0nRSTD/HzYzZzrDLZ+2ZtF+csoMQE+RtUMFFEESAA=";
  };

  # Module doesn't have tests
--- a/pkgs/development/python-modules/weconnect-mqtt/default.nix
+++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "weconnect-mqtt";
-  version = "0.38.1";
+  version = "0.38.2";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "tillsteinbach";
    repo = "WeConnect-mqtt";
    rev = "refs/tags/v${version}";
-    hash = "sha256-ybSslUdOlD87Kl6dkNRO/pHLBmQB3ioT/3p4uHYssBI=";
+    hash = "sha256-oDf/W8EiU9vg64/FDryp8NEMyDT7lI5nlkxiCAg88pY=";
  };

  propagatedBuildInputs = [
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@ -23,6 +23,7 @@ in lib.mapAttrs (n: make) (with lib.systems.examples; {
  riscv64 = riscv64;
  mips64el-linux-gnuabin32 = mips64el-linux-gnuabin32;
  mips64el-linux-gnuabi64  = mips64el-linux-gnuabi64;
+  mipsel-linux-gnu         = mipsel-linux-gnu;
  powerpc64 = ppc64;
  powerpc64-musl = ppc64-musl;
  powerpc64le = powernv;
--- a/pkgs/tools/networking/httplz/default.nix
+++ b/pkgs/tools/networking/httplz/default.nix
@ -13,15 +13,15 @@

 rustPlatform.buildRustPackage rec {
  pname = "httplz";
-  version = "1.12.4";
+  version = "1.12.5";

  src = fetchCrate {
    inherit version;
    pname = "https";
-    sha256 = "sha256-4+iIFLtPVs4PHOzfXfretCuZ0iBcqMVNnYFjEVhvBjk=";
+    sha256 = "sha256-+nCqMTLrBYNQvoKo1PzkyzRCkKdlE88+NYoJcIlAJts=";
  };

-  cargoSha256 = "sha256-VOzMf9hOrAEGwtW9h8CnG/Df2KgEVhNqqdL762Gs2dE=";
+  cargoSha256 = "sha256-odiVIfNJPpagoASnYvdOosHXa37gbQM8Zmvtnao0pAs=";

  nativeBuildInputs = [
    installShellFiles
--- a/pkgs/tools/security/nuclei/default.nix
+++ b/pkgs/tools/security/nuclei/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "nuclei";
-  version = "2.7.4";
+  version = "2.7.5";

  src = fetchFromGitHub {
    owner = "projectdiscovery";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-J65NAc0yswIgDPHH26mzx2OqMgcMV4n/gVG77Xe64wg=";
+    sha256 = "sha256-R9Z+xcmrzv89ocDWfWqSLhrgeOSmsnqmPYGUmULAJAI=";
  };

-  vendorSha256 = "sha256-ewKKn+P8W/Fl3VaRiTmbA88DyMLJ38CG2rDExSa3oWw=";
+  vendorSha256 = "sha256-jvgwVtYndf+xbGJycnUidMUMDGFRIVJtSAA4Akd64Dk=";

  modRoot = "./v2";
  subPackages = [
--- a/pkgs/tools/text/mdbook/default.nix
+++ b/pkgs/tools/text/mdbook/default.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "mdbook";
-  version = "0.4.20";
+  version = "0.4.21";

  src = fetchFromGitHub {
    owner = "rust-lang";
    repo = "mdBook";
    rev = "v${version}";
-    sha256 = "sha256-Cfi9qjY7+G7nGgxt4xNLIkGlpgr6TnvGlFrz3gMKCX8=";
+    sha256 = "sha256-ggcyOsA4cyo5l87cZmOMI0w1gCzmWy9NRJiWxjBdB1E=";
  };

-  cargoSha256 = "sha256-Ihs5aaruzj/8gbUhg4MmrYmpS9Hi/DohuEV2WtrxUXE=";
+  cargoSha256 = "sha256-KVoMC8ypikABVkIj5dCSHzYZ9CV8UMuAFxSEYLaQTSk=";

  buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];