Merge staging-next into staging

nixos/modules/misc/version.nix

@@ -89,6 +89,12 @@ in
 
     stateVersion = mkOption {
       type = types.str;
+      # TODO Remove this and drop the default of the option so people are forced to set it.
+      # Doing this also means fixing the comment in nixos/modules/testing/test-instrumentation.nix
+      apply = v:
+        lib.warnIf (options.system.stateVersion.highestPrio == (lib.mkOptionDefault { }).priority)
+          "system.stateVersion is not set, defaulting to ${v}. Read why this matters on https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersion."
+          v;
       default = cfg.release;
       defaultText = literalExpression "config.${opt.release}";
       description = lib.mdDoc ''
@@ -149,14 +155,6 @@ in
       "os-release".text = attrsToText osReleaseContents;
     };
 
-    # We have to use `warnings` because when warning in the default of the option
-    # the warning would also be shown when building the manual since the manual
-    # has to evaluate the default.
-    #
-    # TODO Remove this and drop the default of the option so people are forced to set it.
-    # Doing this also means fixing the comment in nixos/modules/testing/test-instrumentation.nix
-    warnings = lib.optional (options.system.stateVersion.highestPrio == (lib.mkOptionDefault { }).priority)
-      "system.stateVersion is not set, defaulting to ${config.system.stateVersion}. Read why this matters on https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersion.";
   };
 
   # uses version info nixpkgs, which requires a full nixpkgs path

nixos/modules/module-list.nix

@@ -1313,6 +1313,7 @@
   ./tasks/filesystems/btrfs.nix
   ./tasks/filesystems/cifs.nix
   ./tasks/filesystems/ecryptfs.nix
+  ./tasks/filesystems/envfs.nix
   ./tasks/filesystems/exfat.nix
   ./tasks/filesystems/ext.nix
   ./tasks/filesystems/f2fs.nix

nixos/modules/profiles/macos-builder.nix

@@ -11,6 +11,17 @@ in
 
 { imports = [
     ../virtualisation/qemu-vm.nix
+
+    # Avoid a dependency on stateVersion
+    {
+      disabledModules = [
+        ../virtualisation/nixos-containers.nix
+        ../services/x11/desktop-managers/xterm.nix
+      ];
+      config = {
+      };
+      options.boot.isContainer = lib.mkOption { default = false; internal = true; };
+    }
   ];
 
   # The builder is not intended to be used interactively
@@ -97,7 +108,14 @@ in
     # To prevent gratuitous rebuilds on each change to Nixpkgs
     nixos.revision = null;
 
-    stateVersion = "22.05";
+    stateVersion = lib.mkDefault (throw ''
+      The macOS linux builder should not need a stateVersion to be set, but a module
+      has accessed stateVersion nonetheless.
+      Please inspect the trace of the following command to figure out which module
+      has a dependency on stateVersion.
+
+        nix-instantiate --attr darwin.builder --show-trace
+    '');
   };
 
   users.users."${user}"= {

nixos/modules/services/backup/borgbackup.nix

@@ -150,8 +150,9 @@ let
         # Ensure that the home directory already exists
         # We can't assert createHome == true because that's not the case for root
         cd "${config.users.users.${cfg.user}.home}"
-        ${install} -d .config/borg
-        ${install} -d .cache/borg
+        # Create each directory separately to prevent root owned parent dirs
+        ${install} -d .config .config/borg
+        ${install} -d .cache .cache/borg
       '' + optionalString (isLocalPath cfg.repo && !cfg.removableDevice) ''
         ${install} -d ${escapeShellArg cfg.repo}
       ''));

nixos/modules/services/matrix/synapse.nix

@@ -507,6 +507,12 @@ in {
                 sqlite3 = null;
                 psycopg2 = "matrix-synapse";
               }.${cfg.settings.database.name};
+              defaultText = lib.literalExpression ''
+                {
+                  sqlite3 = null;
+                  psycopg2 = "matrix-synapse";
+                }.''${cfg.settings.database.name};
+              '';
               description = lib.mdDoc ''
                 Username to connect with psycopg2, set to null
                 when using sqlite3.

nixos/modules/services/misc/nix-daemon.nix

@@ -819,7 +819,7 @@ in
           optionals (pkgs.hostPlatform ? gcc.arch) (
             # a builder can run code for `gcc.arch` and inferior architectures
             [ "gccarch-${pkgs.hostPlatform.gcc.arch}" ] ++
-            map (x: "gccarch-${x}") systems.architectures.inferiors.${pkgs.hostPlatform.gcc.arch}
+            map (x: "gccarch-${x}") (systems.architectures.inferiors.${pkgs.hostPlatform.gcc.arch} or [])
           )
         );
       }

nixos/modules/system/boot/initrd-openvpn.nix

@@ -68,11 +68,8 @@ in
       $out/bin/openvpn --show-gateway
     '';
 
-    # Add `iproute /bin/ip` to the config, to ensure that openvpn
-    # is able to set the routes
     boot.initrd.network.postCommands = ''
-      (cat /etc/initrd.ovpn; echo -e '\niproute /bin/ip') | \
-        openvpn /dev/stdin &
+      openvpn /etc/initrd.ovpn &
     '';
   };
 

nixos/modules/tasks/filesystems/envfs.nix

@@ -0,0 +1,51 @@
+{ pkgs, config, lib, ... }:
+
+let
+  cfg = config.services.envfs;
+  mounts = {
+    "/usr/bin" = {
+      device = "none";
+      fsType = "envfs";
+      options = [
+        "fallback-path=${pkgs.runCommand "fallback-path" {} ''
+          mkdir -p $out
+          ln -s ${pkgs.coreutils}/bin/env $out/env
+          ln -s ${config.system.build.binsh}/bin/sh $out/sh
+        ''}"
+      ];
+    };
+    "/bin" = {
+      device = "/usr/bin";
+      fsType = "none";
+      options = [ "bind" ];
+    };
+  };
+in {
+  options = {
+    services.envfs = {
+      enable = lib.mkEnableOption (lib.mdDoc "Envfs filesystem") // {
+        description = lib.mdDoc ''
+          Fuse filesystem that returns symlinks to executables based on the PATH
+          of the requesting process. This is useful to execute shebangs on NixOS
+          that assume hard coded locations in locations like /bin or /usr/bin
+          etc.
+        '';
+      };
+      package = lib.mkOption {
+        type = lib.types.package;
+        description = lib.mdDoc "Which package to use for the envfs.";
+        default = pkgs.envfs;
+        defaultText = lib.mdDoc "pkgs.envfs";
+      };
+    };
+  };
+  config = lib.mkIf (cfg.enable) {
+    environment.systemPackages = [ cfg.package ];
+    # we also want these mounts in virtual machines.
+    fileSystems = if config.virtualisation ? qemu then lib.mkVMOverride mounts else mounts;
+
+    # We no longer need those when using envfs
+    system.activationScripts.usrbinenv = lib.mkForce "";
+    system.activationScripts.binsh = lib.mkForce "";
+  };
+}

nixos/tests/all-tests.nix

@@ -195,6 +195,7 @@ in {
   engelsystem = handleTest ./engelsystem.nix {};
   enlightenment = handleTest ./enlightenment.nix {};
   env = handleTest ./env.nix {};
+  envfs = handleTest ./envfs.nix {};
   envoy = handleTest ./envoy.nix {};
   ergo = handleTest ./ergo.nix {};
   ergochat = handleTest ./ergochat.nix {};

nixos/tests/envfs.nix

@@ -0,0 +1,42 @@
+import ./make-test-python.nix ({ lib, pkgs, ... }:
+let
+  pythonShebang = pkgs.writeScript "python-shebang" ''
+    #!/usr/bin/python
+    print("OK")
+  '';
+
+  bashShebang = pkgs.writeScript "bash-shebang" ''
+    #!/usr/bin/bash
+    echo "OK"
+  '';
+in
+{
+  name = "envfs";
+  nodes.machine.services.envfs.enable = true;
+
+  testScript = ''
+    start_all()
+    machine.wait_until_succeeds("mountpoint -q /usr/bin/")
+    machine.succeed(
+        "PATH=${pkgs.coreutils}/bin /usr/bin/cp --version",
+        # check fallback paths
+        "PATH= /usr/bin/sh --version",
+        "PATH= /usr/bin/env --version",
+        "PATH= test -e /usr/bin/sh",
+        "PATH= test -e /usr/bin/env",
+        # no stat
+        "! test -e /usr/bin/cp",
+        # also picks up PATH that was set after execve
+        "! /usr/bin/hello",
+        "PATH=${pkgs.hello}/bin /usr/bin/hello",
+    )
+
+    out = machine.succeed("PATH=${pkgs.python3}/bin ${pythonShebang}")
+    print(out)
+    assert out == "OK\n"
+
+    out = machine.succeed("PATH=${pkgs.bash}/bin ${bashShebang}")
+    print(out)
+    assert out == "OK\n"
+  '';
+})

nixos/tests/initrd-network-openvpn/default.nix

@@ -91,6 +91,7 @@ import ../make-test-python.nix ({ lib, ...}:
             config = ''
               dev tun0
               ifconfig 10.8.0.1 10.8.0.2
+              cipher AES-256-CBC
               ${secretblock}
             '';
           };

nixos/tests/initrd-network-openvpn/initrd.ovpn

@@ -3,6 +3,7 @@ dev tun
 ifconfig 10.8.0.2 10.8.0.1
 # Only force VLAN 2 through the VPN
 route 192.168.2.0 255.255.255.0 10.8.0.1
+cipher AES-256-CBC
 secret [inline]
 <secret>
 #

nixos/tests/trafficserver.nix

@@ -172,6 +172,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
         assert re.fullmatch(expected, out) is not None, "no matching logs"
 
         out = json.loads(ats.succeed(f"traffic_logstats -jf {access_log_path}"))
+        assert isinstance(out, dict)
         assert out["total"]["error.total"]["req"] == "0", "unexpected log stat"
   '';
 })

