Merge master into haskell-updates

maintainers/maintainer-list.nix

@@ -6852,6 +6852,12 @@
     githubId = 3967312;
     name = "Jocelyn Thode";
   };
+  joedevivo = {
+     email = "55951+joedevivo@users.noreply.github.com";
+     github = "joedevivo";
+     githubId = 55951;
+     name = "Joe DeVivo";
+   };
   joelancaster = {
     email = "joe.a.lancas@gmail.com";
     github = "JoeLancaster";
@@ -9419,6 +9425,12 @@
     githubId = 1776903;
     name = "Andrew Abbott";
   };
+  mislavzanic = {
+    email = "mislavzanic3@gmail.com";
+    github = "mislavzanic";
+    githubId = 48838244;
+    name = "Mislav Zanic";
+  };
   misterio77 = {
     email = "eu@misterio.me";
     github = "Misterio77";

nixos/doc/manual/from_md/release-notes/rl-2305.section.xml

@@ -132,6 +132,14 @@
           before upgrading their systems.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <literal>git-bug</literal> has been updated to at least
+          version 0.8.0, which includes backwards incompatible changes.
+          The <literal>git-bug-migration</literal> package can be used
+          to upgrade existing repositories.
+        </para>
+      </listitem>
       <listitem>
         <para>
           The EC2 image module no longer fetches instance metadata in

nixos/doc/manual/release-notes/rl-2305.section.md

@@ -44,6 +44,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - `podman` now uses the `netavark` network stack. Users will need to delete all of their local containers, images, volumes, etc, by running `podman system reset --force` once before upgrading their systems.
 
+- `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories.
+
 - The EC2 image module no longer fetches instance metadata in stage-1. This results in a significantly smaller initramfs, since network drivers no longer need to be included, and faster boots, since metadata fetching can happen in parallel with startup of other services.
   This breaks services which rely on metadata being present by the time stage-2 is entered. Anything which reads EC2 metadata from `/etc/ec2-metadata` should now have an `after` dependency on `fetch-ec2-metadata.service`
 

pkgs/applications/audio/quodlibet/default.nix

@@ -97,6 +97,7 @@ python3.pkgs.buildPythonApplication rec {
     gst-plugins-base
     gstreamer
   ] ++ lib.optionals (withGstPlugins) [
+    gst-libav
     gst-plugins-bad
     gst-plugins-good
     gst-plugins-ugly

pkgs/applications/editors/quartus-prime/default.nix

@@ -44,6 +44,7 @@ in buildFHSUserEnv rec {
     xorg.libXext
     xorg.libXrender
     libudev0-shim
+    libxcrypt
   ];
 
   passthru = { inherit unwrapped; };

pkgs/applications/editors/vim/plugins/generated.nix

@@ -821,6 +821,18 @@ final: prev:
     meta.homepage = "https://github.com/ayu-theme/ayu-vim/";
   };
 
+  b64-nvim = buildVimPluginFrom2Nix {
+    pname = "b64.nvim";
+    version = "2022-08-22";
+    src = fetchFromGitHub {
+      owner = "taybart";
+      repo = "b64.nvim";
+      rev = "12dde6ebc3035f010833f513cfbd9abad92b28b3";
+      sha256 = "0h3ghaddqf00q7gih53ni7mx0iw5k9m616j34yg6hdf6s12zp5qw";
+    };
+    meta.homepage = "https://github.com/taybart/b64.nvim/";
+  };
+
   barbar-nvim = buildVimPluginFrom2Nix {
     pname = "barbar.nvim";
     version = "2023-01-03";

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -67,6 +67,7 @@ https://github.com/rmagatti/auto-session/,,
 https://github.com/vim-scripts/autoload_cscope.vim/,,
 https://github.com/rafi/awesome-vim-colorschemes/,,
 https://github.com/ayu-theme/ayu-vim/,,
+https://github.com/taybart/b64.nvim/,HEAD,
 https://github.com/romgrk/barbar.nvim/,,
 https://github.com/utilyre/barbecue.nvim/,,
 https://github.com/chriskempson/base16-vim/,,

pkgs/applications/graphics/graphicsmagick/default.nix

@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "graphicsmagick";
-  version = "1.3.38";
+  version = "1.3.39";
 
   src = fetchurl {
     url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
-    sha256 = "sha256-1gzZ21k1HSucsZvrRDFwrKoo8HPRPSWPZ7NidjXjJnU=";
+    sha256 = "sha256-4wscpY6HPQoe4gg4RyRCTbLTwzpUA04mHRTo+7j40E8=";
   };
 
   patches = [

pkgs/applications/graphics/openboard/default.nix

@@ -23,7 +23,7 @@ let
       install -Dm755 OpenBoardImporter $out/bin/OpenBoardImporter
     '';
   };
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
   pname = "openboard";
   version = "unstable-2022-11-28";
 
@@ -36,9 +36,9 @@ in stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace OpenBoard.pro \
-      --replace '/usr/include/quazip5' '${quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \
+      --replace '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \
       --replace '-lquazip5' '-lquazip1-qt5' \
-      --replace '/usr/include/poppler' '${poppler.dev}/include/poppler'
+      --replace '/usr/include/poppler' '${lib.getDev poppler}/include/poppler'
   '';
 
   nativeBuildInputs = [ qmake copyDesktopItems wrapQtAppsHook ];

pkgs/applications/misc/llpp/default.nix

@@ -51,6 +51,9 @@ stdenv.mkDerivation rec {
     homepage = "https://repo.or.cz/w/llpp.git";
     description = "A MuPDF based PDF pager written in OCaml";
     platforms = platforms.linux;
+    # Project is unmaintained and fails to build:
+    # link.c:987:27: error: invalid operands to binary >= (have 'fz_location' and 'int')
+    broken = true;
     maintainers = with maintainers; [ pSub ];
     license = licenses.gpl3;
   };

pkgs/applications/networking/browsers/chromium/upstream-info.json

@@ -45,19 +45,19 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "108.0.5359.125",
+    "version": "109.0.5414.87",
-    "sha256": "0n8aigw7qv6dzd8898xz435kj79z73v916amfaxyz69g57pnpqhn",
+    "sha256": "1nhqbl4070n3f3j9867j78k8vig69i8m0k0s17z5axqv2qkn76k8",
     "sha256bin64": null,
     "deps": {
       "gn": {
-        "version": "2022-10-05",
+        "version": "2022-11-10",
         "url": "https://gn.googlesource.com/gn",
-        "rev": "b9c6c19be95a3863e02f00f1fe403b2502e345b6",
+        "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41",
-        "sha256": "1rhadb6qk867jafr85x2m3asis3jv7x06blhmad2d296p26d5w6x"
+        "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b"
       },
       "ungoogled-patches": {
-        "rev": "108.0.5359.125-1",
+        "rev": "109.0.5414.87-1",
-        "sha256": "1dacvzi6j4xyjjnrsb79mhhj7jc992z1di9acl4appfydlqadgv3"
+        "sha256": "0lq0zk21qfm8wvi0fl0gnjm0wnk29dsi8b9qphldwysgla8y8m3j"
       }
     }
   }

pkgs/applications/networking/cluster/terraspace/Gemfile

@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gem "terraspace", '~> 2.2.3'

pkgs/applications/networking/cluster/terraspace/Gemfile.lock

@@ -0,0 +1,129 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.0.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.689.0)
+    aws-sdk-core (3.168.4)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.61.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.117.2)
+      aws-sdk-core (~> 3, >= 3.165.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.5.2)
+      aws-eventstream (~> 1, >= 1.0.2)
+    cli-format (0.2.2)
+      activesupport
+      text-table
+      zeitwerk
+    concurrent-ruby (1.1.10)
+    deep_merge (1.2.2)
+    diff-lcs (1.5.0)
+    dotenv (2.8.1)
+    dsl_evaluator (0.3.1)
+      activesupport
+      memoist
+      rainbow
+      zeitwerk
+    eventmachine (1.2.7)
+    eventmachine-tail (0.6.5)
+      eventmachine
+    graph (2.11.0)
+    hcl_parser (0.2.2)
+      rhcl
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    jmespath (1.6.2)
+    memoist (0.16.2)
+    minitest (5.17.0)
+    mini_portile2 (2.8.0)
+    nokogiri (1.13.9)
+      racc (~> 1.4)
+      mini_portile2 (~> 2.8.0)
+    racc (1.6.2)
+    rainbow (3.1.1)
+    render_me_pretty (0.8.4)
+      activesupport
+      rainbow
+      tilt
+    rexml (3.2.5)
+    rhcl (0.1.0)
+      deep_merge
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rspec-terraspace (0.3.2)
+      activesupport
+      memoist
+      rainbow
+      rspec
+      zeitwerk
+    rubyzip (2.3.2)
+    terraspace (2.2.3)
+      activesupport
+      bundler
+      cli-format
+      deep_merge
+      dotenv
+      dsl_evaluator
+      eventmachine-tail
+      graph
+      hcl_parser
+      memoist
+      rainbow
+      render_me_pretty
+      rexml
+      rspec-terraspace (>= 0.3.1)
+      terraspace-bundler (>= 0.5.0)
+      thor
+      tty-tree
+      zeitwerk
+      zip_folder
+    terraspace-bundler (0.5.0)
+      activesupport
+      aws-sdk-s3
+      dsl_evaluator
+      memoist
+      nokogiri
+      rainbow
+      rubyzip
+      thor
+      zeitwerk
+    text-table (1.2.4)
+    thor (1.2.1)
+    tilt (2.0.11)
+    tty-tree (0.4.0)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.6.6)
+    zip_folder (0.1.0)
+      rubyzip
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  terraspace (~> 2.2.3)
+
+BUNDLED WITH
+   2.3.25

pkgs/applications/networking/cluster/terraspace/default.nix

@@ -0,0 +1,32 @@
+{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, ruby }:
+let
+  rubyEnv = bundlerEnv {
+    inherit ruby;
+    name = "terraspace";
+    gemdir  = ./.;
+  };
+in stdenv.mkDerivation {
+  pname = "terraspace";
+  version = (import ./gemset.nix).terraspace.version;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  dontUnpack = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    makeWrapper ${rubyEnv}/bin/terraspace $out/bin/terraspace
+    wrapProgram $out/bin/terraspace \
+      --prefix PATH : ${lib.makeBinPath [ rubyEnv.ruby ]}
+  '';
+
+  passthru.updateScript = bundlerUpdateScript "terraspace";
+
+  meta = with lib; {
+    description = "Terraform framework that provides an organized structure, and keeps your code DRY";
+    homepage    = "https://github.com/boltops-tools/terraspace";
+    license     = licenses.asl20;
+    platforms   = ruby.meta.platforms;
+    maintainers = with maintainers; [ mislavzanic ];
+  };
+}

pkgs/applications/networking/cluster/terraspace/gemset.nix

@@ -0,0 +1,464 @@
+{
+  activesupport = {
+    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "183az13i4fsm28d0l5xhbjpmcj3l1lxzcxlx8pi8zrbd933jwqd0";
+      type = "gem";
+    };
+    version = "7.0.4";
+  };
+  aws-eventstream = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  aws-partitions = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06878pd1kxbj54dh6jp11a1460dkyxvk4mzwp480gcdqy5jaqwhw";
+      type = "gem";
+    };
+    version = "1.689.0";
+  };
+  aws-sdk-core = {
+    dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "131acgw2hi893n0dfbczs42bkc41afhyrmd9w8zx5y8r1k5zd6rc";
+      type = "gem";
+    };
+    version = "3.168.4";
+  };
+  aws-sdk-kms = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ajp7yvnf95d60xmg618xznfwsy8h1vrkzj33r1bsf2gsfp50vzy";
+      type = "gem";
+    };
+    version = "1.61.0";
+  };
+  aws-sdk-s3 = {
+    dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xpb8c8zw1c0grbw1rcc0ynlys1301vm9kkqy4ls3i2zqk5v6n91";
+      type = "gem";
+    };
+    version = "1.117.2";
+  };
+  aws-sigv4 = {
+    dependencies = ["aws-eventstream"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m";
+      type = "gem";
+    };
+    version = "1.5.2";
+  };
+  cli-format = {
+    dependencies = ["activesupport" "text-table" "zeitwerk"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mr8vkw5zwb3flhhf8s923mi7r85g1ky0lmjz4q5xhwb48ji55qf";
+      type = "gem";
+    };
+    version = "0.2.2";
+  };
+  concurrent-ruby = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
+      type = "gem";
+    };
+    version = "1.1.10";
+  };
+  deep_merge = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fjn4civid68a3zxnbgyjj6krs3l30dy8b4djpg6fpzrsyix7kl3";
+      type = "gem";
+    };
+    version = "1.2.2";
+  };
+  diff-lcs = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9";
+      type = "gem";
+    };
+    version = "1.5.0";
+  };
+  dotenv = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1n0pi8x8ql5h1mijvm8lgn6bhq4xjb5a500p5r1krq4s6j9lg565";
+      type = "gem";
+    };
+    version = "2.8.1";
+  };
+  dsl_evaluator = {
+    dependencies = ["activesupport" "memoist" "rainbow" "zeitwerk"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mck2j0gr851kj9l7pix97jmmwwazfjq83ryamx5rpdbgv5mrh51";
+      type = "gem";
+    };
+    version = "0.3.1";
+  };
+  eventmachine = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
+      type = "gem";
+    };
+    version = "1.2.7";
+  };
+  eventmachine-tail = {
+    dependencies = ["eventmachine"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0x5ly7mnfr6gibjyxz6lrxb4jbf05p0r8257qcgkf8rkwg9ynw0c";
+      type = "gem";
+    };
+    version = "0.6.5";
+  };
+  graph = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10l1bdqc9yzdk6kqwh9vw918lyw846gpqw2z8kfcwl53zdjdzcl9";
+      type = "gem";
+    };
+    version = "2.11.0";
+  };
+  hcl_parser = {
+    dependencies = ["rhcl"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09d55i9y187xkw0fi0b5aq8wyzvq8w73ryi939dvzdzgss25m7jj";
+      type = "gem";
+    };
+    version = "0.2.2";
+  };
+  i18n = {
+    dependencies = ["concurrent-ruby"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
+      type = "gem";
+    };
+    version = "1.12.0";
+  };
+  jmespath = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393";
+      type = "gem";
+    };
+    version = "1.6.2";
+  };
+  memoist = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55";
+      type = "gem";
+    };
+    version = "0.16.2";
+  };
+  minitest = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0";
+      type = "gem";
+    };
+    version = "5.17.0";
+  };
+  mini_portile2 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
+      type = "gem";
+    };
+    version = "2.8.0";
+  };
+  nokogiri = {
+    dependencies = ["mini_portile2" "racc"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn";
+      type = "gem";
+    };
+    version = "1.13.9";
+  };
+  racc = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq";
+      type = "gem";
+    };
+    version = "1.6.2";
+  };
+  rainbow = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
+      type = "gem";
+    };
+    version = "3.1.1";
+  };
+  render_me_pretty = {
+    dependencies = ["activesupport" "rainbow" "tilt"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1cd64d59jx6jjzhi5xngfa031sfpgs7zyq8bhc9y4smlz121l1ij";
+      type = "gem";
+    };
+    version = "0.8.4";
+  };
+  rexml = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
+      type = "gem";
+    };
+    version = "3.2.5";
+  };
+  rhcl = {
+    dependencies = ["deep_merge"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1c7xp9y9438mnqrfrvjp1fwy2lk0b1ixz45qi2g2kbl91ilhn834";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  rspec = {
+    dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c";
+      type = "gem";
+    };
+    version = "3.12.0";
+  };
+  rspec-core = {
+    dependencies = ["rspec-support"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4";
+      type = "gem";
+    };
+    version = "3.12.0";
+  };
+  rspec-expectations = {
+    dependencies = ["diff-lcs" "rspec-support"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6";
+      type = "gem";
+    };
+    version = "3.12.2";
+  };
+  rspec-mocks = {
+    dependencies = ["diff-lcs" "rspec-support"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0k64i7ax6sqvh702s0xrll2g8isxx1x4zam95ck7122flsyh7van";
+      type = "gem";
+    };
+    version = "3.12.2";
+  };
+  rspec-support = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx";
+      type = "gem";
+    };
+    version = "3.12.0";
+  };
+  rspec-terraspace = {
+    dependencies = ["activesupport" "memoist" "rainbow" "rspec" "zeitwerk"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16bi6x6aynnkp7yh341fmvpiasm1vg43mxf61ji57akdhx4mam5q";
+      type = "gem";
+    };
+    version = "0.3.2";
+  };
+  rubyzip = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
+      type = "gem";
+    };
+    version = "2.3.2";
+  };
+  terraspace = {
+    dependencies = ["activesupport" "cli-format" "deep_merge" "dotenv" "dsl_evaluator" "eventmachine-tail" "graph" "hcl_parser" "memoist" "rainbow" "render_me_pretty" "rexml" "rspec-terraspace" "terraspace-bundler" "thor" "tty-tree" "zeitwerk" "zip_folder"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m38gj4bpcafrbrfdck2pswknm2p6mqfq8mp6k3pkjkmk9p3w9a9";
+      type = "gem";
+    };
+    version = "2.2.3";
+  };
+  terraspace-bundler = {
+    dependencies = ["activesupport" "aws-sdk-s3" "dsl_evaluator" "memoist" "nokogiri" "rainbow" "rubyzip" "thor" "zeitwerk"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kn6is7zqlw8l4njj4pjwbdi95w651nz3qvqgc3vw07rchs08nnx";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
+  text-table = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06yhlnb49fn0fhkmi6lrziyv2hd42gcm2zi3sggm2qab48qxn94j";
+      type = "gem";
+    };
+    version = "1.2.4";
+  };
+  thor = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  tilt = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v";
+      type = "gem";
+    };
+    version = "2.0.11";
+  };
+  tty-tree = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0w3nh9yppb7zaswa7d9hnhf6k64z5d3jd8xvpyg2mjfrzcw9rbgs";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  tzinfo = {
+    dependencies = ["concurrent-ruby"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5";
+      type = "gem";
+    };
+    version = "2.0.5";
+  };
+  zeitwerk = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv";
+      type = "gem";
+    };
+    version = "2.6.6";
+  };
+  zip_folder = {
+    dependencies = ["rubyzip"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1884a1ixy7bzm9yp8cjikhdfcn8205p4fsjq894ilby8i1whl58k";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+}

pkgs/applications/networking/instant-messengers/qq/default.nix

@@ -20,15 +20,15 @@
 }:
 
 let
-  version = "3.0.0-565";
+  version = "3.0.0-571";
   srcs = {
     x86_64-linux = fetchurl {
-      url = "https://dldir1.qq.com/qqfile/qq/QQNT/64bd2578/linuxqq_${version}_amd64.deb";
+      url = "https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_${version}_amd64.deb";
-      sha256 = "sha256-IfBbheVwg4b5PuLX9bzqSuTcElxNaV3tmbGd3v/NkCY=";
+      sha256 = "sha256-8KcUhZwgeFzGyrQITWnJUzEPGZOCj0LIHLmRuKqkgmQ=";
     };
     aarch64-linux = fetchurl {
-      url = "https://dldir1.qq.com/qqfile/qq/QQNT/64bd2578/linuxqq_${version}_arm64.deb";
+      url = "https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_${version}_arm64.deb";
-      sha256 = "sha256-6IlAJdPknaQzOE48sdxb5QbB+ZF1xKstF3ARGHM30GY=";
+      sha256 = "sha256-LvE+Pryq4KLu+BFYVrGiTwBdgOrBguPHQd73MMFlfiY=";
     };
   };
   src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

pkgs/applications/networking/n8n/node-packages.nix

@@ -67,13 +67,13 @@ let
         sha512 = "ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA==";
       };
     };
-    "@azure/core-lro-2.4.0" = {
+    "@azure/core-lro-2.5.0" = {
       name = "_at_azure_slash_core-lro";
       packageName = "@azure/core-lro";
-      version = "2.4.0";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.4.0.tgz";
+        url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.0.tgz";
-        sha512 = "F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ==";
+        sha512 = "Vsd5Sl04RG/p5ui/p0dAFMov5I/W4dmRjOrtWGXVs4vY/hNMPefiFH7cZEOr+1u0XrBKkpvt634IyUUD9bVRuQ==";
       };
     };
     "@azure/core-paging-1.4.0" = {
@@ -175,13 +175,13 @@ let
         sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA==";
       };
     };
-    "@azure/msal-browser-2.32.1" = {
+    "@azure/msal-browser-2.32.2" = {
       name = "_at_azure_slash_msal-browser";
       packageName = "@azure/msal-browser";
-      version = "2.32.1";
+      version = "2.32.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.1.tgz";
+        url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.2.tgz";
-        sha512 = "2G3B12ZEIpiimi6/Yqq7KLk4ud1zZWoHvVd2kJ2VthN1HjMsZjdMUxeHkwMWaQ6RzO6mv9rZiuKmRX64xkXW9g==";
+        sha512 = "1YqGzXtPG3QrZPFBKaMWr2WQdukDj+PelqUCv351+p+hlw/AhdRrb8haY73/iqkhT6Cdrbnh7sL4gikVsF4O1g==";
       };
     };
     "@azure/msal-common-7.6.0" = {
@@ -193,22 +193,22 @@ let
         sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q==";
       };
     };
-    "@azure/msal-common-9.0.1" = {
+    "@azure/msal-common-9.0.2" = {
       name = "_at_azure_slash_msal-common";
       packageName = "@azure/msal-common";
-      version = "9.0.1";
+      version = "9.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.1.tgz";
+        url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.2.tgz";
-        sha512 = "eNNHIW/cwPTZDWs9KtYgb1X6gtQ+cC+FGX2YN+t4AUVsBdUbqlMTnUs6/c/VBxC2AAGIhgLREuNnO3F66AN2zQ==";
+        sha512 = "qzwxuF8kZAp+rNUactMCgJh8fblq9D4lSqrrIxMDzLjgSZtjN32ix7r/HBe8QdOr76II9SVVPcMkX4sPzPfQ7w==";
       };
     };
-    "@azure/msal-node-1.14.5" = {
+    "@azure/msal-node-1.14.6" = {
       name = "_at_azure_slash_msal-node";
       packageName = "@azure/msal-node";
-      version = "1.14.5";
+      version = "1.14.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.5.tgz";
+        url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.6.tgz";
-        sha512 = "NcVdMfn8Z3ogN+9RjOSF7uwf2Gki5DEJl0BdDSL83KUAgVAobtkZi5W8EqxbJLrTO/ET0jv5DregrcR5qg2pEA==";
+        sha512 = "em/qqFL5tLMxMPl9vormAs13OgZpmQoJbiQ/GlWr+BA77eCLoL+Ehr5xRHowYo+LFe5b+p+PJVkRvT+mLvOkwA==";
       };
     };
     "@azure/storage-blob-12.12.0" = {
@@ -265,13 +265,13 @@ let
         sha512 = "OcwLfZXdQ1OHrLiIcKCn7MqZ7nx205CMKlhe+vL88pe2ymhT9+2P+QhwkYGxMICj8TDHyp8HFKVwpiisUT7iEQ==";
       };
     };
-    "@codemirror/language-6.3.2" = {
+    "@codemirror/language-6.4.0" = {
       name = "_at_codemirror_slash_language";
       packageName = "@codemirror/language";
-      version = "6.3.2";
+      version = "6.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@codemirror/language/-/language-6.3.2.tgz";
+        url = "https://registry.npmjs.org/@codemirror/language/-/language-6.4.0.tgz";
-        sha512 = "g42uHhOcEMAXjmozGG+rdom5UsbyfMxQFh7AbkeoaNImddL6Xt4cQDL0+JxmG7+as18rUAvZaqzP/TjsciVIrA==";
+        sha512 = "Wzb7GnNj8vnEtbPWiOy9H0m1fBtE28kepQNGLXekU2EEZv43BF865VKITUn+NoV8OpW6gRtvm29YEhqm46927Q==";
       };
     };
     "@codemirror/lint-6.1.0" = {
@@ -292,13 +292,13 @@ let
         sha512 = "69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA==";
       };
     };
-    "@codemirror/view-6.7.2" = {
+    "@codemirror/view-6.7.3" = {
       name = "_at_codemirror_slash_view";
       packageName = "@codemirror/view";
-      version = "6.7.2";
+      version = "6.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@codemirror/view/-/view-6.7.2.tgz";
+        url = "https://registry.npmjs.org/@codemirror/view/-/view-6.7.3.tgz";
-        sha512 = "HeK2GyycxceaQVyvYVYXmn1vUKYYBsHCcfGRSsFO+3fRRtwXx2STK0YiFBmiWx2vtU9gUAJgIUXUN8a0osI8Ng==";
+        sha512 = "Lt+4POnhXrZFfHOdPzXEHxrzwdy7cjqYlMkOWvoFGi6/bAsjzlFfr0NY3B15B/PGx+cDFgM1hlc12wvYeZbGLw==";
       };
     };
     "@colors/colors-1.5.0" = {
@@ -499,22 +499,22 @@ let
         sha512 = "3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw==";
       };
     };
-    "@lezer/javascript-1.4.0" = {
+    "@lezer/javascript-1.4.1" = {
       name = "_at_lezer_slash_javascript";
       packageName = "@lezer/javascript";
-      version = "1.4.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.0.tgz";
+        url = "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.1.tgz";
-        sha512 = "MQ3oLJGEtpUgZ03LOLI60tDnjSkKO6h9hZSe31qJ1UQV+I9bpv3pwSnPUnX0+e+3E1PBVkox0GB2/MXkxg0M2w==";
+        sha512 = "Hqx36DJeYhKtdpc7wBYPR0XF56ZzIp0IkMO/zNNj80xcaFOV4Oj/P7TQc/8k2TxNhzl7tV5tXS8ZOCPbT4L3nA==";
       };
     };
-    "@lezer/lr-1.2.5" = {
+    "@lezer/lr-1.3.0" = {
       name = "_at_lezer_slash_lr";
       packageName = "@lezer/lr";
-      version = "1.2.5";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.2.5.tgz";
+        url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.0.tgz";
-        sha512 = "f9319YG1A/3ysgUE3bqCHEd7g+3ZZ71MWlwEc42mpnLVYXgfJJgtu1XAyBB4Kz8FmqmnFe9caopDqKeMMMAU6g==";
+        sha512 = "rpvS+WPS/PlbJCiW+bzXPbIFIRXmzRiTEDzMvrvgpED05w5ZQO59AzH3BJen2AnHuJIlP3DcJRjsKLTrkknUNA==";
       };
     };
     "@mapbox/node-pre-gyp-1.0.10" = {
@@ -607,13 +607,13 @@ let
         sha512 = "OWhCpdu4QqggOPX1YPZ4XVmLLRX+lhGjXV6RNA7sogOwLqlEmSslnN/lhR5dkhcWZbKWBQH29YCrB3LDPRu/IA==";
       };
     };
-    "@oclif/core-1.23.2" = {
+    "@oclif/core-1.24.0" = {
       name = "_at_oclif_slash_core";
       packageName = "@oclif/core";
-      version = "1.23.2";
+      version = "1.24.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@oclif/core/-/core-1.23.2.tgz";
+        url = "https://registry.npmjs.org/@oclif/core/-/core-1.24.0.tgz";
-        sha512 = "NdaOaUDTRc6g1yTkOAKiEVOiQhc5CNcWNXa0QF4IS4yTjNqp4DOzgtF9Dwe585nPEKzSbTBiz1wyLOa4qIHSRQ==";
+        sha512 = "J41suyV4fLfLcRRySZdtgFYSjIlpYqD90SY01Fm4+ZJUMcfDh/eQAD4sogyYOsIT0bfEzYOyYCjmfHmgcoX5aA==";
       };
     };
     "@oclif/errors-1.3.6" = {
@@ -661,13 +661,13 @@ let
         sha512 = "IMsTN1dXEXaOSre27j/ywGbBjrzx0FNd1XmuhCWCB9NTPrhWI1Ifbz+YLSEcstfQfocYsrbrIessxXb2oon4lA==";
       };
     };
-    "@opentelemetry/api-1.3.0" = {
+    "@opentelemetry/api-1.4.0" = {
       name = "_at_opentelemetry_slash_api";
       packageName = "@opentelemetry/api";
-      version = "1.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.3.0.tgz";
+        url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.0.tgz";
-        sha512 = "YveTnGNsFFixTKJz09Oi4zYkiLT5af3WpZDu4aIUM7xX+2bHAkOJayFTVQd6zB8kkWPpbua4Ha6Ql00grdLlJQ==";
+        sha512 = "IgMK9i3sFGNUqPMbjABm0G26g0QCKCUBfglhQ7rQq6WcxbKfEHRcmwsoER4hZcuYqJgkYn2OeuoJIv7Jsftp7g==";
       };
     };
     "@rudderstack/rudder-sdk-node-1.0.6" = {
@@ -706,49 +706,49 @@ let
         sha512 = "gW69MEamZ4wk1OsOq1nG1jcyhXIQcnrsX5JwixVw/9xaiav8TCyjESAruu1Rz9yyInhgBXxkNwMeygKnN2uxNA==";
       };
     };
-    "@sentry/core-7.29.0" = {
+    "@sentry/core-7.30.0" = {
       name = "_at_sentry_slash_core";
       packageName = "@sentry/core";
-      version = "7.29.0";
+      version = "7.30.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry/core/-/core-7.29.0.tgz";
+        url = "https://registry.npmjs.org/@sentry/core/-/core-7.30.0.tgz";
-        sha512 = "+e9aIp2ljtT4EJq3901z6TfEVEeqZd5cWzbKEuQzPn2UO6If9+Utd7kY2Y31eQYb4QnJgZfiIEz1HonuYY6zqQ==";
+        sha512 = "NeLigkBlpcK63ymM63GoIHurml6V3BUe1Vi+trwm4/qqOTzT7PQhvdJCX+o3+atzRBH+zdb6kd4VWx44Oye3KA==";
       };
     };
-    "@sentry/integrations-7.29.0" = {
+    "@sentry/integrations-7.30.0" = {
       name = "_at_sentry_slash_integrations";
       packageName = "@sentry/integrations";
-      version = "7.29.0";
+      version = "7.30.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.29.0.tgz";
+        url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.30.0.tgz";
-        sha512 = "BkZe3ALij320VtC5bNkeSz3OUhT9oxZsj2lf5rCuRFqcqw4tvVNADF/Y98mf0L4VCy582M9MlNXmwfewJjxGOA==";
+        sha512 = "KU8TnJm1Yldxnhdu/EZcIGXU9ptGQPk6ot4smcNx/mKsy575VrDdyVDx8uIYURWyfsg7eOayt6VdC7ISSODp8A==";
       };
     };
-    "@sentry/node-7.29.0" = {
+    "@sentry/node-7.30.0" = {
       name = "_at_sentry_slash_node";
       packageName = "@sentry/node";
-      version = "7.29.0";
+      version = "7.30.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry/node/-/node-7.29.0.tgz";
+        url = "https://registry.npmjs.org/@sentry/node/-/node-7.30.0.tgz";
-        sha512 = "s/bN/JS5gPTmwzVms4FtI5YNYtC9aGY4uqdx/llVrIiVv7G6md/oJJzKtO1C4dt6YshjGjSs5KCpEn1NM4+1iA==";
+        sha512 = "YYasu6C3I0HBP4N1oc/ed2nunxhGJgtAWaKwq3lo8uk3uF6cB1A8+2e0CpjzU5ejhbaFPUBxHyj4th39Bvku/w==";
       };
     };
-    "@sentry/types-7.29.0" = {
+    "@sentry/types-7.30.0" = {
       name = "_at_sentry_slash_types";
       packageName = "@sentry/types";
-      version = "7.29.0";
+      version = "7.30.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry/types/-/types-7.29.0.tgz";
+        url = "https://registry.npmjs.org/@sentry/types/-/types-7.30.0.tgz";
-        sha512 = "DmoEpoqHPty3VxqubS/5gxarwebHRlcBd/yuno+PS3xy++/i9YPjOWLZhU2jYs1cW68M9R6CcCOiC9f2ckJjdw==";
+        sha512 = "l4A86typvt/SfWh5JffpdxNGkg5EEA8m35BzpIcKmCAQZUDmnb4b478r8jdD2uuOjLmPNmZr1tifdRW4NCLuxQ==";
       };
     };
-    "@sentry/utils-7.29.0" = {
+    "@sentry/utils-7.30.0" = {
       name = "_at_sentry_slash_utils";
       packageName = "@sentry/utils";
-      version = "7.29.0";
+      version = "7.30.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.29.0.tgz";
+        url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.30.0.tgz";
-        sha512 = "ICcBwTiBGK8NQA8H2BJo0JcMN6yCeKLqNKNMVampRgS6wSfSk1edvcTdhRkW3bSktIGrIPZrKskBHyMwDGF2XQ==";
+        sha512 = "tSlBhr5u/LdE2emxIDTDmjmyRr99GnZGIAh5GwRxUgeDQ3VEfNUFlyFodBCbZ6yeYTYd6PWNih5xoHn1+Rf3Sw==";
       };
     };
     "@servie/events-1.0.0" = {
@@ -1498,13 +1498,13 @@ let
         sha512 = "9cYNccliXZDByFsFliVwk5GvTq058Fj513CiR4E60ndDwmuXzTJEp/Bp8FyuRmGyYupLjHLs+JA9/CBoVS4/NQ==";
       };
     };
-    "aws-sdk-2.1290.0" = {
+    "aws-sdk-2.1293.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.1290.0";
+      version = "2.1293.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1290.0.tgz";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1293.0.tgz";
-        sha512 = "qRrXLgK4FpkdxeagjrHuhtEEvYrvRbddTBg1I7KBuMCIhXHzSS3nEUmdZjdyMuQJEvt0BCJjwVkNh8e/5TauDQ==";
+        sha512 = "Wq4zPwJsrYLerXkWzllrTky3DM/Gwg8rKmC/79cDckGzDT8vZ2w/JfI5lW94ckRHjbqQXalChMH3GmWp0sV29Q==";
       };
     };
     "aws-sign2-0.7.0" = {
@@ -1813,13 +1813,13 @@ let
         sha512 = "EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg==";
       };
     };
-    "bson-4.7.1" = {
+    "bson-4.7.2" = {
       name = "bson";
       packageName = "bson";
-      version = "4.7.1";
+      version = "4.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bson/-/bson-4.7.1.tgz";
+        url = "https://registry.npmjs.org/bson/-/bson-4.7.2.tgz";
-        sha512 = "XkuFtlCzi0WSy8D6PMhvrQ/q8VlZHN/2bJ/shJglwuA6TPD2ZP/hHLB7iDxOEWVINHN/UVTxP4pqZqOKMXPIXg==";
+        sha512 = "Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ==";
       };
     };
     "buffer-4.9.2" = {
@@ -2623,13 +2623,13 @@ let
         sha512 = "s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg==";
       };
     };
-    "cron-parser-4.7.0" = {
+    "cron-parser-4.7.1" = {
       name = "cron-parser";
       packageName = "cron-parser";
-      version = "4.7.0";
+      version = "4.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.0.tgz";
+        url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.1.tgz";
-        sha512 = "BdAELR+MCT2ZWsIBhZKDuUqIUCBjHHulPJnm53OfdRLA4EWBjva3R+KM5NeidJuGsNXdEcZkjC7SCnkW5rAFSA==";
+        sha512 = "WguFaoQ0hQ61SgsCZLHUcNbAvlK0lypKXu62ARguefYmjzaOXIVRNrAmyXzabTwUn4sQvQLkk6bjH+ipGfw8bA==";
       };
     };
     "cross-spawn-4.0.2" = {
@@ -3289,13 +3289,13 @@ let
         sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==";
       };
     };
-    "es-abstract-1.21.0" = {
+    "es-abstract-1.21.1" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.21.0";
+      version = "1.21.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.0.tgz";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz";
-        sha512 = "GUGtW7eXQay0c+PRq0sGIKSdaBorfVqsCMhGHo4elP7YVqZu9nCZS4UkK4gv71gOWNMra/PaSKD3ao1oWExO0g==";
+        sha512 = "QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==";
       };
     };
     "es-aggregate-error-1.0.9" = {
@@ -5404,13 +5404,13 @@ let
         sha512 = "X2U5Wx0YmK0rXFbk67ASMeqYIkZ6E5vY7pNWRKtnNzqjvdYYG8xtPDpCnuUEnPU9vlgNev+JoSrcaKSUaNvfsw==";
       };
     };
-    "libphonenumber-js-1.10.16" = {
+    "libphonenumber-js-1.10.18" = {
       name = "libphonenumber-js";
       packageName = "libphonenumber-js";
-      version = "1.10.16";
+      version = "1.10.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.16.tgz";
+        url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.18.tgz";
-        sha512 = "ga6F+8WSmMprzIKvRoeL/iAvkZWSdEpYCDISnXIiQTXw7sezfk+J9IHwzjK3b+6QvyZK8Gjjzjl3Hp+B5lpUXg==";
+        sha512 = "NS4ZEgNhwbcPz1gfSXCGFnQm0xEiyTSPRthIuWytDzOiEG9xnZ2FbLyfJC4tI2BMAAXpoWbNxHYH75pa3Dq9og==";
       };
     };
     "libpq-1.8.12" = {
@@ -5818,15 +5818,6 @@ let
         sha512 = "uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==";
       };
     };
-    "lru-cache-4.1.5" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "4.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz";
-        sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
-      };
-    };
     "lru-cache-5.1.1" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -5845,6 +5836,15 @@ let
         sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==";
       };
     };
+    "lru-cache-7.14.1" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "7.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz";
+        sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==";
+      };
+    };
     "lru-memoizer-2.1.4" = {
       name = "lru-memoizer";
       packageName = "lru-memoizer";
@@ -6430,13 +6430,13 @@ let
         sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
       };
     };
-    "n8n-core-0.150.0" = {
+    "n8n-core-0.150.1" = {
       name = "n8n-core";
       packageName = "n8n-core";
-      version = "0.150.0";
+      version = "0.150.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.150.0.tgz";
+        url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.150.1.tgz";
-        sha512 = "nSPvZWo1crZoNIDhzqvJbYN1P+EMYKAy10FGxLHu7w2AMBD3IFdVWT1JlYNBMW9aO4NSs0i/Q0NBrA/krSbhoA==";
+        sha512 = "75S8iJuy2TaxcBO82Pi72tprlKzJa57k1QOoxU34rCKAGfUVzBrmx8qbI+V/2oVAFmcsByp5s8XCbGrOkj8Z2Q==";
       };
     };
     "n8n-design-system-0.50.1" = {
@@ -6448,40 +6448,40 @@ let
         sha512 = "v7eVGosiF2K6aboKS8cydyS+3Brj118iDlAmkgvyla8QT5QV3PBtNEluuCIH8ySdTOGs3TtWzGXSNTdpTZ+rqg==";
       };
     };
-    "n8n-editor-ui-0.176.1" = {
+    "n8n-editor-ui-0.176.2" = {
       name = "n8n-editor-ui";
       packageName = "n8n-editor-ui";
-      version = "0.176.1";
+      version = "0.176.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.176.1.tgz";
+        url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.176.2.tgz";
-        sha512 = "ySWUKs096wybHDvoFcxKuR3uX5JHwPMWJUwzNFRpN4+bhy7a2SKkA8QAfeWIBPybgng6GgTA6IqPWbZ7LZ+xYQ==";
+        sha512 = "amkHuLTMiBwUwHQbC31NIdhmizIVgXvw2yztiSqvdbFHNmuJG05QcQAeFexK+JA3HBx+RWKAWUsvSMc9Nw53rw==";
       };
     };
-    "n8n-nodes-base-0.208.1" = {
+    "n8n-nodes-base-0.208.2" = {
       name = "n8n-nodes-base";
       packageName = "n8n-nodes-base";
-      version = "0.208.1";
+      version = "0.208.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.208.1.tgz";
+        url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.208.2.tgz";
-        sha512 = "uGx2g5xrh6WZ1u8TzyiGHQt4v52LhULLmN6WGOS57Jg658FYiMfWe7soR1iEMTWk/FD2DPQNvoJptGqN7TLlCQ==";
+        sha512 = "711ujlB9GnKG8Mv0h5Q/ffETZ6CLArO0XSQRAVCqTZEQ8XdhmpWHn/eCHU2bxMEO9y7yy1E3VLL4MDwQaY8d0g==";
       };
     };
-    "n8n-workflow-0.132.0" = {
+    "n8n-workflow-0.132.1" = {
       name = "n8n-workflow";
       packageName = "n8n-workflow";
-      version = "0.132.0";
+      version = "0.132.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.132.0.tgz";
+        url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.132.1.tgz";
-        sha512 = "DmWxbOV0Z/8VBNVzQz1O5sD0q82DSxFgJvVRnqL8HayALiiLQbNvgniU2BYJz2SSgKzcpkXX4ZIt94CESqD50w==";
+        sha512 = "ksrKfg9hVrVQ5H6jvm7+7YGghVO38VU6ZoaMQWalLfiZHR/W+9l8F3yxdfLX1o8Ewbk0za5dm5tT5E/fc7+Gwg==";
       };
     };
-    "named-placeholders-1.1.2" = {
+    "named-placeholders-1.1.3" = {
       name = "named-placeholders";
       packageName = "named-placeholders";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.2.tgz";
+        url = "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.3.tgz";
-        sha512 = "wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA==";
+        sha512 = "eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w==";
       };
     };
     "nan-2.17.0" = {
@@ -6583,13 +6583,13 @@ let
         sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==";
       };
     };
-    "node-abi-3.30.0" = {
+    "node-abi-3.31.0" = {
       name = "node-abi";
       packageName = "node-abi";
-      version = "3.30.0";
+      version = "3.31.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-abi/-/node-abi-3.30.0.tgz";
+        url = "https://registry.npmjs.org/node-abi/-/node-abi-3.31.0.tgz";
-        sha512 = "qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw==";
+        sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ==";
       };
     };
     "node-abort-controller-3.0.1" = {
@@ -6709,6 +6709,15 @@ let
         sha512 = "EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ==";
       };
     };
+    "nodemailer-6.9.0" = {
+      name = "nodemailer";
+      packageName = "nodemailer";
+      version = "6.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.0.tgz";
+        sha512 = "jFaCEGTeT3E/m/5R2MHWiyQH3pSARECRUDM+1hokOYc3lQAAG7ASuy+2jIsYVf+RVa9zePopSQwKNVFH8DKUpA==";
+      };
+    };
     "nopt-5.0.0" = {
       name = "nopt";
       packageName = "nopt";
@@ -7843,13 +7852,13 @@ let
         sha512 = "RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==";
       };
     };
-    "punycode-2.1.1" = {
+    "punycode-2.2.0" = {
       name = "punycode";
       packageName = "punycode";
-      version = "2.1.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
+        url = "https://registry.npmjs.org/punycode/-/punycode-2.2.0.tgz";
-        sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
+        sha512 = "LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw==";
       };
     };
     "python-struct-1.1.3" = {
@@ -10414,10 +10423,10 @@ in
   n8n = nodeEnv.buildNodePackage {
     name = "n8n";
     packageName = "n8n";
-    version = "0.210.1";
+    version = "0.210.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/n8n/-/n8n-0.210.1.tgz";
+      url = "https://registry.npmjs.org/n8n/-/n8n-0.210.2.tgz";
-      sha512 = "mlcpNkl8Nwq1K05rz1BGzoPhaqxsbKOPs4ixr8iueeADfkomsD7ywsRQ6lgHd2GuOGRzXg/upazU/I7exMTj2w==";
+      sha512 = "VLlKjcyQnioWgdfZXN4zoQYGy42x7U2LK8zehx+XsjG6wJhrlYyCKzQpECjYZZhzBCYLCvgEzi+mNbqdLDlX7w==";
     };
     dependencies = [
       (sources."@acuminous/bitsyntax-0.1.2" // {
@@ -10455,7 +10464,7 @@ in
         ];
       })
       sources."@azure/core-http-compat-1.3.0"
-      (sources."@azure/core-lro-2.4.0" // {
+      (sources."@azure/core-lro-2.5.0" // {
         dependencies = [
           sources."tslib-2.4.1"
         ];
@@ -10507,15 +10516,16 @@ in
         ];
       })
       sources."@azure/ms-rest-nodeauth-3.1.1"
-      (sources."@azure/msal-browser-2.32.1" // {
+      (sources."@azure/msal-browser-2.32.2" // {
         dependencies = [
-          sources."@azure/msal-common-9.0.1"
+          sources."@azure/msal-common-9.0.2"
         ];
       })
       sources."@azure/msal-common-7.6.0"
-      (sources."@azure/msal-node-1.14.5" // {
+      (sources."@azure/msal-node-1.14.6" // {
         dependencies = [
-          sources."@azure/msal-common-9.0.1"
+          sources."@azure/msal-common-9.0.2"
+          sources."jsonwebtoken-9.0.0"
         ];
       })
       (sources."@azure/storage-blob-12.12.0" // {
@@ -10529,10 +10539,10 @@ in
       sources."@codemirror/autocomplete-6.4.0"
       sources."@codemirror/commands-6.1.3"
       sources."@codemirror/lang-javascript-6.1.2"
-      sources."@codemirror/language-6.3.2"
+      sources."@codemirror/language-6.4.0"
       sources."@codemirror/lint-6.1.0"
       sources."@codemirror/state-6.2.0"
-      sources."@codemirror/view-6.7.2"
+      sources."@codemirror/view-6.7.3"
       sources."@colors/colors-1.5.0"
       sources."@curlconverter/yargs-0.0.2"
       sources."@curlconverter/yargs-parser-0.0.1"
@@ -10567,8 +10577,8 @@ in
       sources."@kwsites/promise-deferred-1.1.1"
       sources."@lezer/common-1.0.2"
       sources."@lezer/highlight-1.1.3"
-      sources."@lezer/javascript-1.4.0"
+      sources."@lezer/javascript-1.4.1"
-      sources."@lezer/lr-1.2.5"
+      sources."@lezer/lr-1.3.0"
       sources."@mapbox/node-pre-gyp-1.0.10"
       (sources."@n8n_io/license-sdk-1.8.0" // {
         dependencies = [
@@ -10591,7 +10601,7 @@ in
           sources."tslib-2.4.1"
         ];
       })
-      (sources."@oclif/core-1.23.2" // {
+      (sources."@oclif/core-1.24.0" // {
         dependencies = [
           sources."supports-color-8.1.1"
           sources."tslib-2.4.1"
@@ -10614,7 +10624,7 @@ in
         ];
       })
       sources."@oclif/screen-3.0.4"
-      sources."@opentelemetry/api-1.3.0"
+      sources."@opentelemetry/api-1.4.0"
       (sources."@rudderstack/rudder-sdk-node-1.0.6" // {
         dependencies = [
           sources."bull-3.29.3"
@@ -10633,11 +10643,11 @@ in
           sources."domhandler-5.0.3"
         ];
       })
-      sources."@sentry/core-7.29.0"
+      sources."@sentry/core-7.30.0"
-      sources."@sentry/integrations-7.29.0"
+      sources."@sentry/integrations-7.30.0"
-      sources."@sentry/node-7.29.0"
+      sources."@sentry/node-7.30.0"
-      sources."@sentry/types-7.29.0"
+      sources."@sentry/types-7.30.0"
-      sources."@sentry/utils-7.29.0"
+      sources."@sentry/utils-7.30.0"
       sources."@servie/events-1.0.0"
       sources."@sqltools/formatter-1.2.5"
       sources."@techteamer/ocsp-1.0.0"
@@ -10757,7 +10767,7 @@ in
       })
       sources."available-typed-arrays-1.0.5"
       sources."avsc-5.7.7"
-      (sources."aws-sdk-2.1290.0" // {
+      (sources."aws-sdk-2.1293.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."events-1.1.1"
@@ -10818,7 +10828,7 @@ in
       sources."brace-expansion-2.0.1"
       sources."braces-3.0.2"
       sources."browser-request-0.3.3"
-      sources."bson-4.7.1"
+      sources."bson-4.7.2"
       sources."buffer-5.7.1"
       sources."buffer-equal-constant-time-1.0.1"
       sources."buffer-from-1.1.2"
@@ -10827,7 +10837,7 @@ in
       sources."bufferutil-4.0.7"
       (sources."bull-4.10.2" // {
         dependencies = [
-          sources."cron-parser-4.7.0"
+          sources."cron-parser-4.7.1"
         ];
       })
       sources."busboy-1.6.0"
@@ -11016,7 +11026,7 @@ in
       sources."entities-2.2.0"
       sources."env-paths-2.2.1"
       sources."err-code-2.0.3"
-      sources."es-abstract-1.21.0"
+      sources."es-abstract-1.21.1"
       sources."es-aggregate-error-1.0.9"
       sources."es-array-method-boxes-properly-1.0.0"
       sources."es-set-tostringtag-2.0.1"
@@ -11319,7 +11329,7 @@ in
       sources."levn-0.3.0"
       sources."libbase64-1.2.1"
       sources."libmime-5.2.0"
-      sources."libphonenumber-js-1.10.16"
+      sources."libphonenumber-js-1.10.18"
       sources."libpq-1.8.12"
       sources."libqp-2.0.1"
       sources."lie-3.1.1"
@@ -11378,6 +11388,7 @@ in
       (sources."mailparser-3.6.3" // {
         dependencies = [
           sources."linkify-it-4.0.1"
+          sources."nodemailer-6.8.0"
         ];
       })
       sources."mailsplit-5.4.0"
@@ -11510,32 +11521,32 @@ in
         ];
       })
       sources."mz-2.7.0"
-      (sources."n8n-core-0.150.0" // {
+      (sources."n8n-core-0.150.1" // {
         dependencies = [
           sources."concat-stream-2.0.0"
           sources."readable-stream-3.6.0"
         ];
       })
       sources."n8n-design-system-0.50.1"
-      (sources."n8n-editor-ui-0.176.1" // {
+      (sources."n8n-editor-ui-0.176.2" // {
         dependencies = [
           sources."luxon-2.5.2"
         ];
       })
-      (sources."n8n-nodes-base-0.208.1" // {
+      (sources."n8n-nodes-base-0.208.2" // {
         dependencies = [
           sources."chokidar-3.5.2"
           sources."luxon-2.3.2"
         ];
       })
-      (sources."n8n-workflow-0.132.0" // {
+      (sources."n8n-workflow-0.132.1" // {
         dependencies = [
           sources."luxon-2.3.2"
         ];
       })
-      (sources."named-placeholders-1.1.2" // {
+      (sources."named-placeholders-1.1.3" // {
         dependencies = [
-          sources."lru-cache-4.1.5"
+          sources."lru-cache-7.14.1"
         ];
       })
       sources."nan-2.17.0"
@@ -11553,7 +11564,7 @@ in
           sources."tslib-2.4.1"
         ];
       })
-      sources."node-abi-3.30.0"
+      sources."node-abi-3.31.0"
       sources."node-abort-controller-3.0.1"
       sources."node-addon-api-4.3.0"
       sources."node-ensure-0.0.0"
@@ -11582,7 +11593,7 @@ in
       sources."node-rsa-1.1.1"
       sources."node-ssh-12.0.5"
       sources."nodeify-1.0.1"
-      sources."nodemailer-6.8.0"
+      sources."nodemailer-6.9.0"
       sources."nopt-5.0.0"
       sources."normalize-path-3.0.0"
       sources."normalize-wheel-1.0.1"
@@ -11752,7 +11763,7 @@ in
           sources."pump-2.0.1"
         ];
       })
-      sources."punycode-2.1.1"
+      sources."punycode-2.2.0"
       sources."python-struct-1.1.3"
       sources."qs-6.11.0"
       sources."query-string-7.1.3"

pkgs/applications/radio/gridtracker/default.nix

@@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, nwjs
+}:
+
+stdenv.mkDerivation rec {
+  pname = "gridtracker";
+  version = "1.22.1226";
+
+  src = fetchFromGitLab {
+    owner = "gridtracker.org";
+    repo = "gridtracker";
+    rev = "v${version}";
+    sha256 = "sha256-/Noc2aqHBjphX6RDqxQBI/OOKZgEnOndn0daBt1edXM=";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace '$(DESTDIR)/usr' '$(DESTDIR)/'
+    substituteInPlace gridtracker.sh \
+      --replace "exec nw" "exec ${nwjs}/bin/nw" \
+      --replace "/usr/share/gridtracker" "$out/share/gridtracker"
+    substituteInPlace gridtracker.desktop \
+      --replace "/usr/share/gridtracker/gridview.png" "$out/share/gridtracker/gridview.png"
+  '';
+
+  makeFlags = [ "DESTDIR=$(out)" "NO_DIST_INSTALL=1" ];
+
+  meta = with lib; {
+    description = "An amateur radio companion to WSJT-X or JTDX";
+    longDescription = ''
+      GridTracker listens to traffic from WSJT-X/JTDX, displays it on a map,
+      and has a sophisticated alerting and filtering system for finding and
+      working interesting stations. It also will upload QSO records to multiple
+      logging frameworks including Logbook of the World.
+    '';
+    homepage = "https://gridtracker.org";
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ melling ];
+  };
+}

pkgs/applications/radio/grig/default.nix

@@ -0,0 +1,36 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, wrapGAppsHook
+, gtk2
+, hamlib_4 }:
+
+stdenv.mkDerivation rec {
+  pname = "grig";
+  version = "0.9.0";
+
+  src = fetchFromGitHub {
+    owner = "fillods";
+    repo = "grig";
+    rev = "GRIG-${lib.replaceStrings ["."] ["_"] version}";
+    sha256 = "sha256-OgIgHW9NMW/xSSti3naIR8AQWUtNSv5bYdOcObStBlM=";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];
+  buildInputs = [ hamlib_4 gtk2 ];
+
+  meta = with lib; {
+    description = "A simple Ham Radio control (CAT) program based on Hamlib";
+    longDescription = ''
+      Grig is a graphical user interface for the Ham Radio Control Libraries.
+      It is intended to be simple and generic, presenting the user with the
+      same interface regardless of which radio they use.
+    '';
+    homepage = "https://groundstation.sourceforge.net/grig/";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ melling ];
+  };
+}

pkgs/applications/science/electronics/fritzing/default.nix

@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     cp -a ${parts}/* parts/
   '';
 
-  NIX_CFLAGS_COMPILE = "-I${quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip";
+  NIX_CFLAGS_COMPILE = "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip";
 
   qmakeFlags = [
     "phoenix.pro"

pkgs/applications/version-management/git-bug-migration/default.nix

@@ -0,0 +1,34 @@
+{ lib, buildGoModule, fetchFromGitHub, git }:
+buildGoModule rec {
+  pname = "git-bug-migration";
+  version = "0.3.4";
+
+  src = fetchFromGitHub {
+    owner = "MichaelMure";
+    repo = "git-bug-migration";
+    rev = "v${version}";
+    hash = "sha256-IOBgrU3C0ZHD2wx9LRVgKEJzDlUj6z2UXlHGU3tdTdQ=";
+  };
+
+  vendorSha256 = "sha256-Hid9OK91LNjLmDHam0ZlrVQopVOsqbZ+BH2rfQi5lS0=";
+
+  checkInputs = [ git ];
+
+  ldflags = [
+    "-X main.GitExactTag=${version}"
+    "-X main.GitLastTag=${version}"
+  ];
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+    git config --global user.name 'Nixpkgs Test User'
+    git config --global user.email 'nobody@localhost'
+  '';
+
+  meta =  with lib; {
+    description = "Tool for upgrading repositories using git-bug to new versions";
+    homepage = "https://github.com/MichaelMure/git-bug-migration";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ DeeUnderscore ];
+  };
+}

pkgs/applications/version-management/git-bug/default.nix

@@ -1,42 +1,43 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
 
 buildGoModule rec {
   pname = "git-bug";
-  version = "0.8.0"; # the `rev` below pins the version of the source to get
+  version = "0.8.0";
-  rev = "v0.8.0";
 
   src = fetchFromGitHub {
-    inherit rev;
     owner = "MichaelMure";
     repo = "git-bug";
+    rev = "v${version}";
     sha256 = "12byf6nsamwz0ssigan1z299s01cyh8bhgj86bibl90agd4zs9n8";
   };
 
   vendorSha256 = "sha256-32kNDoBE50Jx1Ef9YwhDk7nd3CaTSnHPlu7PgWPUGfE=";
 
+  nativeBuildInputs = [ installShellFiles ];
+
   doCheck = false;
 
+  excludedPackages = [ "doc" "misc" ];
+
   ldflags = [
-    "-X github.com/MichaelMure/git-bug/commands.GitCommit=${rev}"
+    "-X github.com/MichaelMure/git-bug/commands.GitCommit=v${version}"
     "-X github.com/MichaelMure/git-bug/commands.GitLastTag=${version}"
     "-X github.com/MichaelMure/git-bug/commands.GitExactTag=${version}"
   ];
 
   postInstall = ''
-    install -D -m 0644 misc/completion/bash/git-bug "$out/share/bash-completion/completions/git-bug"
+    installShellCompletion \
-    install -D -m 0644 misc/completion/zsh/git-bug "$out/share/zsh/site-functions/git-bug"
+      --bash misc/completion/bash/git-bug \
-    install -D -m 0644 -t "$out/share/man/man1" doc/man/*
+      --zsh misc/completion/zsh/git-bug \
+      --fish misc/completion/fish/git-bug
 
-    # not sure why the following executables are in $out/bin/
+    installManPage doc/man/*
-    rm -f $out/bin/cmd
-    rm -f $out/bin/completion
-    rm -f $out/bin/doc
   '';
 
   meta = with lib; {
     description = "Distributed bug tracker embedded in Git";
     homepage = "https://github.com/MichaelMure/git-bug";
-    license = licenses.gpl3Only;
+    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ royneary ];
+    maintainers = with maintainers; [ royneary DeeUnderscore ];
   };
 }

pkgs/applications/version-management/git-machete/default.nix

@@ -12,13 +12,13 @@
 
 buildPythonApplication rec {
   pname = "git-machete";
-  version = "3.13.2";
+  version = "3.14.0";
 
   src = fetchFromGitHub {
     owner = "virtuslab";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-K9oJvvESHWCJFSgqycA7N4cG7WbTDwXZExnXUs4Qlp8=";
+    hash = "sha256-UgWPm4IxzydO1qqhjbodUIAmqIhTIITYARMvw+F9T7E=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

pkgs/build-support/agda/default.nix

@@ -22,13 +22,14 @@ let
       unwrapped = Agda;
       tests = { inherit (nixosTests) agda; };
     };
+    inherit (Agda) meta;
   } ''
     mkdir -p $out/bin
     makeWrapper ${Agda}/bin/agda $out/bin/agda \
       --add-flags "--with-compiler=${ghc}/bin/ghc" \
       --add-flags "--library-file=${library-file}" \
       --add-flags "--local-interfaces"
-    makeWrapper ${Agda}/bin/agda-mode $out/bin/agda-mode
+    ln -s ${Agda}/bin/agda-mode $out/bin/agda-mode
     ''; # Local interfaces has been added for now: See https://github.com/agda/agda/issues/4526
 
   withPackages = arg: if builtins.isAttrs arg then withPackages' arg else withPackages' { pkgs = arg; };

pkgs/development/libraries/agda/cubical/default.nix

@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "cubical";
-  version = "0.4prec3e097a";
+  version = "0.4";
 
   src = fetchFromGitHub {
     repo = pname;
     owner = "agda";
-    rev = "c3e097a98c84083550fa31101346bd42a0501add";
+    rev = "v${version}";
-    sha256 = "101cni2a9xvia1mglb94z61jm8xk9r5kc1sn44cri0qsmk1zbqxs";
+    hash = "sha256-bnHz5uZXZnn1Zd36tq/veA4yT7dhJ1c+AYpgdDfSRzE=";
   };
 
   LC_ALL = "en_US.UTF-8";

pkgs/development/libraries/calcium/default.nix

@@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, mpir
+, gmp
+, mpfr
+, flint
+, arb
+, antic
+}:
+
+stdenv.mkDerivation rec {
+  pname = "calcium";
+  version = "0.4.1";
+
+  src = fetchFromGitHub {
+    owner = "fredrik-johansson";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-Ony2FGMnWyNqD7adGeiDtysHNZ4ClMvQ1ijVPSHJmyc=";
+  };
+
+  buildInputs = [ mpir gmp mpfr flint arb antic ];
+
+  configureFlags = [
+    "--with-gmp=${gmp}"
+    "--with-mpir=${mpir}"
+    "--with-mpfr=${mpfr}"
+    "--with-flint=${flint}"
+    "--with-arb=${arb}"
+    "--with-antic=${antic}"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    description = "A C library for exact computation with real and complex numbers";
+    homepage = "https://fredrikj.net/calcium/";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ smasher164 ];
+    platforms = platforms.unix;
+  };
+}

pkgs/development/libraries/libva/utils.nix

@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libva-utils";
-  version = "2.16.0";
+  version = "2.17.0";
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "libva-utils";
     rev    = version;
-    sha256 = "sha256-6gjOheppHGTHUoT+pVJ6Tfgj9qDB+/MjaI3Win4ULRM=";
+    sha256 = "sha256-zv62Jznifw3GG5n8CIE7rJu0POx0aT8btO9N6CoBfAE=";
   };
 
   nativeBuildInputs = [ meson ninja pkg-config ];

pkgs/development/libraries/nvidia-vaapi-driver/default.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nvidia-vaapi-driver";
-  version = "unstable-2022-12-01";
+  version = "0.0.8";
 
   src = fetchFromGitHub {
     owner = "elFarto";
     repo = pname;
-    rev = "6e8b0d067c52c3a7e0c3de745337e6e733c59207";
+    rev = "v${version}";
-    sha256 = "sha256-HL/sjNPsLhzl8NZ/9l8in27vUrMkyUIcNr/+HhiaTT0=";
+    sha256 = "sha256-RMFkClaWoFNeSglV5otS/rzI6JNQMiAHDzH3DoEHA5I=";
   };
 
   nativeBuildInputs = [

pkgs/development/libraries/protobufc/default.nix

@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , autoreconfHook
 , pkg-config
 , protobuf
@@ -19,6 +20,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-TJCLzxozuZ8ynrBQ2lKyk03N+QA/lbOwywUjDUdTlbM=";
   };
 
+  patches = [
+    # https://github.com/protobuf-c/protobuf-c/pull/534
+    (fetchpatch {
+      url = "https://github.com/protobuf-c/protobuf-c/commit/a6c9ea5207aeac61c57b446ddf5a6b68308881d8.patch";
+      hash = "sha256-wTb8+YbvrCrOVpgthI5SJdG/CpQcOzCX4Bv47FPY804=";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   buildInputs = [ protobuf zlib ];

pkgs/development/libraries/qt-6/modules/qtbase.nix

@@ -32,7 +32,6 @@
 , libsepol
 , vulkan-headers
 , vulkan-loader
-, valgrind
 , libthai
 , libdrm
 , libdatrie
@@ -143,7 +142,6 @@ stdenv.mkDerivation rec {
     libthai
     libdrm
     libdatrie
-    valgrind
     udev
     # Text rendering
     fontconfig
@@ -276,6 +274,9 @@ stdenv.mkDerivation rec {
       -e "/^bindir=/ c bindir=$dev/bin"
 
     patchShebangs $out $dev
+
+    # QTEST_ASSERT and other macros keeps runtime reference to qtbase.dev
+    substituteInPlace "$dev/include/QtTest/qtestassert.h" --replace "__FILE__" "__BASE_FILE__"
   '';
 
   dontStrip = debugSymbols;

pkgs/development/libraries/qt-6/modules/qtdeclarative.nix

@@ -36,8 +36,4 @@ qtModule {
     "bin/qmlscene"
     "bin/qmltestrunner"
   ];
-
-  NIX_CFLAGS_COMPILE = [
-    "-fmacro-prefix-map=${qtbase.dev}=qtbase.dev"
-  ];
 }

pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix

@@ -11,5 +11,4 @@ qtModule {
   qtInputs = [ qtbase qtdeclarative qtsvg ];
   propagatedBuildInputs = [ hunspell ];
   nativeBuildInputs = [ pkg-config ];
-  outputs = [ "out" ];
 }

pkgs/development/libraries/quazip/default.nix

@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
 
   dontWrapQtApps = true;
 
+  outputs = [ "out" "dev" ];
+
   meta = with lib; {
     description = "Provides access to ZIP archives from Qt programs";
     license = licenses.lgpl21Plus;

pkgs/development/node-packages/overrides.nix

@@ -581,8 +581,7 @@ final: prev: {
   typescript-language-server = prev.typescript-language-server.override {
     nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
     postInstall = ''
-      wrapProgram "$out/bin/typescript-language-server" \
+      ${pkgs.xorg.lndir}/bin/lndir ${final.typescript} $out
-        --suffix PATH : ${lib.makeBinPath [ final.typescript ]}
     '';
   };
 

pkgs/development/ocaml-modules/bjack/default.nix

@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, libsamplerate, libjack2 }:
+{ lib, stdenv, buildDunePackage, fetchFromGitHub, Accelerate, CoreAudio, dune-configurator, libsamplerate, libjack2 }:
 
 buildDunePackage rec {
   pname = "bjack";
@@ -13,7 +13,7 @@ buildDunePackage rec {
     sha256 = "1gf31a8i9byp6npn0x6gydcickn6sf5dnzmqr2c1b9jn2nl7334c";
   };
 
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreAudio ];
   propagatedBuildInputs = [ libsamplerate libjack2 ];
 
   meta = with lib; {

pkgs/development/ocaml-modules/cohttp/async.nix

@@ -28,6 +28,8 @@ buildDunePackage {
     src
     ;
 
+  duneVersion = "3";
+
   buildInputs = [ ppx_sexp_conv ];
 
   propagatedBuildInputs = [

pkgs/development/ocaml-modules/cohttp/default.nix

@@ -9,6 +9,7 @@ buildDunePackage rec {
   version = "5.0.0";
 
   minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-${version}.tbz";

pkgs/development/ocaml-modules/cohttp/lwt-unix.nix

@@ -9,6 +9,8 @@ buildDunePackage {
   pname = "cohttp-lwt-unix";
   inherit (cohttp-lwt) version src;
 
+  duneVersion = "3";
+
   buildInputs = [ cmdliner ppx_sexp_conv ];
 
   propagatedBuildInputs = [

pkgs/development/ocaml-modules/cohttp/lwt.nix

@@ -7,6 +7,8 @@ buildDunePackage {
     src
     ;
 
+  duneVersion = "3";
+
   buildInputs = [ ppx_sexp_conv ];
 
   propagatedBuildInputs = [

pkgs/development/ocaml-modules/cohttp/mirage.nix

@@ -10,6 +10,8 @@ buildDunePackage {
 
   inherit (cohttp) version src;
 
+  duneVersion = "3";
+
   nativeBuildInputs = [ ppx_sexp_conv ];
 
   propagatedBuildInputs = [

pkgs/development/ocaml-modules/conduit/async.nix

@@ -9,6 +9,8 @@ buildDunePackage {
     src
     ;
 
+  duneVersion = "3";
+
   buildInputs = [ ppx_sexp_conv ppx_here ];
 
   propagatedBuildInputs = [

pkgs/development/ocaml-modules/conduit/default.nix

@@ -7,7 +7,8 @@ buildDunePackage rec {
   pname = "conduit";
   version = "6.1.0";
 
-  minimalOCamlVersion = "4.03";
+  minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz";

pkgs/development/ocaml-modules/conduit/lwt-unix.nix

@@ -6,6 +6,7 @@
 buildDunePackage {
   pname = "conduit-lwt-unix";
   inherit (conduit-lwt) version src;
+  duneVersion = "3";
 
   buildInputs = [ ppx_sexp_conv ];
 

pkgs/development/ocaml-modules/conduit/lwt.nix

@@ -3,6 +3,7 @@
 buildDunePackage {
   pname = "conduit-lwt";
   inherit (conduit) version src;
+  duneVersion = "3";
 
   buildInputs = [ ppx_sexp_conv ];
 

pkgs/development/ocaml-modules/conduit/mirage.nix

@@ -9,6 +9,7 @@ buildDunePackage {
   pname = "conduit-mirage";
 
   inherit (conduit-lwt) version src;
+  duneVersion = "3";
 
   nativeBuildInputs = [ ppx_sexp_conv ];
 

pkgs/development/ocaml-modules/curly/default.nix

@@ -6,13 +6,13 @@ buildDunePackage rec {
   pname = "curly";
   version = "0.2.0";
 
-  minimumOCamlVersion = "4.02";
+  minimalOCamlVersion = "4.02";
 
-  useDune2 = true;
+  duneVersion = "3";
 
   src = fetchurl {
     url = "https://github.com/rgrinberg/curly/releases/download/${version}/curly-${version}.tbz";
-    sha256 = "07vqdrklar0d5i83ip7sjw2c1v18a9m3anw07vmi5ay29pxzal6k";
+    hash = "sha256-01D1+03CqxLrPoBbNWpSKOzABJf63DhQLA1kRWdueB8=";
   };
 
   propagatedBuildInputs = [ result ];

pkgs/development/ocaml-modules/dns/certify.nix

@@ -8,6 +8,7 @@ buildDunePackage {
   pname = "dns-certify";
 
   inherit (dns) version src;
+  duneVersion = "3";
 
   propagatedBuildInputs = [
     dns

pkgs/development/ocaml-modules/dns/cli.nix

@@ -10,6 +10,7 @@ buildDunePackage {
   minimalOCamlVersion = "4.08";
 
   inherit (dns) version src;
+  duneVersion = "3";
 
   # no need to propagate as this is primarily
   # an executable package

pkgs/development/ocaml-modules/dns/client.nix

@@ -10,6 +10,7 @@
 buildDunePackage {
   pname = "dns-client";
   inherit (dns) src version;
+  duneVersion = "3";
 
   propagatedBuildInputs = [ cstruct fmt logs dns randomconv domain-name ipaddr
                             lwt mirage-random mirage-time mirage-clock

pkgs/development/ocaml-modules/dns/default.nix

@@ -5,13 +5,14 @@
 
 buildDunePackage rec {
   pname = "dns";
-  version = "6.3.0";
+  version = "6.4.1";
 
   minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz";
-    sha256 = "sha256-3EAjenN9EIi4PsXCZDevmEPDaS4xbESbcbB7pFgwc1E=";
+    hash = "sha256-omG0fKZAHGc+4ERC8cyK47jeEkiBZkB+1fz46j6SDno=";
   };
 
   propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ];

pkgs/development/ocaml-modules/dns/dnssec.nix

@@ -7,6 +7,7 @@ buildDunePackage {
   pname = "dnssec";
 
   inherit (dns) version src;
+  duneVersion = "3";
 
   propagatedBuildInputs = [
     cstruct

pkgs/development/ocaml-modules/dns/mirage.nix

@@ -4,6 +4,7 @@ buildDunePackage {
   pname = "dns-mirage";
 
   inherit (dns) version src;
+  duneVersion = "3";
 
   propagatedBuildInputs = [
     dns

pkgs/development/ocaml-modules/dns/resolver.nix

@@ -8,6 +8,7 @@ buildDunePackage {
   pname = "dns-resolver";
 
   inherit (dns) version src;
+  duneVersion = "3";
 
   propagatedBuildInputs = [
     dns

pkgs/development/ocaml-modules/dns/server.nix

@@ -7,6 +7,7 @@ buildDunePackage {
   pname = "dns-server";
 
   inherit (dns) version src;
+  duneVersion = "3";
 
   propagatedBuildInputs = [
     dns

pkgs/development/ocaml-modules/dns/stub.nix

@@ -7,6 +7,7 @@ buildDunePackage {
   pname = "dns-stub";
 
   inherit (dns) version src;
+  duneVersion = "3";
 
   propagatedBuildInputs = [
     dns

pkgs/development/ocaml-modules/dns/tsig.nix

@@ -4,6 +4,7 @@ buildDunePackage {
   pname = "dns-tsig";
 
   inherit (dns) version src;
+  duneVersion = "3";
 
   propagatedBuildInputs = [
     mirage-crypto

pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix

@@ -1,6 +1,10 @@
 { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, AudioToolbox
 , ffmpeg-base ? callPackage ./base.nix { }
-, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg }:
+, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg
+, stdenv
+, VideoToolbox
+}:
 
 buildDunePackage {
   pname = "ffmpeg-av";
@@ -10,7 +14,7 @@ buildDunePackage {
   inherit (ffmpeg-base) version src useDune2;
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ];
   propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ];
 
   doCheck = true;

pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix

@@ -1,6 +1,9 @@
 { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, AudioToolbox
 , ffmpeg-base ? callPackage ./base.nix { }
 , ffmpeg-avutil, ffmpeg
+, stdenv
+, VideoToolbox
 }:
 
 buildDunePackage {
@@ -11,7 +14,8 @@ buildDunePackage {
   inherit (ffmpeg-base) version src useDune2;
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator ]
+    ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ];
   propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ];
 
   doCheck = true;

pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix

@@ -1,6 +1,14 @@
 { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, AppKit
+, AudioToolbox
+, Cocoa
+, CoreImage
+, ForceFeedback
 , ffmpeg-base ? callPackage ./base.nix { }
 , ffmpeg-av, ffmpeg
+, OpenGL
+, stdenv
+, VideoToolbox
 }:
 
 buildDunePackage {
@@ -11,7 +19,8 @@ buildDunePackage {
   inherit (ffmpeg-base) version src useDune2;
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator ]
+    ++ lib.optionals stdenv.isDarwin [ AppKit AudioToolbox Cocoa CoreImage ForceFeedback OpenGL VideoToolbox ];
   propagatedBuildInputs = [ ffmpeg-av ffmpeg.dev ];
 
   doCheck = true;

pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix

@@ -1,6 +1,11 @@
 { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, AppKit
+, CoreImage
 , ffmpeg-base ? callPackage ./base.nix { }
 , ffmpeg-avutil, ffmpeg
+, OpenGL
+, stdenv
+, VideoToolbox
 }:
 
 buildDunePackage {
@@ -11,7 +16,8 @@ buildDunePackage {
   inherit (ffmpeg-base) version src useDune2;
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator ]
+    ++ lib.optionals stdenv.isDarwin [ AppKit CoreImage OpenGL VideoToolbox ];
   propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ];
 
   doCheck = true;

pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix

@@ -1,4 +1,5 @@
-{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+{ lib, stdenv, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, AudioToolbox, VideoToolbox
 , ffmpeg-base ? callPackage ./base.nix { }
 , ffmpeg
 }:
@@ -11,7 +12,7 @@ buildDunePackage {
   inherit (ffmpeg-base) version src useDune2;
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ];
   propagatedBuildInputs = [ ffmpeg.dev ];
 
   doCheck = true;

pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix

@@ -1,6 +1,8 @@
 { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
 , ffmpeg-base ? callPackage ./base.nix { }
 , ffmpeg-avutil, ffmpeg-avcodec, ffmpeg
+, stdenv
+, VideoToolbox
 }:
 
 buildDunePackage {
@@ -11,7 +13,7 @@ buildDunePackage {
   inherit (ffmpeg-base) version src useDune2;
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ];
   propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ];
 
   doCheck = true;

pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix

@@ -1,6 +1,8 @@
 { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
 , ffmpeg-base ? callPackage ./base.nix { }
 , ffmpeg-avutil, ffmpeg
+, stdenv
+, VideoToolbox
 }:
 
 buildDunePackage {
@@ -11,7 +13,7 @@ buildDunePackage {
   inherit (ffmpeg-base) version src useDune2;
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ];
   propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ];
 
   doCheck = true;

pkgs/development/ocaml-modules/git/default.nix

@@ -11,6 +11,7 @@ buildDunePackage rec {
   version = "3.10.1";
 
   minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";

pkgs/development/ocaml-modules/graphql/cohttp.nix

@@ -8,7 +8,7 @@ buildDunePackage rec {
 
   inherit (graphql) version src;
 
-  useDune2 = true;
+  duneVersion = "3";
 
   nativeBuildInputs = [ ocaml-crunch ];
   propagatedBuildInputs = [ astring cohttp digestif graphql ocplib-endian ];

pkgs/development/ocaml-modules/graphql/default.nix

@@ -5,6 +5,8 @@ buildDunePackage rec {
 
   inherit (graphql_parser) version src;
 
+  duneVersion = "3";
+
   propagatedBuildInputs = [ graphql_parser rresult yojson ];
 
   checkInputs = [ alcotest ];

pkgs/development/ocaml-modules/graphql/lwt.nix

@@ -5,6 +5,8 @@ buildDunePackage rec {
 
   inherit (graphql) version src;
 
+  duneVersion = "3";
+
   propagatedBuildInputs = [ graphql ocaml_lwt ];
 
   checkInputs = [ alcotest ];

pkgs/development/ocaml-modules/graphql/parser.nix

@@ -5,6 +5,7 @@ buildDunePackage rec {
   version = "0.14.0";
 
   minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
   src = fetchurl {
     url = "https://github.com/andreas/ocaml-graphql-server/releases/download/${version}/graphql-${version}.tbz";

pkgs/development/ocaml-modules/gstreamer/default.nix

@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, glib, gst_all_1 }:
+{ lib, stdenv, buildDunePackage, fetchFromGitHub, dune-configurator, AppKit, Foundation, pkg-config, glib, gst_all_1 }:
 
 buildDunePackage rec {
   pname = "gstreamer";
@@ -12,7 +12,7 @@ buildDunePackage rec {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AppKit Foundation ];
   propagatedBuildInputs = [ glib.dev gst_all_1.gstreamer.dev gst_all_1.gst-plugins-base ];
 
   CFLAGS_COMPILE = [

pkgs/development/ocaml-modules/happy-eyeballs/default.nix

@@ -4,13 +4,13 @@
 
 buildDunePackage rec {
   pname = "happy-eyeballs";
-  version = "0.3.0";
+  version = "0.4.0";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
     url = "https://github.com/roburio/happy-eyeballs/releases/download/v${version}/happy-eyeballs-${version}.tbz";
-    sha256 = "17mnid1gvq1ml1zmqzn0m6jmrqw4kqdrjqrdsrphl5kxxyhs03m6";
+    hash = "sha256-gR9q4J/DnYJz8oYmk/wy17h4F6wxbllba/gkor5i1nQ=";
   };
 
   strictDeps = true;

pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix

@@ -17,6 +17,7 @@ buildDunePackage {
   inherit (happy-eyeballs) src version;
 
   minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
   strictDeps = true;
 

pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix

@@ -19,6 +19,7 @@ buildDunePackage {
   inherit (happy-eyeballs) src version;
 
   minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
   strictDeps = true;
 

pkgs/development/ocaml-modules/labltk/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, makeWrapper, fetchzip, ocaml, findlib, tcl, tk }:
+{ stdenv, lib, makeWrapper, fetchzip, Cocoa, ocaml, findlib, tcl, tk }:
 
 let
  params =
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   pname = "ocaml${ocaml.version}-labltk";
 
   nativeBuildInputs = [ ocaml findlib makeWrapper ];
-  buildInputs = [ tcl tk ];
+  buildInputs = [ tcl tk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
 
   configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ];
   dontAddPrefix = true;

pkgs/development/ocaml-modules/letsencrypt/app.nix

@@ -17,12 +17,12 @@
 
 buildDunePackage {
   pname = "letsencrypt-app";
+  duneVersion = "3";
+  minimalOCamlVersion = "4.08";
 
   inherit (letsencrypt)
     src
     version
-    useDune2
-    minimumOCamlVersion
     ;
 
   buildInputs = [

pkgs/development/ocaml-modules/letsencrypt/default.nix

@@ -25,11 +25,11 @@ buildDunePackage rec {
 
   src = fetchurl {
     url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz";
-    sha256 = "f90875f5c9bdcab4c8be5ec7ebe9ea763030fa708e02857300996bb16e7c2070";
+    hash = "sha256-+Qh19cm9yrTIvl7H6+nqdjAw+nCOAoVzAJlrsW58IHA=";
   };
 
-  minimumOCamlVersion = "4.08";
+  minimalOCamlVersion = "4.08";
-  useDune2 = true;
+  duneVersion = "3";
 
   buildInputs = [
     fmt

pkgs/development/ocaml-modules/letsencrypt/dns.nix

@@ -11,12 +11,12 @@
 
 buildDunePackage {
   pname = "letsencrypt-dns";
+  duneVersion = "3";
+  minimalOCamlVersion = "4.08";
 
   inherit (letsencrypt)
     version
     src
-    useDune2
-    minimumOCamlVersion
     ;
 
   propagatedBuildInputs = [

pkgs/development/ocaml-modules/mimic/default.nix

@@ -8,6 +8,7 @@ buildDunePackage rec {
   version = "0.0.6";
 
   minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
   src = fetchurl {
     url = "https://github.com/dinosaure/mimic/releases/download/${version}/mimic-${version}.tbz";

pkgs/development/ocaml-modules/mimic/happy-eyeballs.nix

@@ -6,6 +6,7 @@ buildDunePackage {
   inherit (mimic) src version;
 
   minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
   strictDeps = true;
 

pkgs/development/ocaml-modules/ocaml-libvirt/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, libvirt, autoreconfHook, pkg-config, ocaml, findlib, perl }:
+{ lib, stdenv, fetchFromGitLab, libvirt, AppKit, Foundation, autoreconfHook, pkg-config, ocaml, findlib, perl }:
 
 lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02")
   "libvirt is not available for OCaml ${ocaml.version}"
@@ -18,6 +18,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ocaml ];
 
+  buildInputs = lib.optionals stdenv.isDarwin [
+    Foundation
+    AppKit
+  ];
+
   strictDeps = true;
 
   buildFlags = [ "all" "opt" "CPPFLAGS=-Wno-error" ];

pkgs/development/ocaml-modules/resto/acl.nix

@@ -5,6 +5,7 @@ buildDunePackage {
   inherit (resto) src version meta doCheck;
 
   minimalOCamlVersion = "4.10";
+  duneVersion = "3";
 
   propagatedBuildInputs = [
     resto

pkgs/development/ocaml-modules/resto/cohttp-client.nix

@@ -9,6 +9,7 @@
 buildDunePackage {
   pname = "resto-cohttp-client";
   inherit (resto) src version meta doCheck;
+  duneVersion = "3";
 
   propagatedBuildInputs = [
     resto

pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix

@@ -13,6 +13,7 @@
 buildDunePackage {
   pname = "resto-cohttp-self-serving-client";
   inherit (resto) src version meta doCheck;
+  duneVersion = "3";
 
   propagatedBuildInputs = [
     resto

pkgs/development/ocaml-modules/resto/cohttp-server.nix

@@ -12,6 +12,7 @@
 buildDunePackage {
   pname = "resto-cohttp-server";
   inherit (resto) src version meta doCheck;
+  duneVersion = "3";
 
   propagatedBuildInputs = [
     resto

pkgs/development/ocaml-modules/resto/cohttp.nix

@@ -3,6 +3,7 @@
 buildDunePackage {
   pname = "resto-cohttp";
   inherit (resto) src version meta doCheck;
+  duneVersion = "3";
 
   propagatedBuildInputs = [
     resto

pkgs/development/ocaml-modules/resto/default.nix

@@ -3,6 +3,7 @@
 buildDunePackage rec {
   pname = "resto";
   version = "1.0";
+  duneVersion = "3";
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "resto";

pkgs/development/ocaml-modules/resto/directory.nix

@@ -3,6 +3,7 @@
 buildDunePackage {
   pname = "resto-directory";
   inherit (resto) src version meta doCheck;
+  duneVersion = "3";
 
   propagatedBuildInputs = [
     resto

pkgs/development/ocaml-modules/resto/json.nix

@@ -3,6 +3,7 @@
 buildDunePackage {
   pname = "resto-json";
   inherit (resto) src version meta doCheck;
+  duneVersion = "3";
 
   propagatedBuildInputs = [
     resto

pkgs/development/ocaml-modules/telegraml/default.nix

@@ -10,6 +10,7 @@
 buildDunePackage rec {
   pname = "telegraml";
   version = "unstable-2021-06-17";
+  duneVersion = "3";
 
   src = fetchFromGitHub {
     owner = "nv-vn";

pkgs/development/ocaml-modules/webmachine/default.nix

@@ -6,9 +6,9 @@
 buildDunePackage rec {
   pname = "webmachine";
   version = "0.7.0";
-  useDune2 = true;
+  duneVersion = "3";
 
-  minimumOCamlVersion = "4.04";
+  minimalOCamlVersion = "4.03";
 
   src = fetchFromGitHub {
     owner = "inhabitedtype";
@@ -24,7 +24,7 @@ buildDunePackage rec {
   doCheck = true;
 
   meta = {
-    inherit (src.meta) homepage;
+    homepage = "https://github.com/inhabitedtype/ocaml-webmachine";
     license = lib.licenses.bsd3;
     description = "A REST toolkit for OCaml";
     maintainers = [ lib.maintainers.vbgl ];

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

@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "aioaladdinconnect";
-  version = "0.1.50";
+  version = "0.1.52";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "AIOAladdinConnect";
     inherit version;
-    hash = "sha256-5IeqIEIQzPq5GkuAf/92J0SBI3Lu1ftJ4UOj4oQLQC4=";
+    hash = "sha256-lpEpdc2izNP1xSnGsG1WMvrRqRToNrLpZn225XnZ+pI=";
   };
 
   propagatedBuildInputs = [

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

@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "aiowebostv";
-  version = "0.2.1";
+  version = "0.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-r/XdxF7/g6uDQIATi/OC6lNTUtBZg1jdgZHZilPPFNc=";
+    hash = "sha256-W9RexBXo0yZStyFEAf7z5ki8tTHkc2RLD3wkX6nQsCE=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/ansible-later/default.nix

@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "ansible-later";
-  version = "3.0.2";
+  version = "3.1.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     owner = "thegeeklab";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-+UcrkITiRrAKo5MFcsSqEpvzuo4Czv+rHMWsnuvVx5o=";
+    hash = "sha256-Mi8CJ3OU27zJ2PNkrqu0BytTI5ZaQezi8DIW3yXCzDI=";
   };
 
   postPatch = ''

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

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "gitpython";
-  version = "3.1.29";
+  version = "3.1.30";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "gitpython-developers";
     repo = "GitPython";
     rev = version;
-    hash = "sha256-RNDBoGWnkirPZjxn5oqH3zwYqVFLedNrSRpZOHU0j+w=";
+    hash = "sha256-odtYBQLscncdC+NbDC9D84QQveDoimkQ6RzUQLJgizI=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/google-cloud-language/default.nix

@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-language";
-  version = "2.7.0";
+  version = "2.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2BVkbQt6y9WGLjFBCt4pXPtGcmcsF8FxThOUIu7CgR8=";
+    hash = "sha256-LEExcED6vlv2Lhto+KyLiz8uyDTa+rHLySUNDZpHGe4=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/google-cloud-pubsub/default.nix

@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-pubsub";
-  version = "2.13.11";
+  version = "2.13.12";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-CFh47PuzmR/qavOgEaot2fVBXRnHYNDemlhSTSqhut4=";
+    hash = "sha256-/qa/3RKWC0SDgDeax/CwiZtSc9Nxm1cHJAKT6si2ecw=";
   };
 
   propagatedBuildInputs = [

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

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pook";
-  version = "1.0.2";
+  version = "1.1.0";
   disabled = pythonOlder "3.5";
 
   src = fetchFromGitHub {
     owner = "h2non";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
-    sha256 = "sha256-4OGcnuajGdBRlXCYwbTK/zLNQRrir60qCYajHRRCpkU=";
+    hash = "sha256-5hVRyZCA5VzufiYh1l9ezob1iuT8/VXhuFjC0OjGsbQ=";
   };
 
   propagatedBuildInputs = [
@@ -36,11 +36,14 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "pook" ];
+  pythonImportsCheck = [
+    "pook"
+  ];
 
   meta = with lib; {
     description = "HTTP traffic mocking and testing made simple in Python";
     homepage = "https://github.com/h2non/pook";
+    changelog = "https://github.com/h2non/pook/blob/v${version}/History.rst";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

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

@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pyinfra";
-  version = "2.6";
+  version = "2.6.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "Fizzadar";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-SNeucJvjnwQ0o+gukXwEKybBaW01hPtYXCFcPeOuXA8=";
+    hash = "sha256-TpO91YVWswcdpV4z9jkxBELwsIIGvlpL3URQTjAAkUs=";
   };
 
   propagatedBuildInputs = [
@@ -63,7 +63,8 @@ buildPythonPackage rec {
       pyinfra automates/provisions/manages/deploys infrastructure. It can be used for
       ad-hoc command execution, service deployment, configuration management and more.
     '';
-    homepage = "https://github.com/Fizzadar/pyinfra";
+    homepage = "https://pyinfra.com";
+    downloadPage = "https://pyinfra.com/Fizzadar/pyinfra/releases";
     changelog = "https://github.com/Fizzadar/pyinfra/blob/v${version}/CHANGELOG.md";
     maintainers = with maintainers; [ totoroot ];
     license = licenses.mit;

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

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pylitterbot";
-  version = "2023.1.0";
+  version = "2023.1.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "natekspencer";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-XUiDZW3r8I8Vyx30UhopQ6S0HpSi0VNgvyu2RMNt2Eg=";
+    hash = "sha256-nWKBbb2S8V81KQihGQYg9GBK97xv5FXuem5pUPB+cew=";
   };
 
   nativeBuildInputs = [

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

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pytibber";
-  version = "0.26.7";
+  version = "0.26.8";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "pyTibber";
     rev = "refs/tags/${version}";
-    hash = "sha256-T2J31+H/cO000qi2AlEGaFtAu0fl7u1LAA/QUxRAiK8=";
+    hash = "sha256-q3mlAlcetg01vHxxSIZjyDPxAqUWcdyzK4qsVmQAreA=";
   };
 
   propagatedBuildInputs = [

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

@@ -2,7 +2,6 @@
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
-, makeDesktopItem
 , atomicwrites
 , chardet
 , cloudpickle
@@ -105,16 +104,6 @@ buildPythonPackage rec {
   # There is no test for spyder
   doCheck = false;
 
-  desktopItem = makeDesktopItem {
-    name = "Spyder";
-    exec = "spyder";
-    icon = "spyder";
-    comment = "Scientific Python Development Environment";
-    desktopName = "Spyder";
-    genericName = "Python IDE";
-    categories = [ "Development" "IDE" ];
-  };
-
   postPatch = ''
     # Remove dependency on pyqtwebengine
     # This is still part of the pyqt 5.11 version we have in nixpkgs
@@ -128,11 +117,6 @@ buildPythonPackage rec {
     # Add Python libs to env so Spyder subprocesses
     # created to run compute kernels don't fail with ImportErrors
     wrapProgram $out/bin/spyder --prefix PYTHONPATH : "$PYTHONPATH"
-
-    # Create desktop item
-    mkdir -p $out/share/icons
-    cp spyder/images/spyder.svg $out/share/icons
-    cp -r $desktopItem/share/applications/ $out/share
   '';
 
   dontWrapQtApps = true;