pkgs/applications/editors/cpeditor/default.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cpeditor";
-  version = "6.10.1";
+  version = "6.11.1";
 
   src = fetchFromGitHub {
     owner = "cpeditor";
     repo = "cpeditor";
     rev = version;
-    sha256 = "sha256-SIREoOapaZTLtqi0Z07lKmNqF9a9qIpgGxuhqaY3yfU=";
+    sha256 = "sha256-Uwo7ZE+9yrHV/+D6rvfew2d3ZJbpFOjgek38iYkPppw=";
     fetchSubmodules = true;
   };
 

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

@@ -693,6 +693,10 @@ self: super: {
     configurePhase = "cd vim";
   });
 
+  orgmode = super.orgmode.overrideAttrs (old: {
+    dependencies = with self; [ (nvim-treesitter.withPlugins (p: [ p.org ])) ];
+  });
+
   inherit parinfer-rust;
 
   plenary-nvim = super.plenary-nvim.overrideAttrs (old: {
@@ -715,7 +719,10 @@ self: super: {
 
   # needs  "http" and "json" treesitter grammars too
   rest-nvim = super.rest-nvim.overrideAttrs (old: {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = with self; [
+      plenary-nvim
+      (nvim-treesitter.withPlugins (p: [ p.http p.json ]))
+    ];
   });
 
   skim = buildVimPluginFrom2Nix {

pkgs/applications/emulators/bsnes/ares/002-sips-to-png2icns.patch

@@ -0,0 +1,39 @@
+diff --git a/desktop-ui/GNUmakefile b/desktop-ui/GNUmakefile
+index 4515610d3..916c8fcd8 100644
+--- a/desktop-ui/GNUmakefile
++++ b/desktop-ui/GNUmakefile
+@@ -91,7 +91,7 @@ endif
+ 	cp resource/$(name).plist $(output.path)/$(name).app/Contents/Info.plist
+ 	cp -R $(ares.path)/Shaders $(output.path)/$(name).app/Contents/Resources/
+ 	cp -R $(mia.path)/Database $(output.path)/$(name).app/Contents/Resources/	
+-	sips -s format icns resource/$(name).png --out $(output.path)/$(name).app/Contents/Resources/$(name).icns
++	png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png
+ 	codesign --force --deep --options runtime --entitlements resource/$(name).selfsigned.entitlements --sign - $(output.path)/$(name).app
+ else ifeq ($(platform),windows)
+ 	$(call mkdir,$(output.path)/Shaders/)
+diff --git a/genius/GNUmakefile b/genius/GNUmakefile
+index 5287309a8..8d80f9306 100644
+--- a/genius/GNUmakefile
++++ b/genius/GNUmakefile
+@@ -24,7 +24,7 @@ ifeq ($(platform),macos)
+ 	mkdir -p $(output.path)/$(name).app/Contents/Resources/
+ 	mv $(output.path)/$(name) $(output.path)/$(name).app/Contents/MacOS/$(name)
+ 	cp data/$(name).plist $(output.path)/$(name).app/Contents/Info.plist
+-	sips -s format icns data/$(name).png --$(output.path) $(output.path)/$(name).app/Contents/Resources/$(name).icns
++	png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns data/$(name).png
+ endif
+ 
+ verbose: hiro.verbose nall.verbose all;
+diff --git a/mia/GNUmakefile b/mia/GNUmakefile
+index b6930b6df..7a51b5028 100644
+--- a/mia/GNUmakefile
++++ b/mia/GNUmakefile
+@@ -32,7 +32,7 @@ ifeq ($(platform),macos)
+ 	mkdir -p $(output.path)/$(name).app/Contents/Resources/
+ 	mv $(output.path)/$(name) $(output.path)/$(name).app/Contents/MacOS/$(name)
+ 	cp resource/$(name).plist $(output.path)/$(name).app/Contents/Info.plist
+-	sips -s format icns resource/$(name).png --out $(output.path)/$(name).app/Contents/Resources/$(name).icns
++	png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png
+ endif
+ 
+ verbose: hiro.verbose nall.verbose all;

pkgs/applications/emulators/bsnes/ares/003-fix-darwin-install.patch

@@ -0,0 +1,23 @@
+diff --git a/desktop-ui/GNUmakefile b/desktop-ui/GNUmakefile
+index 916c8fcd8..b767c1335 100644
+--- a/desktop-ui/GNUmakefile
++++ b/desktop-ui/GNUmakefile
+@@ -92,7 +92,6 @@ endif
+ 	cp -R $(ares.path)/Shaders $(output.path)/$(name).app/Contents/Resources/
+ 	cp -R $(mia.path)/Database $(output.path)/$(name).app/Contents/Resources/	
+ 	png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png
+-	codesign --force --deep --options runtime --entitlements resource/$(name).selfsigned.entitlements --sign - $(output.path)/$(name).app
+ else ifeq ($(platform),windows)
+ 	$(call mkdir,$(output.path)/Shaders/)
+ 	$(call mkdir,$(output.path)/Database/)
+@@ -115,8 +114,8 @@ ifeq ($(platform),windows)
+ else ifeq ($(shell id -un),root)
+ 	$(error "make install should not be run as root")
+ else ifeq ($(platform),macos)
+-	mkdir -p ~/Library/Application\ Support/$(name)/
+-	cp -R $(output.path)/$(name).app /Applications/$(name).app
++	mkdir -p $(prefix)/Applications/
++	cp -R $(output.path)/$(name).app $(prefix)/Applications/$(name).app
+ else ifneq ($(filter $(platform),linux bsd),)
+ 	mkdir -p $(prefix)/bin/
+ 	mkdir -p $(prefix)/share/applications/

pkgs/applications/emulators/bsnes/ares/default.nix

@@ -3,6 +3,7 @@
 , fetchFromGitHub
 , pkg-config
 , wrapGAppsHook
+, libicns
 , SDL2
 , alsa-lib
 , gtk3
@@ -15,8 +16,12 @@
 , libpulseaudio
 , openal
 , udev
+, darwin
 }:
 
+let
+  inherit (darwin.apple_sdk_11_0.frameworks) Cocoa OpenAL;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ares";
   version = "130.1";
@@ -31,15 +36,21 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     ./000-dont-rebuild-on-install.patch
     ./001-fix-ruby.patch
+    ./002-sips-to-png2icns.patch
+    ./003-fix-darwin-install.patch
   ];
 
   nativeBuildInputs = [
     pkg-config
     wrapGAppsHook
+  ] ++ lib.optionals stdenv.isDarwin [
+    libicns
   ];
 
   buildInputs = [
     SDL2
+    libao
+  ] ++ lib.optionals stdenv.isLinux [
     alsa-lib
     gtk3
     gtksourceview3
@@ -47,29 +58,36 @@ stdenv.mkDerivation (finalAttrs: {
     libGLU
     libX11
     libXv
-    libao
     libpulseaudio
     openal
     udev
+  ] ++ lib.optionals stdenv.isDarwin [
+    Cocoa
+    OpenAL
   ];
 
   enableParallelBuilding = true;
 
-  makeFlags = [
+  makeFlags = lib.optionals stdenv.isLinux [
     "hiro=gtk3"
+  ] ++ lib.optionals stdenv.isDarwin [
+    "hiro=cocoa"
+    "vulkan=false"
+  ] ++ [
     "local=false"
     "openmp=true"
     "prefix=$(out)"
     "-C desktop-ui"
   ];
 
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.14";
+
   meta = with lib; {
     homepage = "https://ares-emu.net";
     description = "Open-source multi-system emulator with a focus on accuracy and preservation";
     license = licenses.isc;
     maintainers = with maintainers; [ Madouura AndersonTorres ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 })
 # TODO: select between Qt, GTK2 and GTK3
-# TODO: support Darwin

pkgs/applications/networking/freefilesync/default.nix

@@ -9,17 +9,18 @@
 , libssh2
 , openssl
 , wxGTK32
+, gitUpdater
 }:
 
 gcc12Stdenv.mkDerivation rec {
   pname = "freefilesync";
-  version = "11.28";
+  version = "11.29";
 
   src = fetchFromGitHub {
     owner = "hkneptune";
     repo = "FreeFileSync";
     rev = "v${version}";
-    sha256 = "sha256-3eYvXClMdOCdl35S1d7nP2kiYZZOjyydi2gKY62K/qM=";
+    sha256 = "sha256-UQ+CWqtcTwMGUTn6t3N+BkXs4qxddZtxDjcq7nz5F6U=";
   };
 
   # Patches from ROSA Linux
@@ -88,6 +89,10 @@ gcc12Stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "v";
+  };
+
   meta = with lib; {
     description = "Open Source File Synchronization & Backup Software";
     homepage = "https://freefilesync.org";

pkgs/applications/virtualization/colima/default.nix

@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "colima";
-  version = "0.5.0";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "abiosoft";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Ey/h9W1WFMJdO5U9IeHhVTYDEJi8w18h2PY0lB0S/BU=";
+    sha256 = "sha256-xw+Yy9KejVkunOLJdmfXstP7aDrl3j0OZjCaf6pyL1U=";
     # We need the git revision
     leaveDotGit = true;
     postFetch = ''
@@ -28,7 +28,7 @@ buildGoModule rec {
 
   nativeBuildInputs = [ installShellFiles makeWrapper ];
 
-  vendorSha256 = "sha256-v0U7TorUwOtBzBQ/OQQSAX6faDI1IX/IDIJnY8UFsu8=";
+  vendorSha256 = "sha256-Iz1LYL25NpkztTM86zrLwehub8FzO1IlwZqCPW7wDN4=";
 
   CGO_ENABLED = 1;
 

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "commit": "d2f407d64c568ff572505378248cd834f808f6e0",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d2f407d64c568ff572505378248cd834f808f6e0.tar.gz",
-  "sha256": "0agbmi2gjrg5gnp8dy76770lyh3ny42clm55wlr529320wnc14wm",
-  "msg": "Update from Hackage at 2022-12-18T22:10:13Z"
+  "commit": "b88b3496b1b3beb0c706db8a39c0da3396d96f0b",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/b88b3496b1b3beb0c706db8a39c0da3396d96f0b.tar.gz",
+  "sha256": "0gs807cbyi6zyk9bvg5d3wx16575pmgv4j3m8hbz57aa5i71r0nv",
+  "msg": "Update from Hackage at 2022-12-24T13:11:25Z"
 }

pkgs/desktops/gnome/apps/gnome-music/default.nix

@@ -107,6 +107,6 @@ python3.pkgs.buildPythonApplication rec {
     description = "Music player and management application for the GNOME desktop environment";
     maintainers = teams.gnome.members;
     license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

pkgs/desktops/gnome/core/baobab/default.nix

@@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
     homepage = "https://wiki.gnome.org/Apps/DiskUsageAnalyzer";
     license = licenses.gpl2Plus;
     maintainers = teams.gnome.members;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

pkgs/desktops/gnome/core/dconf-editor/default.nix

@@ -73,6 +73,6 @@ stdenv.mkDerivation rec {
     homepage = "https://wiki.gnome.org/Apps/DconfEditor";
     license = licenses.gpl3Plus;
     maintainers = teams.gnome.members;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

pkgs/desktops/gnome/core/gnome-calculator/default.nix

@@ -76,6 +76,6 @@ stdenv.mkDerivation rec {
     description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment";
     maintainers = teams.gnome.members;
     license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

pkgs/desktops/gnome/core/gnome-dictionary/default.nix

@@ -80,6 +80,6 @@ stdenv.mkDerivation rec {
     description = "Dictionary is the GNOME application to look up definitions";
     maintainers = teams.gnome.members;
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

pkgs/desktops/gnome/core/gnome-font-viewer/default.nix

@@ -61,6 +61,6 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.gnome.org/GNOME/gnome-font-viewer";
     maintainers = teams.gnome.members;
     license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

pkgs/desktops/gnome/core/gnome-themes-extra/default.nix

@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = teams.gnome.members;
   };
 }

pkgs/desktops/gnome/extensions/paperwm/default.nix

@@ -3,15 +3,15 @@
 , fetchFromGitHub
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation {
   pname = "gnome-shell-extension-paperwm";
-  version = "38.2";
+  version = "unstable-2022-12-14";
 
   src = fetchFromGitHub {
     owner = "paperwm";
     repo = "PaperWM";
-    rev = finalAttrs.version;
-    hash = "sha256-Unhz2+MOygOog6B5sOLtYTpdeodQH+/CMI93gC5nDvI=";
+    rev = "7c0863c944a02d4e8095034403bff6ade3579091";
+    hash = "sha256-EN0sWW/NymRNKrApeFnqg8ax7Et4hr0gKZuvMF4kJYU=";
   };
 
   dontConfigure = true;
@@ -33,4 +33,4 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   passthru.extensionUuid = "paperwm@hedning:matrix.org";
-})
+}

pkgs/development/compilers/ligo/default.nix

@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
 , fetchFromGitLab
 , git
 , coq
@@ -9,12 +10,12 @@
 
 ocamlPackages.buildDunePackage rec {
   pname = "ligo";
-  version = "0.55.0";
+  version = "0.58.0";
   src = fetchFromGitLab {
     owner = "ligolang";
     repo = "ligo";
     rev = version;
-    sha256 = "sha256-GEw9OEHXdTxBvb5ATIcL71wdUCLD+X/A7CYQxwTUQWw=";
+    sha256 = "sha256-WhqCkPkXHjWS8BDh13ODrHg2AHJ8CBfksTH4Fxx4xek=";
     fetchSubmodules = true;
   };
 
@@ -108,6 +109,7 @@ ocamlPackages.buildDunePackage rec {
     description = "A friendly Smart Contract Language for Tezos";
     license = licenses.mit;
     platforms = ocamlPackages.ocaml.meta.platforms;
+    broken = stdenv.isLinux && stdenv.isAarch64;
     maintainers = with maintainers; [ ulrikstrid ];
   };
 }

pkgs/development/haskell-modules/configuration-common.nix

@@ -744,9 +744,9 @@ self: super: {
     testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_10_5 ];
     testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ];
   }) (super.sensei.override {
-    hspec = self.hspec_2_10_7;
+    hspec = self.hspec_2_10_8;
     hspec-wai = super.hspec-wai.override {
-      hspec = self.hspec_2_10_7;
+      hspec = self.hspec_2_10_8;
     };
   });
 
@@ -1440,14 +1440,14 @@ self: super: {
   servant-openapi3 = dontCheck super.servant-openapi3;
 
   # Give hspec 2.10.* correct dependency versions without overrideScope
-  hspec_2_10_7 = doDistribute (super.hspec_2_10_7.override {
-    hspec-discover = self.hspec-discover_2_10_7;
-    hspec-core = self.hspec-core_2_10_7;
+  hspec_2_10_8 = doDistribute (super.hspec_2_10_8.override {
+    hspec-discover = self.hspec-discover_2_10_8;
+    hspec-core = self.hspec-core_2_10_8;
   });
-  hspec-discover_2_10_7 = super.hspec-discover_2_10_7.override {
+  hspec-discover_2_10_8 = super.hspec-discover_2_10_8.override {
     hspec-meta = self.hspec-meta_2_10_5;
   };
-  hspec-core_2_10_7 = super.hspec-core_2_10_7.override {
+  hspec-core_2_10_8 = super.hspec-core_2_10_8.override {
     hspec-meta = self.hspec-meta_2_10_5;
   };
 
@@ -2214,6 +2214,7 @@ self: super: {
 
   # Too strict upper bound on th-desugar, fixed in 3.1.1
   singletons-th = assert super.singletons-th.version == "3.1"; doJailbreak super.singletons-th;
+  singletons-base = doJailbreak super.singletons-base;
 
   # Ships a broken Setup.hs
   # https://github.com/lehins/conduit-aeson/issues/1

pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix

@@ -176,4 +176,7 @@ self: super: {
   # Later versions only support GHC >= 9.2
   ghc-exactprint = self.ghc-exactprint_0_6_4;
   apply-refact = self.apply-refact_0_9_3_0;
+
+  # Needs OneTuple for ghc < 9.2
+  binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans;
 }

pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix

@@ -205,6 +205,9 @@ self: super: {
   # https://github.com/mrkkrp/megaparsec/pull/485#issuecomment-1250051823
   megaparsec = doJailbreak super.megaparsec;
 
+  # Needs OneTuple for ghc < 9.2
+  binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans;
+
   # Later versions only support GHC >= 9.2
   ghc-exactprint = self.ghc-exactprint_0_6_4;
   apply-refact = self.apply-refact_0_9_3_0;

pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix

@@ -178,4 +178,7 @@ self: super: {
   # Later versions only support GHC >= 9.2
   ghc-exactprint = self.ghc-exactprint_0_6_4;
   apply-refact = self.apply-refact_0_9_3_0;
+
+  # Needs OneTuple for ghc < 9.2
+  binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans;
 }

pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix

@@ -112,10 +112,10 @@ in {
   # Note: Any compilation fixes need to be done on the versioned attributes,
   # since those are used for the internal dependencies between the versioned
   # hspec packages in configuration-common.nix.
-  hspec = self.hspec_2_10_7;
-  hspec-core = self.hspec-core_2_10_7;
+  hspec = self.hspec_2_10_8;
+  hspec-core = self.hspec-core_2_10_8;
   hspec-meta = self.hspec-meta_2_10_5;
-  hspec-discover = self.hspec-discover_2_10_7;
+  hspec-discover = self.hspec-discover_2_10_8;
 
   # the dontHaddock is due to a GHC panic. might be this bug, not sure.
   # https://gitlab.haskell.org/ghc/ghc/-/issues/21619

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml

@@ -633,6 +633,7 @@ broken-packages:
   - CC-delcont-ref-tf
   - cci
   - ccnx
+  - cdp
   - c-dsl
   - cedict
   - cef
@@ -1099,6 +1100,7 @@ broken-packages:
   - derive-lifted-instances
   - derive-monoid
   - derive-trie
+  - deriving-openapi3
   - derp-lib
   - describe
   - descriptive
@@ -1317,6 +1319,7 @@ broken-packages:
   - ekg-rrd
   - ekg-statsd
   - elevator
+  - eliminators
   - elision
   - elm-export-persistent
   - elm-street
@@ -1575,6 +1578,7 @@ broken-packages:
   - forml
   - formura
   - Fortnite-Hack-Cheats-Free-V-Bucks-Generator
+  - fortran-src-extras
   - foscam-filename
   - fpe
   - FPretty
@@ -2212,6 +2216,7 @@ broken-packages:
   - heterogeneous-list-literals
   - hetris
   - heukarya
+  - hevm
   - HExcel
   - hexchat
   - hexif
@@ -3274,6 +3279,7 @@ broken-packages:
   - medium-sdk-haskell
   - meep
   - megalisp
+  - melf
   - mellon-core
   - melody
   - membrain
@@ -4783,7 +4789,6 @@ broken-packages:
   - simplistic-generics
   - singlethongs
   - singleton-dict
-  - singletons-base
   - singleton-typelits
   - single-tuple
   - singnal
@@ -5501,6 +5506,7 @@ broken-packages:
   - ui-command
   - unamb-custom
   - unbeliever
+  - unbounded-delays-units
   - unboxed
   - unboxed-containers
   - unboxed-references
@@ -5521,6 +5527,7 @@ broken-packages:
   - uniqueness-periods-general
   - uniqueness-periods-vector
   - uniqueness-periods-vector-common
+  - units-attoparsec
   - unittyped
   - unitym-yesod
   - uni-util

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

@@ -86,6 +86,8 @@ default-package-overrides:
   # hnix < 0.17 (unreleased) needs hnix-store-* 0.5.*
   - hnix-store-core == 0.5.0.0            # 2022-06-17: Until hnix 0.17
   - hnix-store-remote == 0.5.0.0        # 2022-06-17: Until hnix 0.17
+  # reflex-dom-core 0.7.0.2 has no reflex 0.9 compatible release and most likely most people will want to use them together
+  - reflex < 0.9.0.0
 
 extra-packages:
   - Cabal == 2.2.*                      # required for jailbreak-cabal etc.

pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml

@@ -1331,8 +1331,6 @@ dont-distribute-packages:
  - elasticsearch-interchange
  - electrs-client
  - elerea-examples
- - eliminators
- - eliminators_0_9_1
  - elliptic-curve
  - elsa
  - emacs-keys
@@ -1363,11 +1361,15 @@ dont-distribute-packages:
  - essence-of-live-coding-PortMidi
  - essence-of-live-coding-gloss
  - essence-of-live-coding-gloss-example
+ - essence-of-live-coding-gloss_0_2_7
  - essence-of-live-coding-pulse
  - essence-of-live-coding-pulse-example
+ - essence-of-live-coding-pulse_0_2_7
  - essence-of-live-coding-quickcheck
+ - essence-of-live-coding-quickcheck_0_2_7
  - essence-of-live-coding-vivid
  - essence-of-live-coding-warp
+ - essence-of-live-coding-warp_0_2_7
  - estimators
  - estreps
  - eternity
@@ -1392,6 +1394,9 @@ dont-distribute-packages:
  - eventsource-geteventstore-store
  - eventsource-store-specs
  - eventsource-stub-store
+ - eventuo11y
+ - eventuo11y-batteries
+ - eventuo11y-json
  - every-bit-counts
  - ewe
  - exference
@@ -1490,6 +1495,7 @@ dont-distribute-packages:
  - fmt-for-rio
  - foldable1
  - follower
+ - fontconfig-pure
  - foo
  - format
  - format-status
@@ -1497,8 +1503,6 @@ dont-distribute-packages:
  - formlets-hsp
  - forsyde-deep
  - forth-hll
- - fortran-src
- - fortran-src-extras
  - fortran-vars
  - foscam-directory
  - foscam-sort
@@ -2118,7 +2122,6 @@ dont-distribute-packages:
  - hesh
  - hesql
  - heterolist
- - hevm
  - hevolisa
  - hevolisa-dph
  - hexpat-conduit
@@ -2739,7 +2742,6 @@ dont-distribute-packages:
  - medea
  - mediabus-fdk-aac
  - mediabus-rtp
- - melf
  - mellon-gpio
  - mellon-web
  - memcache-conduit
@@ -2994,7 +2996,6 @@ dont-distribute-packages:
  - optimal-blocks
  - optimusprime
  - optparse-enum
- - orbits
  - orchid
  - orchid-demo
  - order-maintenance
@@ -3391,6 +3392,7 @@ dont-distribute-packages:
  - rfc-redis
  - rfc-servant
  - rhine-gloss
+ - rhine-terminal
  - rhythm-game-tutorial
  - rib
  - ribosome
@@ -3597,9 +3599,6 @@ dont-distribute-packages:
  - simple-session
  - simpleirc-lens
  - simseq
- - singleton-nats
- - singletons-presburger
- - singletons-presburger_0_7_1_0
  - siphon
  - siren-json
  - sirkel
@@ -4009,7 +4008,6 @@ dont-distribute-packages:
  - ukrainian-phonetics-basic
  - unagi-bloomfilter
  - unbound
- - unbounded-delays-units
  - uni-events
  - uni-graphs
  - uni-htk
@@ -4023,9 +4021,6 @@ dont-distribute-packages:
  - uniqueness-periods-vector-filters
  - uniqueness-periods-vector-general
  - uniqueness-periods-vector-properties
- - units
- - units-attoparsec
- - units-defs
  - universal
  - universe
  - universe-dependent-sum

pkgs/development/libraries/folks/default.nix

@@ -119,6 +119,6 @@ stdenv.mkDerivation rec {
     homepage = "https://wiki.gnome.org/Projects/Folks";
     license = licenses.lgpl2Plus;
     maintainers = teams.gnome.members;
-    platforms = platforms.gnu ++ platforms.linux; # arbitrary choice
+    platforms = platforms.unix;
   };
 }

pkgs/development/libraries/gnome-video-effects/default.nix

@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "A collection of GStreamer effects to be used in different GNOME Modules";
     homepage = "https://wiki.gnome.org/Projects/GnomeVideoEffects";
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = teams.gnome.members;
     license = licenses.gpl2;
   };

pkgs/development/libraries/protobufc/default.nix

@@ -1,5 +1,11 @@
-{ lib, stdenv, fetchFromGitHub
-, autoreconfHook, pkg-config, protobuf, zlib
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, protobuf
+, zlib
+, buildPackages
 }:
 
 stdenv.mkDerivation rec {
@@ -17,11 +23,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ protobuf zlib ];
 
+  PROTOC = lib.getExe buildPackages.protobuf;
+
   meta = with lib; {
     homepage = "https://github.com/protobuf-c/protobuf-c/";
     description = "C bindings for Google's Protocol Buffers";
     license = licenses.bsd2;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ nickcao ];
   };
 }

pkgs/development/libraries/simdjson/default.nix

@@ -15,7 +15,13 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DSIMDJSON_DEVELOPER_MODE=OFF"
-  ] ++ lib.optional stdenv.hostPlatform.isStatic "-DBUILD_SHARED_LIBS=OFF";
+  ] ++ lib.optionals stdenv.hostPlatform.isStatic [
+    "-DBUILD_SHARED_LIBS=OFF"
+  ] ++ lib.optionals (with stdenv.hostPlatform; isPower && isBigEndian) [
+    # Assume required CPU features are available, since otherwise we
+    # just get a failed build.
+    "-DCMAKE_CXX_FLAGS=-mpower8-vector"
+  ];
 
   meta = with lib; {
     homepage = "https://simdjson.org/";

pkgs/development/libraries/sofia-sip/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sofia-sip";
-  version = "1.13.9";
+  version = "1.13.10";
 
   src = fetchFromGitHub {
     owner = "freeswitch";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-xF2LFbxGhA/gF7Z2LX3WYq3nXOLi0ARGGR4Dd3PCftk=";
+    sha256 = "sha256-UVyjeIIS0WwnY3GoZLIYTgf7R+C8SCuykDozaxCpog0=";
   };
 
   buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration;

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

@@ -1,4 +1,4 @@
-{ lib, fetchFromGitLab, buildDunePackage
+{ stdenv, lib, fetchFromGitLab, buildDunePackage
 , gmp, pkg-config, dune-configurator
 , zarith, integers
 , alcotest, bisect_ppx }:
@@ -38,6 +38,7 @@ buildDunePackage rec {
   meta = {
     description = "Verifiable Delay Functions bindings to Chia's VDF";
     homepage = "https://gitlab.com/nomadic-labs/tezos";
+    broken = stdenv.isDarwin && stdenv.isx86_64;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.ulrikstrid ];
   };

pkgs/development/php-packages/composer/default.nix

@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
 let
   pname = "composer";
-  version = "2.5.0";
+  version = "2.5.1";
 in
 mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://getcomposer.org/download/${version}/composer.phar";
-    sha256 = "tXFhDlRReF92OJoI6VddkcPW44/uHfepcI/jBwE8hCQ=";
+    sha256 = "sha256-8blP7hGlvWoarl13yNomnfJ8cF/MgG6/TIwub6hkXCA=";
   };
 
   dontUnpack = true;

pkgs/development/python-modules/antlr4-python3-runtime/default.nix

@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # in 4.9, test was renamed to tests
   checkPhase = ''
     cd test*
-    ${python.interpreter} ctest.py
+    ${python.interpreter} run.py
   '';
 
   meta = with lib; {

pkgs/development/python-modules/certbot-dns-inwx/default.nix

@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "certbot-dns-inwx";
-  version = "2.1.3";
+  version = "2.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-yAgualY4J92pJ8PIkICg8w0eYHmT5L3qAUOCW/cAitw=";
+    sha256 = "sha256-v03QBHsxhl6R8YcwWIKD+pf4APy9S2vFcQe3ZEc6AjI=";
   };
 
   propagatedBuildInputs = [

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

@@ -2,9 +2,11 @@
 , buildPythonPackage
 , fetchFromGitHub
 , fetchpatch
+, antlr4
 , antlr4-python3-runtime
 , igraph
 , pygments
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
@@ -18,6 +20,10 @@ buildPythonPackage rec {
     sha256 = "1vzyliiyrxx8l9sfbqcyr4xn5swd7znkxy69kn0vb5rban8hm9c1";
   };
 
+  nativeBuildInputs = [
+    antlr4
+  ];
+
   patches = [
     # https://github.com/SkyTemple/ExplorerScript/pull/17
     (fetchpatch {
@@ -26,8 +32,27 @@ buildPythonPackage rec {
     })
   ];
 
-  propagatedBuildInputs = [ antlr4-python3-runtime igraph ];
-  checkInputs = [ pygments ];
+  postPatch = ''
+    sed -i "s/antlr4-python3-runtime.*/antlr4-python3-runtime',/" setup.py
+    antlr -Dlanguage=Python3 -visitor explorerscript/antlr/{ExplorerScript,SsbScript}.g4
+  '';
+
+  propagatedBuildInputs = [
+    antlr4-python3-runtime
+    igraph
+  ];
+
+  passthru.optional-dependencies.pygments = [
+    pygments
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ] ++ passthru.optional-dependencies.pygments;
+
+  pythonImportsCheck = [
+    "explorerscript"
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/SkyTemple/explorerscript";

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

@@ -0,0 +1,48 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+
+# propagates
+, antlr4-python3-runtime
+, dataclasses-json
+, pyyaml
+
+# tests
+, pytestCheckHook
+}:
+
+let
+  pname = "hassil";
+  version = "0.1.3";
+in
+buildPythonPackage {
+  inherit pname version;
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-KWkzHWMo50OIrZ2kwFhhqDSleFFkAD7/JugjvSyCkww=";
+  };
+
+  postPatch = ''
+    sed -i 's/antlr4-python3-runtime==.*/antlr4-python3-runtime/' requirements.txt
+  '';
+
+  propagatedBuildInputs = [
+    antlr4-python3-runtime
+    dataclasses-json
+    pyyaml
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  meta = with lib; {
+    changelog  = "https://github.com/home-assistant/hassil/releases/tag/v${version}";
+    description = "Intent parsing for Home Assistant";
+    homepage = "https://github.com/home-assistant/hassil";
+    license = licenses.asl20;
+    maintainers = teams.home-assistant.members;
+  };
+}

pkgs/development/python-modules/hydra-core/antlr4.patch

@@ -0,0 +1,13 @@
+diff --git a/build_helpers/build_helpers.py b/build_helpers/build_helpers.py
+index 7159d22615..73db312bbe 100644
+--- a/build_helpers/build_helpers.py
++++ b/build_helpers/build_helpers.py
+@@ -185,7 +185,7 @@ class ANTLRCommand(Command):  # type: ignore
+             command = [
+                 "java",
+                 "-jar",
+-                join(root_dir, "bin/antlr-4.9.3-complete.jar"),
++                "@antlr_jar@",
+                 "-Dlanguage=Python3",
+                 "-o",
+                 join(project_root, "hydra/grammar/gen/"),

pkgs/development/python-modules/hydra-core/default.nix

@@ -1,6 +1,7 @@
 { stdenv
 , lib
-, antlr4_9-python3-runtime
+, antlr4
+, antlr4-python3-runtime
 , buildPythonPackage
 , fetchFromGitHub
 , importlib-resources
@@ -8,10 +9,11 @@
 , omegaconf
 , pytestCheckHook
 , pythonOlder
+, substituteAll
 }:
 
 buildPythonPackage rec {
-  pname = "hydra";
+  pname = "hydra-core";
   version = "1.3.1";
   format = "setuptools";
 
@@ -19,17 +21,32 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "facebookresearch";
-    repo = pname;
+    repo = "hydra";
     rev = "refs/tags/v${version}";
     hash = "sha256-4FOh1Jr+LM8ffh/xcAqMqKudKbXb2DZdxU+czq2xwxs=";
   };
 
+  patches = [
+    (substituteAll {
+      src = ./antlr4.patch;
+      antlr_jar = "${antlr4.out}/share/java/antlr-${antlr4.version}-complete.jar";
+    })
+  ];
+
+  postPatch = ''
+    # We substitute the path to the jar with the one from our antlr4
+    # package, so this file becomes unused
+    rm -v build_helpers/bin/antlr*-complete.jar
+
+    sed -i 's/antlr4-python3-runtime==.*/antlr4-python3-runtime/' requirements/requirements.txt
+  '';
+
   nativeBuildInputs = [
     jre_headless
   ];
 
   propagatedBuildInputs = [
-    antlr4_9-python3-runtime
+    antlr4-python3-runtime
     omegaconf
   ] ++ lib.optionals (pythonOlder "3.9") [
     importlib-resources
@@ -55,7 +72,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
+    broken = stdenv.isDarwin;
     description = "A framework for configuring complex applications";
     homepage = "https://hydra.cc";
     license = licenses.mit;

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

@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "meshtastic";
-  version = "2.0.6";
+  version = "2.0.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "meshtastic";
     repo = "Meshtastic-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-PN09TaJZR/REQPIgrm9XR+mXvR1evMAWGQziAzpg+fE=";
+    hash = "sha256-2CzWX+hMH1gN9WytRUf9BGiJ/bfEu2e0Kzg4ScDMrBo=";
   };
 
   propagatedBuildInputs = [
@@ -94,6 +94,7 @@ buildPythonPackage rec {
     "test_main_setPref_invalid_field"
     "test_main_setPref_valid_field_int_as_string"
     "test_readGPIOs"
+    "test_onGPIOreceive"
     "test_setURL_empty_url"
     "test_watchGPIOs"
     "test_writeConfig_with_no_radioConfig"

pkgs/development/python-modules/omegaconf/antlr4.patch

@@ -0,0 +1,13 @@
+diff --git a/build_helpers/build_helpers.py b/build_helpers/build_helpers.py
+index 6419e26..9e6c21c 100644
+--- a/build_helpers/build_helpers.py
++++ b/build_helpers/build_helpers.py
+@@ -30,7 +30,7 @@ class ANTLRCommand(Command):  # type: ignore  # pragma: no cover
+             command = [
+                 "java",
+                 "-jar",
+-                str(build_dir / "bin" / "antlr-4.9.3-complete.jar"),
++                "@antlr_jar@",
+                 "-Dlanguage=Python3",
+                 "-o",
+                 str(project_root / "omegaconf" / "grammar" / "gen"),

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

@@ -1,5 +1,6 @@
 { lib
-, antlr4_9-python3-runtime
+, antlr4
+, antlr4-python3-runtime
 , buildPythonPackage
 , fetchFromGitHub
 , jre_minimal
@@ -8,6 +9,7 @@
 , pytestCheckHook
 , pythonOlder
 , pyyaml
+, substituteAll
 }:
 
 buildPythonPackage rec {
@@ -24,12 +26,27 @@ buildPythonPackage rec {
     hash = "sha256-Qxa4uIiX5TAyQ5rFkizdev60S4iVAJ08ES6FpNqf8zI=";
   };
 
+  patches = [
+    (substituteAll {
+      src = ./antlr4.patch;
+      antlr_jar = "${antlr4.out}/share/java/antlr-${antlr4.version}-complete.jar";
+    })
+  ];
+
+  postPatch = ''
+    # We substitute the path to the jar with the one from our antlr4
+    # package, so this file becomes unused
+    rm -v build_helpers/bin/antlr*-complete.jar
+
+    sed -i 's/antlr4-python3-runtime==.*/antlr4-python3-runtime/' requirements/base.txt
+  '';
+
   nativeBuildInputs = [
     jre_minimal
   ];
 
   propagatedBuildInputs = [
-    antlr4_9-python3-runtime
+    antlr4-python3-runtime
     pyyaml
   ];
 

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

@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "wled";
-  version = "0.14.1";
+  version = "0.15.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "frenck";
     repo = "python-wled";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-ytjCjxnJOMmFlGS+AuEAbIZcV2yoTgaXSLdqxPg6Hew=";
+    sha256 = "sha256-GmentEsCJQ9N9kXfy5pbkGXi5CvZfbepdCWab+/fLJc=";
   };
 
   nativeBuildInputs = [

pkgs/development/tools/luaformatter/default.nix

@@ -1,4 +1,8 @@
-{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4, libargs, catch2, cmake, libyamlcpp }:
+{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4_9, libargs, catch2, cmake, libyamlcpp }:
+
+let
+  antlr4 = antlr4_9;
+in
 
 stdenv.mkDerivation rec {
   pname = "luaformatter";

pkgs/development/tools/pulumictl/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "pulumictl";
-  version = "0.0.32";
+  version = "0.0.38";
 
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "pulumictl";
     rev = "v${version}";
-    sha256 = "sha256-CZ0DnQUnyj8aoesFymc+Uhv+3vdQhdxb2YHElAyqGWE=";
+    sha256 = "sha256-j7wuzyGko3agDO7L8MUaAegjE4yj4KzQEcxWLY39BhQ=";
   };
 
-  vendorSha256 = "sha256-xalfnLc6bPBvm2B42+FzpgrOH541HMWmNHChveI792s=";
+  vendorSha256 = "sha256-WzfTS68YIpoZYbm6i0USxXyEyR4px+hrNRbsCTXdJsk=";
 
   ldflags = [
     "-s" "-w" "-X=github.com/pulumi/pulumictl/pkg/version.Version=${src.rev}"

pkgs/development/tools/ruff/default.nix

@@ -7,21 +7,24 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ruff";
-  version = "0.0.194";
+  version = "0.0.198";
 
   src = fetchFromGitHub {
     owner = "charliermarsh";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-28ckhFvUjA/Hb7bkd/iRaSm24EP0oUAxlVymHdPIJk0=";
+    sha256 = "sha256-hXG3Iu9p678UYh4NrpaVoPj8CDdU7D3GB7BQHsyQHWg=";
   };
 
-  cargoSha256 = "sha256-PLYU+J7xneZZOkJ+MEVTpgICIN3/Kunr7B+ryb4eZFk=";
+  cargoSha256 = "sha256-uWdlbVV6IODK+iugut/S8/WJwa9rSIvenvaROeyLaR0=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.CoreServices
   ];
 
+  # building tests fails with `undefined symbols`
+  doCheck = false;
+
   meta = with lib; {
     description = "An extremely fast Python linter";
     homepage = "https://github.com/charliermarsh/ruff";

pkgs/games/vcmi/default.nix

@@ -24,14 +24,14 @@
 
 stdenv.mkDerivation rec {
   pname = "vcmi";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "vcmi";
     repo = "vcmi";
     rev = version;
     fetchSubmodules = true;
-    hash = "sha256-5PuFq6wDSj5Ye2fUjqcr/VRU0ocus6h2nn+myQTOrhU=";
+    hash = "sha256-Ah+aAuU2ioUfvtxfcSb4GNqriqY71ee5RhW2L9UMYFY=";
   };
 
   postPatch = ''

pkgs/servers/baserow/default.nix

@@ -2,11 +2,18 @@
 , fetchFromGitLab
 , makeWrapper
 , python3
+, antlr4_9
 }:
 
 let
 
-  baserow_premium = with python3.pkgs; ( buildPythonPackage rec {
+  python = python3.override {
+    packageOverrides = self: super: {
+      antlr4-python3-runtime = super.antlr4-python3-runtime.override {
+        antlr4 = antlr4_9;
+      };
+
+      baserow_premium = self.buildPythonPackage rec {
         pname = "baserow_premium";
         version = "1.12.1";
         foramt = "setuptools";
@@ -21,11 +28,12 @@ let
         sourceRoot = "source/premium/backend";
 
         doCheck = false;
-  });
-
+      };
+    };
+  };
 in
 
-with python3.pkgs; buildPythonPackage rec {
+with python.pkgs; buildPythonApplication rec {
   pname = "baserow";
   version = "1.12.1";
   format = "setuptools";

pkgs/servers/http/trafficserver/default.nix

@@ -50,11 +50,11 @@
 
 stdenv.mkDerivation rec {
   pname = "trafficserver";
-  version = "9.1.3";
+  version = "9.1.4";
 
   src = fetchzip {
     url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2";
-    sha256 = "sha256-Ihhsbn4PvIjWskmbWKajThIwtuiEyldBpmtuQ8RdyHA=";
+    sha256 = "sha256-+iq+z+1JE6JE6OLcUwRRAe2/EISqb6Ax6pNm8GcB7bc=";
   };
 
   patches = [
@@ -107,10 +107,6 @@ stdenv.mkDerivation rec {
       tools/check-unused-dependencies
 
     substituteInPlace configure --replace '/usr/bin/file' '${file}/bin/file'
-
-    # TODO: remove after the following change has been released
-    # https://github.com/apache/trafficserver/pull/8683
-    cp ${catch2}/include/catch2/catch.hpp tests/include/catch.hpp
   '' + lib.optionalString stdenv.isLinux ''
     substituteInPlace configure \
       --replace '/usr/include/linux' '${linuxHeaders}/include/linux'
@@ -125,9 +121,6 @@ stdenv.mkDerivation rec {
     "--enable-experimental-plugins"
     (lib.enableFeature enableWCCP "wccp")
 
-    # the configure script can't auto-locate the following from buildInputs
-    "--with-lzma=${xz.dev}"
-    "--with-zlib=${zlib.dev}"
     (lib.withFeatureAs withHiredis "hiredis" hiredis)
   ];
 

pkgs/tools/admin/qovery-cli/default.nix

@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "qovery-cli";
-  version = "0.46.7";
+  version = "0.47.2";
 
   src = fetchFromGitHub {
     owner = "Qovery";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-cMoT0vbWTcuMI7MMDGQ8+G7FqTuaJl4+rp22Uy4e83g=";
+    hash = "sha256-leQ/wMtFt4e+NaLYPA50BICLJV7tBJ7NcaaYagbG+Ww=";
   };
 
-  vendorHash = "sha256-4TY7/prMbvw5zVPJRoMLg7Omrxvh1HPGsdz1wqPn4uU=";
+  vendorHash = "sha256-fkVtyydWPLh0D8jJZQ02hc8Hzntfmd7UMOuTv4Rckng=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/tools/filesystems/envfs/default.nix

@@ -0,0 +1,28 @@
+{ rustPlatform, lib, fetchFromGitHub, nixosTests }:
+rustPlatform.buildRustPackage rec {
+  pname = "envfs";
+  version = "1.0.0";
+  src = fetchFromGitHub {
+    owner = "Mic92";
+    repo = "envfs";
+    rev = version;
+    hash = "sha256-aF8V1LwPGifFWoVxM0ydOnTX1pDVJ6HXevTxADJ/rsw=";
+  };
+  cargoHash = "sha256-kw56tbe5zvWY5bI//dUqR1Rlumz8kOG4HeXiyEyL0I0=";
+
+  passthru.tests = {
+    envfs = nixosTests.envfs;
+  };
+
+  postInstall = ''
+    ln -s envfs $out/bin/mount.envfs
+    ln -s envfs $out/bin/mount.fuse.envfs
+  '';
+  meta = with lib; {
+    description = "Fuse filesystem that returns symlinks to executables based on the PATH of the requesting process.";
+    homepage = "https://github.com/Mic92/envfs";
+    license = licenses.mit;
+    maintainers = with maintainers; [ mic92 ];
+    platforms = platforms.linux;
+  };
+}

pkgs/tools/filesystems/httm/cargo-lock.patch

@@ -1,725 +0,0 @@
-diff --git i/Cargo.lock w/Cargo.lock
-index d59e8af..2409033 100644
---- i/Cargo.lock
-+++ w/Cargo.lock
-@@ -8,16 +8,16 @@ version = "0.8.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107"
- dependencies = [
-- "cfg-if 1.0.0",
-+ "cfg-if",
-  "once_cell",
-  "version_check",
- ]
- 
- [[package]]
- name = "aho-corasick"
--version = "0.7.18"
-+version = "0.7.20"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
-+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
- dependencies = [
-  "memchr",
- ]
-@@ -77,21 +77,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
- 
- [[package]]
- name = "bumpalo"
--version = "3.10.0"
-+version = "3.11.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
-+checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
- 
- [[package]]
- name = "cc"
--version = "1.0.73"
-+version = "1.0.77"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
--
--[[package]]
--name = "cfg-if"
--version = "0.1.10"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-+checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
- 
- [[package]]
- name = "cfg-if"
-@@ -101,13 +95,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
- 
- [[package]]
- name = "chrono"
--version = "0.4.22"
-+version = "0.4.23"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
-+checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
- dependencies = [
-  "iana-time-zone",
-+ "js-sys",
-  "num-integer",
-  "num-traits",
-+ "time 0.1.45",
-+ "wasm-bindgen",
-  "winapi",
- ]
- 
-@@ -129,9 +126,9 @@ dependencies = [
- 
- [[package]]
- name = "clap_lex"
--version = "0.2.2"
-+version = "0.2.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5538cd660450ebeb4234cfecf8f2284b844ffc4c50531e66d584ad5b91293613"
-+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
- dependencies = [
-  "os_str_bytes",
- ]
-@@ -148,14 +145,13 @@ dependencies = [
- 
- [[package]]
- name = "console"
--version = "0.15.0"
-+version = "0.15.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31"
-+checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c"
- dependencies = [
-  "encode_unicode",
-+ "lazy_static",
-  "libc",
-- "once_cell",
-- "regex",
-  "terminal_size 0.1.17",
-  "winapi",
- ]
-@@ -172,95 +168,72 @@ version = "0.8.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c"
- dependencies = [
-- "cfg-if 1.0.0",
-- "crossbeam-channel 0.5.5",
-+ "cfg-if",
-+ "crossbeam-channel",
-  "crossbeam-deque",
-  "crossbeam-epoch",
-  "crossbeam-queue",
-- "crossbeam-utils 0.8.9",
-+ "crossbeam-utils",
- ]
- 
- [[package]]
- name = "crossbeam-channel"
--version = "0.4.4"
-+version = "0.5.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
-+checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
- dependencies = [
-- "crossbeam-utils 0.7.2",
-- "maybe-uninit",
--]
--
--[[package]]
--name = "crossbeam-channel"
--version = "0.5.5"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c"
--dependencies = [
-- "cfg-if 1.0.0",
-- "crossbeam-utils 0.8.9",
-+ "cfg-if",
-+ "crossbeam-utils",
- ]
- 
- [[package]]
- name = "crossbeam-deque"
--version = "0.8.1"
-+version = "0.8.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
-+checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
- dependencies = [
-- "cfg-if 1.0.0",
-+ "cfg-if",
-  "crossbeam-epoch",
-- "crossbeam-utils 0.8.9",
-+ "crossbeam-utils",
- ]
- 
- [[package]]
- name = "crossbeam-epoch"
--version = "0.9.9"
-+version = "0.9.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d"
-+checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
- dependencies = [
-  "autocfg",
-- "cfg-if 1.0.0",
-- "crossbeam-utils 0.8.9",
-- "memoffset",
-- "once_cell",
-+ "cfg-if",
-+ "crossbeam-utils",
-+ "memoffset 0.7.1",
-  "scopeguard",
- ]
- 
- [[package]]
- name = "crossbeam-queue"
--version = "0.3.5"
-+version = "0.3.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2"
-+checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
- dependencies = [
-- "cfg-if 1.0.0",
-- "crossbeam-utils 0.8.9",
-+ "cfg-if",
-+ "crossbeam-utils",
- ]
- 
- [[package]]
- name = "crossbeam-utils"
--version = "0.7.2"
-+version = "0.8.14"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
-+checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
- dependencies = [
-- "autocfg",
-- "cfg-if 0.1.10",
-- "lazy_static",
--]
--
--[[package]]
--name = "crossbeam-utils"
--version = "0.8.9"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8ff1f980957787286a554052d03c7aee98d99cc32e09f6d45f0a814133c87978"
--dependencies = [
-- "cfg-if 1.0.0",
-- "once_cell",
-+ "cfg-if",
- ]
- 
- [[package]]
- name = "cxx"
--version = "1.0.80"
-+version = "1.0.83"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a"
-+checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf"
- dependencies = [
-  "cc",
-  "cxxbridge-flags",
-@@ -270,9 +243,9 @@ dependencies = [
- 
- [[package]]
- name = "cxx-build"
--version = "1.0.80"
-+version = "1.0.83"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827"
-+checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39"
- dependencies = [
-  "cc",
-  "codespan-reporting",
-@@ -285,15 +258,15 @@ dependencies = [
- 
- [[package]]
- name = "cxxbridge-flags"
--version = "1.0.80"
-+version = "1.0.83"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a"
-+checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12"
- 
- [[package]]
- name = "cxxbridge-macro"
--version = "1.0.80"
-+version = "1.0.83"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7"
-+checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6"
- dependencies = [
-  "proc-macro2",
-  "quote",
-@@ -337,11 +310,11 @@ dependencies = [
- 
- [[package]]
- name = "defer-drop"
--version = "1.2.0"
-+version = "1.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "828aca0e5e4341b0320a319209cbc6255b8b06254849ce8a5f33d33f7f2fa0f0"
-+checksum = "f613ec9fa66a6b28cdb1842b27f9adf24f39f9afc4dcdd9fdecee4aca7945c57"
- dependencies = [
-- "crossbeam-channel 0.4.4",
-+ "crossbeam-channel",
-  "once_cell",
- ]
- 
-@@ -382,7 +355,7 @@ version = "2.0.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
- dependencies = [
-- "cfg-if 1.0.0",
-+ "cfg-if",
-  "dirs-sys-next",
- ]
- 
-@@ -399,9 +372,9 @@ dependencies = [
- 
- [[package]]
- name = "either"
--version = "1.6.1"
-+version = "1.8.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
-+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
- 
- [[package]]
- name = "encode_unicode"
-@@ -447,20 +420,20 @@ dependencies = [
- 
- [[package]]
- name = "getrandom"
--version = "0.2.7"
-+version = "0.2.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
-+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
- dependencies = [
-- "cfg-if 1.0.0",
-+ "cfg-if",
-  "libc",
-- "wasi",
-+ "wasi 0.11.0+wasi-snapshot-preview1",
- ]
- 
- [[package]]
- name = "hashbrown"
--version = "0.11.2"
-+version = "0.12.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
- 
- [[package]]
- name = "hashbrown"
-@@ -482,7 +455,7 @@ dependencies = [
- 
- [[package]]
- name = "httm"
--version = "0.17.9"
-+version = "0.17.10"
- dependencies = [
-  "clap",
-  "crossbeam",
-@@ -495,8 +468,8 @@ dependencies = [
-  "proc-mounts",
-  "rayon",
-  "skim",
-- "terminal_size 0.2.2",
-- "time",
-+ "terminal_size 0.2.3",
-+ "time 0.3.17",
-  "which",
- ]
- 
-@@ -532,12 +505,12 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
- 
- [[package]]
- name = "indexmap"
--version = "1.8.2"
-+version = "1.9.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a"
-+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
- dependencies = [
-  "autocfg",
-- "hashbrown 0.11.2",
-+ "hashbrown 0.12.3",
- ]
- 
- [[package]]
-@@ -553,15 +526,19 @@ dependencies = [
- 
- [[package]]
- name = "io-lifetimes"
--version = "0.7.5"
-+version = "1.0.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074"
-+checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
-+dependencies = [
-+ "libc",
-+ "windows-sys",
-+]
- 
- [[package]]
- name = "itoa"
--version = "1.0.2"
-+version = "1.0.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
-+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
- 
- [[package]]
- name = "js-sys"
-@@ -580,9 +557,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
- 
- [[package]]
- name = "libc"
--version = "0.2.137"
-+version = "0.2.138"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
-+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
- 
- [[package]]
- name = "link-cplusplus"
-@@ -595,9 +572,9 @@ dependencies = [
- 
- [[package]]
- name = "linux-raw-sys"
--version = "0.0.46"
-+version = "0.1.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
-+checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f"
- 
- [[package]]
- name = "log"
-@@ -605,7 +582,7 @@ version = "0.4.17"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
- dependencies = [
-- "cfg-if 1.0.0",
-+ "cfg-if",
- ]
- 
- [[package]]
-@@ -618,12 +595,6 @@ dependencies = [
-  "nu-ansi-term",
- ]
- 
--[[package]]
--name = "maybe-uninit"
--version = "2.0.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
--
- [[package]]
- name = "memchr"
- version = "2.5.0"
-@@ -639,28 +610,37 @@ dependencies = [
-  "autocfg",
- ]
- 
-+[[package]]
-+name = "memoffset"
-+version = "0.7.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
-+dependencies = [
-+ "autocfg",
-+]
-+
- [[package]]
- name = "nix"
--version = "0.24.1"
-+version = "0.24.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9"
-+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
- dependencies = [
-  "bitflags",
-- "cfg-if 1.0.0",
-+ "cfg-if",
-  "libc",
- ]
- 
- [[package]]
- name = "nix"
--version = "0.25.0"
-+version = "0.25.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
-+checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
- dependencies = [
-  "autocfg",
-  "bitflags",
-- "cfg-if 1.0.0",
-+ "cfg-if",
-  "libc",
-- "memoffset",
-+ "memoffset 0.6.5",
-  "pin-utils",
- ]
- 
-@@ -726,9 +706,9 @@ checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
- 
- [[package]]
- name = "os_str_bytes"
--version = "6.1.0"
-+version = "6.4.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa"
-+checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
- 
- [[package]]
- name = "overload"
-@@ -759,9 +739,9 @@ checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16"
- 
- [[package]]
- name = "proc-macro2"
--version = "1.0.39"
-+version = "1.0.47"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
-+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
- dependencies = [
-  "unicode-ident",
- ]
-@@ -777,9 +757,9 @@ dependencies = [
- 
- [[package]]
- name = "quote"
--version = "1.0.18"
-+version = "1.0.21"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
-+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
- dependencies = [
-  "proc-macro2",
- ]
-@@ -801,17 +781,17 @@ version = "1.10.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3"
- dependencies = [
-- "crossbeam-channel 0.5.5",
-+ "crossbeam-channel",
-  "crossbeam-deque",
-- "crossbeam-utils 0.8.9",
-+ "crossbeam-utils",
-  "num_cpus",
- ]
- 
- [[package]]
- name = "redox_syscall"
--version = "0.2.13"
-+version = "0.2.16"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
-+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
- dependencies = [
-  "bitflags",
- ]
-@@ -829,9 +809,9 @@ dependencies = [
- 
- [[package]]
- name = "regex"
--version = "1.6.0"
-+version = "1.7.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
-+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
- dependencies = [
-  "aho-corasick",
-  "memchr",
-@@ -840,15 +820,15 @@ dependencies = [
- 
- [[package]]
- name = "regex-syntax"
--version = "0.6.27"
-+version = "0.6.28"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
-+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
- 
- [[package]]
- name = "rustix"
--version = "0.35.13"
-+version = "0.36.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9"
-+checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23"
- dependencies = [
-  "bitflags",
-  "errno",
-@@ -860,9 +840,9 @@ dependencies = [
- 
- [[package]]
- name = "rustversion"
--version = "1.0.6"
-+version = "1.0.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
-+checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
- 
- [[package]]
- name = "scopeguard"
-@@ -878,14 +858,14 @@ checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
- 
- [[package]]
- name = "serde"
--version = "1.0.137"
-+version = "1.0.148"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
-+checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc"
- 
- [[package]]
- name = "skim"
- version = "0.10.2"
--source = "git+https://github.com/kimono-koans/skim?branch=httm-vendored#bf2b007ae7371a7cff4d93194033bd6c90cbf96c"
-+source = "git+https://github.com/kimono-koans/skim?branch=httm-vendored#bca6554ebf09803fc429a59c89eb96428e920cc5"
- dependencies = [
-  "beef",
-  "bitflags",
-@@ -896,10 +876,11 @@ dependencies = [
-  "fuzzy-matcher",
-  "lazy_static",
-  "log",
-- "nix 0.25.0",
-+ "nix 0.25.1",
-+ "once_cell",
-  "rayon",
-  "regex",
-- "time",
-+ "time 0.3.17",
-  "timer",
-  "tuikit",
-  "unicode-width",
-@@ -914,9 +895,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
- 
- [[package]]
- name = "syn"
--version = "1.0.96"
-+version = "1.0.105"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf"
-+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
- dependencies = [
-  "proc-macro2",
-  "quote",
-@@ -955,9 +936,9 @@ dependencies = [
- 
- [[package]]
- name = "terminal_size"
--version = "0.2.2"
-+version = "0.2.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "40ca90c434fd12083d1a6bdcbe9f92a14f96c8a1ba600ba451734ac334521f7a"
-+checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907"
- dependencies = [
-  "rustix",
-  "windows-sys",
-@@ -971,18 +952,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
- 
- [[package]]
- name = "thiserror"
--version = "1.0.31"
-+version = "1.0.37"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
-+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
- dependencies = [
-  "thiserror-impl",
- ]
- 
- [[package]]
- name = "thiserror-impl"
--version = "1.0.31"
-+version = "1.0.37"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
-+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
- dependencies = [
-  "proc-macro2",
-  "quote",
-@@ -998,6 +979,17 @@ dependencies = [
-  "once_cell",
- ]
- 
-+[[package]]
-+name = "time"
-+version = "0.1.45"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
-+dependencies = [
-+ "libc",
-+ "wasi 0.10.0+wasi-snapshot-preview1",
-+ "winapi",
-+]
-+
- [[package]]
- name = "time"
- version = "0.3.17"
-@@ -1030,7 +1022,8 @@ dependencies = [
- [[package]]
- name = "timer"
- version = "0.2.0"
--source = "git+https://github.com/kimono-koans/timer.rs#85c9e56ab20ea530c934433636406f8b585bef59"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "31d42176308937165701f50638db1c31586f183f1aab416268216577aec7306b"
- dependencies = [
-  "chrono",
- ]
-@@ -1044,22 +1037,22 @@ dependencies = [
-  "bitflags",
-  "lazy_static",
-  "log",
-- "nix 0.24.1",
-+ "nix 0.24.3",
-  "term",
-  "unicode-width",
- ]
- 
- [[package]]
- name = "unicode-ident"
--version = "1.0.1"
-+version = "1.0.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
-+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
- 
- [[package]]
- name = "unicode-width"
--version = "0.1.9"
-+version = "0.1.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
-+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
- 
- [[package]]
- name = "utf8parse"
-@@ -1094,6 +1087,12 @@ dependencies = [
-  "quote",
- ]
- 
-+[[package]]
-+name = "wasi"
-+version = "0.10.0+wasi-snapshot-preview1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-+
- [[package]]
- name = "wasi"
- version = "0.11.0+wasi-snapshot-preview1"
-@@ -1106,7 +1105,7 @@ version = "0.2.83"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
- dependencies = [
-- "cfg-if 1.0.0",
-+ "cfg-if",
-  "wasm-bindgen-macro",
- ]
- 

pkgs/tools/filesystems/httm/default.nix

@@ -1,23 +1,21 @@
 { lib
-, fetchFromGitHub
 , rustPlatform
+, fetchFromGitHub
 , installShellFiles
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "httm";
-  version = "0.17.10";
+  version = "0.18.3";
 
   src = fetchFromGitHub {
     owner = "kimono-koans";
     repo = pname;
     rev = version;
-    sha256 = "sha256-xhsZaOsEYmtx3EcKbc7cIPvrUdXl3gyl5InZ1Va0U6E=";
+    sha256 = "sha256-LJFBridWS7YYO9Bw3mzRdRnh2gGUxAtuoNq2T1wuAcY=";
   };
 
-  cargoPatches = [ ./cargo-lock.patch ];
-
-  cargoSha256 = "sha256-H8LOpNKsc9CxURB+ZcQT6Uhv4aw2sx8sNdDGDCkz2SU=";
+  cargoSha256 = "sha256-/v0QQ3EnmL1EKEjJ4O0t52SOrCz+CVBpunogEfVMpBw=";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -31,8 +29,8 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "Interactive, file-level Time Machine-like tool for ZFS/btrfs";
     homepage = "https://github.com/kimono-koans/httm";
+    changelog = "https://github.com/kimono-koans/httm/releases/tag/${version}";
     license = licenses.mpl20;
-    platforms = platforms.unix;
     maintainers = with maintainers; [ wyndon ];
   };
 }

pkgs/tools/misc/didyoumean/default.nix

@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "didyoumean";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchFromGitHub {
     owner = "hisbaan";
     repo = "didyoumean";
     rev = "v${version}";
-    sha256 = "sha256-hHl9PGNDFN7Dad2JOlAy99dz0pC9OmphwYMJHBBwx7Y=";
+    sha256 = "sha256-PSEoh1OMElFJ8m4er1vBMkQak3JvLjd+oWNWA46cows=";
   };
 
-  cargoSha256 = "sha256-rjkj9MO6fXVOk3fA87olGt/iIaJ8Zv/cy/Cqy/pg6yI=";
+  cargoSha256 = "sha256-QERnohWpkJ0LWkdxHrY6gKxdGqxDkLla7jlG44laojk=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/tools/networking/q/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "q";
-  version = "0.8.2";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
     owner = "natesales";
     repo = "q";
     rev = "v${version}";
-    sha256 = "sha256-Esg2i8UNT+SuW9+jsnVEOt1ot822CamZ3JoR8ReY0+4=";
+    sha256 = "sha256-M2TgDha+F4hY7f9sabzZEdsxdp8rdXDZB4ktmpDF5D8=";
   };
 
-  vendorHash = "sha256-oarXbxROTd7knHr9GKlrPnnS6ehkps2ZYYsUS9cn6ek=";
+  vendorHash = "sha256-216NwRlU7mmr+ebiBwq9DVtFb2SpPgkGUrVZMUAY9rI=";
 
   doCheck = false; # tries to resolve DNS
 

pkgs/tools/text/diffsitter/default.nix

@@ -32,17 +32,17 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "diffsitter";
-  version = "0.7.2";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "afnanenayet";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-oHG2vw981r9FZSwbJ+xcLemfQSMDrk6PAr/qtyImM04=";
+    sha256 = "sha256-AJjgn+qFfy6/gjb8tQOJDmevZy1ZfpF0nTxAgunSabE=";
     fetchSubmodules = false;
   };
 
-  cargoSha256 = "sha256-Cj9jdeeJNR/7mquEfaQCsFgiCjyJbZaaSkOzbU64T3U=";
+  cargoSha256 = "sha256-U/XvllkzEVt4TpDPA5gSRKpIIQagATGdHh7YPFOo4CY=";
 
   buildNoDefaultFeatures = true;
   buildFeatures = [

pkgs/top-level/all-packages.nix

@@ -2173,7 +2173,7 @@ with pkgs;
 
   ### APPLICATIONS/EMULATORS/BSNES
 
-  ares = callPackage ../applications/emulators/bsnes/ares { };
+  ares = darwin.apple_sdk_11_0.callPackage ../applications/emulators/bsnes/ares { };
 
   bsnes-hd = callPackage ../applications/emulators/bsnes/bsnes-hd {
     inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL;
@@ -4405,6 +4405,8 @@ with pkgs;
 
   envsubst = callPackage ../tools/misc/envsubst { };
 
+  envfs = callPackage ../tools/filesystems/envfs { };
+
   er-patcher = callPackage ../tools/games/er-patcher { };
 
   errcheck = callPackage ../development/tools/errcheck { };
@@ -16735,7 +16737,7 @@ with pkgs;
     antlr4_10
     antlr4_11;
 
-  antlr4 = antlr4_8;
+  antlr4 = antlr4_11;
 
   antlr = antlr4;
 

pkgs/top-level/python-packages.nix

@@ -488,13 +488,9 @@ self: super: with self; {
 
   ansiwrap = callPackage ../development/python-modules/ansiwrap { };
 
-  antlr4_8-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime {
-    antlr4 = pkgs.antlr4_8;
+  antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime {
+    inherit (pkgs) antlr4;
   };
-  antlr4_9-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime {
-    antlr4 = pkgs.antlr4_9;
-  };
-  antlr4-python3-runtime = self.antlr4_8-python3-runtime;
 
   anyascii = callPackage ../development/python-modules/anyascii { };
 
@@ -4173,6 +4169,8 @@ self: super: with self; {
 
   hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { };
 
+  hassil = callPackage ../development/python-modules/hassil { };
+
   hatasmota = callPackage ../development/python-modules/hatasmota { };
 
   hatchling = callPackage ../development/python-modules/hatchling { };
@@ -4389,7 +4387,7 @@ self: super: with self; {
 
   hy = callPackage ../development/python-modules/hy { };
 
-  hydra = callPackage ../development/python-modules/hydra { };
+  hydra-core = callPackage ../development/python-modules/hydra-core { };
 
   hydra-check = callPackage ../development/python-modules/hydra-check { };