Merge staging-next into staging

2024-12-26 23:54:01 +00:00 · 2023-08-14 06:01:28 +00:00 · 2023-08-14 06:01:28 +00:00 · 16762707cd
commit 16762707cd
parent 495c41f295 b782e1dc08
34 changed files with 265 additions and 126 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -305,5 +305,9 @@ nixos/lib/make-multi-disk-zfs-image.nix   @raitobezarius
 nixos/modules/tasks/filesystems/zfs.nix   @raitobezarius
 nixos/tests/zfs.nix                       @raitobezarius

+# Zig
+/pkgs/development/compilers/zig @AndersonTorres @figsoda
+/doc/hooks/zig.section.md @AndersonTorres @figsoda
+
 # Linux Kernel
 pkgs/os-specific/linux/kernel/manual-config.nix   @amjoseph-nixpkgs
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -9169,12 +9169,6 @@
    githubId = 2037002;
    name = "Konstantinos";
  };
-  kototama = {
-    email = "kototama@posteo.jp";
-    github = "kototama";
-    githubId = 128620;
-    name = "Kototama";
-  };
  kouyk = {
    email = "skykinetic@stevenkou.xyz";
    github = "kouyk";
@ -14662,7 +14656,7 @@
    name = "Rahul Butani";
  };
  rs0vere = {
-    email = "rs0vere@outlook.com";
+    email = "rs0vere@proton.me";
    github = "rs0vere";
    githubId = 140035635;
    keys = [{
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@ -892,4 +892,14 @@ with lib.maintainers; {
    shortName = "Xfce";
    enableFeatureFreezePing = true;
  };
+
+  zig = {
+    members = [
+      AndersonTorres
+      figsoda
+    ];
+    scope = "Maintain the Zig compiler toolchain and nixpkgs integration.";
+    shortName = "Zig";
+    enableFeatureFreezePing = true;
+  };
 }
--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@ -144,7 +144,7 @@

 - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.

- GNOME module no longer forces Qt applications to use Adwaita style since it was buggy and is no longer maintained upstream. If you still want it, you can add the following options to your configuration but it will probably be eventually removed:
+- GNOME, Pantheon, Cinnamon module no longer forces Qt applications to use Adwaita style since it was buggy and is no longer maintained upstream. If you still want it, you can add the following options to your configuration but it will probably be eventually removed:

  ```nix
  qt = {
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@ -212,11 +212,6 @@ in
      programs.bash.vteIntegration = mkDefault true;
      programs.zsh.vteIntegration = mkDefault true;

-      # Harmonize Qt applications under Cinnamon
-      qt.enable = true;
-      qt.platformTheme = "gnome";
-      qt.style = "adwaita";
-
      # Default Fonts
      fonts.packages = with pkgs; [
        source-code-pro # Default monospace font in 3.32
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@ -200,7 +200,6 @@ in
        gtk3.out # for gtk-launch program
        onboard
        orca # elementary/greeter#668
-        qgnomeplatform
        sound-theme-freedesktop
        xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
      ]) ++ (with pkgs.pantheon; [
@ -260,10 +259,10 @@ in
      programs.bash.vteIntegration = mkDefault true;
      programs.zsh.vteIntegration = mkDefault true;

-      # Harmonize Qt applications under Pantheon
-      qt.enable = true;
-      qt.platformTheme = "gnome";
-      qt.style = "adwaita";
+      # Use native GTK file chooser on Qt apps. This is because Qt does not know Pantheon.
+      # https://invent.kde.org/qt/qt/qtbase/-/blob/6.6/src/gui/platform/unix/qgenericunixthemes.cpp#L1312
+      # https://github.com/elementary/default-settings/blob/7.0.2/profile.d/qt-qpa-platformtheme.sh
+      environment.variables.QT_QPA_PLATFORMTHEME = mkDefault "gtk3";

      # Default Fonts
      fonts.packages = with pkgs; [
--- a/pkgs/applications/emulators/uxn/default.nix
+++ b/pkgs/applications/emulators/uxn/default.nix
@ -5,23 +5,34 @@
 , unstableGitUpdater
 }:

-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
  pname = "uxn";
-  version = "unstable-2023-07-30";
+  version = "unstable-2023-08-10";

  src = fetchFromSourcehut {
    owner = "~rabbits";
    repo = "uxn";
-    rev = "9ca8e9623d0ab1c299f08d3dd9d54098557f5749";
-    hash = "sha256-K51YiLnBwFWgD3h3l2BhsvzhnHHolZPsjjUWJSe4sPQ=";
+    rev = "a394dcb999525ac56ea37d0563d35849964b6d6a";
+    hash = "sha256-3Q8460pkoATKCEqfa+OfpQ4Lp18Ro5i84s88pkz+uzU=";
  };

+  outputs = [ "out" "projects" ];
+
+  nativeBuildInputs = [
+    SDL2
+  ];
+
  buildInputs = [
    SDL2
  ];

+  strictDeps = true;
+
  postPatch = ''
-     sed -i -e 's|UXNEMU_LDFLAGS="$(brew.*$|UXNEMU_LDFLAGS="$(sdl2-config --cflags --libs)"|' build.sh
+    patchShebangs build.sh
+    substituteInPlace build.sh \
+      --replace "-L/usr/local/lib " "" \
+      --replace "\$(brew --prefix)/lib/libSDL2.a " ""
  '';

  buildPhase = ''
@ -32,13 +43,15 @@ stdenv.mkDerivation {
    runHook postBuild
  '';

+  # ./build.sh --install is meant to install in $HOME, therefore not useful for
+  # package maintainers
  installPhase = ''
    runHook preInstall

-    install -d $out/bin/ $out/share/uxn/
-
+    install -d $out/bin/
    cp bin/uxnasm bin/uxncli bin/uxnemu $out/bin/
-    cp -r projects $out/share/uxn/
+    install -d $projects/share/uxn/
+    cp -r projects $projects/share/uxn/

    runHook postInstall
  '';
@ -49,7 +62,12 @@ stdenv.mkDerivation {
    homepage = "https://wiki.xxiivv.com/site/uxn.html";
    description = "An assembler and emulator for the Uxn stack machine";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ AndersonTorres kototama ];
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    mainProgram = "uxnemu";
    inherit (SDL2.meta) platforms;
+    # ofborg complains about an error trying to link inexistent SDL2 library
+    # For full logs, run:
+    # 'nix log /nix/store/bmyhh0lpifl9swvkpflqldv43vcrgci1-uxn-unstable-2023-08-10.drv'.
+    broken = stdenv.isDarwin;
  };
-}
+})
--- a/pkgs/applications/misc/gomatrix/default.nix
+++ b/pkgs/applications/misc/gomatrix/default.nix
@ -8,10 +8,10 @@ buildGoModule rec {
    owner = "GeertJohan";
    repo = "gomatrix";
    rev = "v${version}";
-    sha256 = "1wq55rvpyz0gjn8kiwwj49awsmi86zy1fdjcphzgb7883xalgr2m";
+    hash = "sha256-VeRHVR8InfU+vEw2F/w3KFbNVSKS8ziRlQ98f3cuBfM=";
  };

-  vendorSha256 = "1yw0gph4zfg8w4343882l6b9lggwyak2zz8ic1l1m2m44p3aq169";
+  vendorHash = "sha256-yQSsxiWkihpoYBH9L6by/D2alqECoUEG4ei5T+B9gPs=";

  doCheck = false;

--- a/pkgs/applications/misc/mepo/default.nix
+++ b/pkgs/applications/misc/mepo/default.nix
@ -17,23 +17,23 @@
 , util-linux
 , xwininfo
 , zenity
-, zig_0_10
+, zig_0_11
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "mepo";
-  version = "1.1.2";
+  version = "1.2.0";

  src = fetchFromSourcehut {
    owner = "~mil";
    repo = "mepo";
    rev = finalAttrs.version;
-    hash = "sha256-rKIyhr0sxG1moFsapylJWoAoHi9FSRdugIHr/TqY71s=";
+    hash = "sha256-sxN7yTnk3KDAkP/d3miKa2bEgB3AUaf9/M9ajJyRt3g=";
  };

  nativeBuildInputs = [
    pkg-config
-    zig_0_10.hook
+    zig_0_11.hook
    makeWrapper
  ];

--- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix
+++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix
@ -5,7 +5,7 @@

 buildGoPackage rec {
  pname = "ssm-session-manager-plugin";
-  version = "1.2.463.0";
+  version = "1.2.497.0";

  goPackagePath = "github.com/aws/session-manager-plugin";

@ -13,7 +13,7 @@ buildGoPackage rec {
    owner = "aws";
    repo = "session-manager-plugin";
    rev = version;
-    hash = "sha256-0n7/3CAPf+ioSE041Zik9xeHt5qtrdHotJjBWhizExo=";
+    hash = "sha256-DX+Jm7u0gNX3o0QYIbE6Vzsmqys+09lQGHpIuqBEwMI=";
  };

  postPatch = ''
--- a/pkgs/applications/science/math/eigenmath/default.nix
+++ b/pkgs/applications/science/math/eigenmath/default.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "eigenmath";
-  version = "unstable-2023-06-16";
+  version = "unstable-2023-08-03";

  src = fetchFromGitHub {
    owner = "georgeweigt";
    repo = pname;
-    rev = "800adc5c0bd654eb9ad28497e1b78c4061b3a4cb";
-    hash = "sha256-/ViU44E3myAc7B8amm/TaIh70g2Z7IC4KRRG3++nOKs=";
+    rev = "f202cf0c342e54e994c4d416daecc1b1dc8b9c98";
+    hash = "sha256-kp4zWTPYt2DiuPgTK+ib8NbKg2BJVxJDDCvIlWNuwgs=";
  };

  checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in ''
@ -43,5 +43,6 @@ stdenv.mkDerivation rec {
    homepage = "https://georgeweigt.github.io";
    license = licenses.bsd2;
    maintainers = with maintainers; [ nickcao ];
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@ -2,13 +2,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "numix-icon-theme-circle";
-  version = "23.07.21";
+  version = "23.08.09";

  src = fetchFromGitHub {
    owner = "numixproject";
    repo = pname;
    rev = version;
-    sha256 = "sha256-QwbjJ38fWRkzd1nmsPWcwUQ7p96S/tGEvIfhLsOX1bg=";
+    sha256 = "sha256-YLr5WQox1TzGxRZGJf7NzFRhkNIPJaYFyOYwp9MfkDQ=";
  };

  nativeBuildInputs = [ gtk3 ];
--- a/pkgs/development/compilers/zig/generic.nix
+++ b/pkgs/development/compilers/zig/generic.nix
@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://ziglang.org/";
    changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ aiotter andrewrk AndersonTorres figsoda ];
+    maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members;
    platforms = lib.platforms.unix;
  };
 } // removeAttrs args [ "hash" ])
--- a/pkgs/development/python-modules/aws-lambda-builders/default.nix
+++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix
@ -3,6 +3,7 @@
 , fetchFromGitHub
 , mock
 , parameterized
+, pip
 , pyelftools
 , pytestCheckHook
 , pythonOlder
@ -30,6 +31,7 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    mock
    parameterized
+    pip
    pyelftools
    pytestCheckHook
  ];
--- a/pkgs/development/python-modules/batchspawner/default.nix
+++ b/pkgs/development/python-modules/batchspawner/default.nix
@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchFromGitHub
 , jupyterhub
+, packaging
 , pythonOlder
 }:

@ -21,6 +22,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    jupyterhub
+    packaging
  ];

  # Tests require a job scheduler e.g. slurm, pbs, etc.
@ -32,8 +34,9 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "A spawner for Jupyterhub to spawn notebooks using batch resource managers";
-    homepage = "https://jupyter.org";
+    homepage = "https://github.com/jupyterhub/batchspawner";
+    changelog = "https://github.com/jupyterhub/batchspawner/blob/v${version}/CHANGELOG.md";
    license = licenses.bsd3;
-    maintainers = [ ];
+    maintainers = with maintainers; [ ];
  };
 }
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "google-api-python-client";
-  version = "2.88.0";
+  version = "2.96.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-NwaEU/eeoo5TlKj+IKS6YgWU5/hUEGi+ouhE2s3MnTM=";
+    hash = "sha256-9xI3PQPTOK9XufX+mMkfS1uqqHZUabAVvGI8RoHFvVE=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
+++ b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
@ -1,29 +1,26 @@
 { lib
+, bash
 , buildPythonPackage
 , fetchFromGitHub
 , jupyterhub
+, pythonOlder
 , tornado
-, bash
 }:

 buildPythonPackage rec {
  pname = "jupyterhub-systemdspawner";
-  version = "0.15";
+  version = "1.0.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "jupyterhub";
    repo = "systemdspawner";
-    rev = "v${version}";
-    hash = "sha256-EUCA+CKCeYr+cLVrqTqe3Q32JkbqeALL6tfOnlVHk8Q=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-2Pxswa472umovHBUVTIX1l+Glj6bzzgBLsu+p4IA6jA=";
  };

-  propagatedBuildInputs = [
-    jupyterhub
-    tornado
-  ];
-
-  buildInputs = [ bash ];
-
  postPatch = ''
    substituteInPlace systemdspawner/systemd.py \
      --replace "/bin/bash" "${bash}/bin/bash"
@ -32,7 +29,16 @@ buildPythonPackage rec {
      --replace "/bin/bash" "${bash}/bin/bash"
  '';

-  # no tests
+  buildInputs = [
+    bash
+  ];
+
+  propagatedBuildInputs = [
+    jupyterhub
+    tornado
+  ];
+
+  # Module has no tests
  doCheck = false;

  postInstall = ''
@ -41,9 +47,14 @@ buildPythonPackage rec {
    patchShebangs $out/bin
  '';

+  pythonImportsCheck = [
+    "systemdspawner"
+  ];
+
  meta = with lib; {
    description = "JupyterHub Spawner using systemd for resource isolation";
    homepage = "https://github.com/jupyterhub/systemdspawner";
+    changelog = "https://github.com/jupyterhub/systemdspawner/blob/v${version}/CHANGELOG.md";
    license = licenses.bsd3;
    maintainers = with maintainers; [ ];
  };
--- a/pkgs/development/python-modules/jupyterhub/default.nix
+++ b/pkgs/development/python-modules/jupyterhub/default.nix
@ -1,30 +1,38 @@
 { lib
 , stdenv
-, buildPythonPackage
-, pythonOlder
-, fetchPypi
-, fetchzip
 , alembic
 , async-generator
+, beautifulsoup4
+, buildPythonPackage
 , certipy
-, python-dateutil
+, cryptography
 , entrypoints
+, fetchPypi
+, fetchzip
+, importlib-metadata
 , jinja2
+, jsonschema
 , jupyter-telemetry
+, jupyterlab
+, mock
+, nbclassic
+, nodePackages
+, notebook
 , oauthlib
+, packaging
 , pamela
+, playwright
 , prometheus-client
+, pytest-asyncio
+, pytestCheckHook
+, python-dateutil
+, pythonOlder
 , requests
+, requests-mock
+, selenium
 , sqlalchemy
 , tornado
 , traitlets
-, nodePackages
-, beautifulsoup4
-, cryptography
-, notebook
-, pytest-asyncio
-, pytestCheckHook
-, requests-mock
 , virtualenv
 }:

@ -61,12 +69,14 @@ in

 buildPythonPackage rec {
  pname = "jupyterhub";
-  version = "1.5.0";
-  disabled = pythonOlder "3.6";
+  version = "4.0.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-3GGPZXwjukYoDjYlflCTGAZnS6Dp5kmK+wke/GIm1p0=";
+    hash = "sha256-jig/9Z5cQBZxIHfSVJ7XSs2RWjKDb+ACGGeKh4G9ft4=";
  };

  # Most of this only applies when building from source (e.g. js/css assets are
@ -111,7 +121,6 @@ buildPythonPackage rec {
  '';

  propagatedBuildInputs = [
-    # https://github.com/jupyterhub/jupyterhub/blob/master/requirements.txt
    alembic
    async-generator
    certipy
@ -120,12 +129,16 @@ buildPythonPackage rec {
    jinja2
    jupyter-telemetry
    oauthlib
+    packaging
    pamela
    prometheus-client
    requests
+    selenium
    sqlalchemy
    tornado
    traitlets
+  ] ++ lib.optionals (pythonOlder "3.10") [
+    importlib-metadata
  ];

  preCheck = ''
@ -134,10 +147,14 @@ buildPythonPackage rec {
  '';

  nativeCheckInputs = [
-    # https://github.com/jupyterhub/jupyterhub/blob/master/dev-requirements.txt
    beautifulsoup4
    cryptography
    notebook
+    jsonschema
+    nbclassic
+    mock
+    jupyterlab
+    playwright
    pytest-asyncio
    pytestCheckHook
    requests-mock
@ -151,14 +168,39 @@ buildPythonPackage rec {
    "test_external_service"
    # attempts to do ssl connection
    "test_connection_notebook_wrong_certs"
+    # AttributeError: 'coroutine' object...
+    "test_valid_events"
+    "test_invalid_events"
+    "test_user_group_roles"
+  ];
+
+  disabledTestPaths = [
+    # Not testing with a running instance
+    # AttributeError: 'coroutine' object has no attribute 'db'
+    "docs/test_docs.py"
+    "jupyterhub/tests/browser/test_browser.py"
+    "jupyterhub/tests/test_api.py"
+    "jupyterhub/tests/test_auth_expiry.py"
+    "jupyterhub/tests/test_auth.py"
+    "jupyterhub/tests/test_metrics.py"
+    "jupyterhub/tests/test_named_servers.py"
+    "jupyterhub/tests/test_orm.py"
+    "jupyterhub/tests/test_pages.py"
+    "jupyterhub/tests/test_proxy.py"
+    "jupyterhub/tests/test_scopes.py"
+    "jupyterhub/tests/test_services_auth.py"
+    "jupyterhub/tests/test_singleuser.py"
+    "jupyterhub/tests/test_spawner.py"
+    "jupyterhub/tests/test_user.py"
  ];

  meta = with lib; {
-    broken = lib.versionAtLeast sqlalchemy.version "2.0";
    description = "Serves multiple Jupyter notebook instances";
    homepage = "https://jupyter.org/";
-    changelog = "https://github.com/jupyterhub/jupyterhub/blob/${version}/docs/source/changelog.md";
+    changelog = "https://github.com/jupyterhub/jupyterhub/blob/${version}/docs/source/reference/changelog.md";
    license = licenses.bsd3;
    maintainers = with maintainers; [ ixxie cstrahan ];
+    # darwin: E   OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found
+    broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
  };
 }
--- a/pkgs/development/python-modules/traits/default.nix
+++ b/pkgs/development/python-modules/traits/default.nix
@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "traits";
-  version = "6.4.1";
+  version = "6.4.2";
  format = "setuptools";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-eLssyv1gr/YGUVqsRt5kZooKgctcVMZQuYd6hBqp6BI=";
+    hash = "sha256-W+fMX7epnLp+kBR4Y3PjrS9177RF7s7QlGVLuvOw+oI=";
  };

  # Circular dependency
--- a/pkgs/development/tools/build-managers/buck2/default.nix
+++ b/pkgs/development/tools/build-managers/buck2/default.nix
@ -30,15 +30,26 @@ let
    aarch64-linux  = "aarch64-unknown-linux-musl";
  }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

+  allHashes = builtins.fromJSON (builtins.readFile ./hashes.json);
+
+  # our version of buck2; this should be a git tag
  buck2-version = "2023-08-01";
  src =
    let
-      hashes = builtins.fromJSON (builtins.readFile ./hashes.json);
-      sha256 = hashes."${stdenv.hostPlatform.system}";
+      hash = allHashes."${stdenv.hostPlatform.system}";
      url = "https://github.com/facebook/buck2/releases/download/${buck2-version}/buck2-${suffix}.zst";
-    in fetchurl { inherit url sha256; };
+    in fetchurl { inherit url hash; };
+
+  # compatible version of buck2 prelude; a git revision in the buck2-prelude repository
+  buck2-prelude = "acf49faaa61fd6ad9facd9e1418eed514bbb2ec8";
+  prelude-src =
+    let
+      hash = allHashes."_prelude";
+      url = "https://github.com/facebook/buck2-prelude/archive/${buck2-prelude}.tar.gz";
+    in fetchurl { inherit url hash; };
+
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
  pname = "buck2";
  version = "unstable-${buck2-version}"; # TODO (aseipp): kill 'unstable' once a non-prerelease is made
  inherit src;
@ -58,6 +69,8 @@ stdenv.mkDerivation {
  '';

  passthru = {
+    prelude = prelude-src;
+
    updateScript = ./update.sh;
    tests = testers.testVersion {
      package = buck2;
@ -77,7 +90,7 @@ stdenv.mkDerivation {
    homepage = "https://buck2.build";
    changelog = "https://github.com/facebook/buck2/releases/tag/${buck2-version}";
    license = with licenses; [ asl20 /* or */ mit ];
-    mainProgram = "buck2";
+    mainProgram = pname;
    maintainers = with maintainers; [ thoughtpolice ];
    platforms = [
      "x86_64-linux" "aarch64-linux"
--- a/pkgs/development/tools/build-managers/buck2/hashes.json
+++ b/pkgs/development/tools/build-managers/buck2/hashes.json
@ -1,4 +1,5 @@
 { "_comment": "@generated by pkgs/development/tools/build-managers/buck2/update.sh"
+, "_prelude": "sha256-SkCsVymQL/i8tUvKoLVtOQRYRm3zuF+WOFnbCggQwes="
 , "x86_64-linux": "sha256-wZULK2FPZ4GtQ5MMQmgfmtbMHJ7sPbue2RdVY0dmRuE="
 , "x86_64-darwin": "sha256-FmayArw2gswKjAEv0AzpFZNiXNx3GmJnPwH9g+Y/BGU="
 , "aarch64-linux": "sha256-3M1dRIFU0CwoVCbmq3oghhz51wW37melzt9hdIHqzzY="
--- a/pkgs/development/tools/build-managers/buck2/update.sh
+++ b/pkgs/development/tools/build-managers/buck2/update.sh
@ -9,7 +9,11 @@ VERSION=$(curl -s https://api.github.com/repos/facebook/buck2/releases \
             (select ((.prerelease == true) and (.name != "latest"))) |
             first
           ) | .name')
+PRELUDE_HASH=$(curl -sLo - "https://github.com/facebook/buck2/releases/download/${VERSION}/prelude_hash")
+PRELUDE_DL_URL="https://github.com/facebook/buck2-prelude/archive/${PRELUDE_HASH}.tar.gz"
+
 echo "Latest buck2 prerelease: $VERSION"
+echo "Compatible buck2-prelude hash: $PRELUDE_HASH"

 ARCHS=(
    "x86_64-linux:x86_64-unknown-linux-musl"
@ -22,7 +26,12 @@ NFILE=pkgs/development/tools/build-managers/buck2/default.nix
 HFILE=pkgs/development/tools/build-managers/buck2/hashes.json
 rm -f "$HFILE" && touch "$HFILE"

+PRELUDE_SHA256HASH="$(nix-prefetch-url --type sha256 "$PRELUDE_DL_URL")"
+PRELUDE_SRIHASH="$(nix hash to-sri --type sha256 "$PRELUDE_SHA256HASH")"
+
 printf "{ \"_comment\": \"@generated by pkgs/development/tools/build-managers/buck2/update.sh\"\n" >> "$HFILE"
+printf ", \"_prelude\": \"$PRELUDE_SRIHASH\"\n" >> "$HFILE"
+
 for arch in "${ARCHS[@]}"; do
    IFS=: read -r arch_name arch_target <<< "$arch"
    sha256hash="$(nix-prefetch-url --type sha256 "https://github.com/facebook/buck2/releases/download/${VERSION}/buck2-${arch_target}.zst")"
@ -35,4 +44,8 @@ sed -i \
  's/buck2-version\s*=\s*".*";/buck2-version = "'"$VERSION"'";/' \
  "$NFILE"

-echo "Done; wrote $HFILE and updated version"
+sed -i \
+  's/buck2-prelude\s*=\s*".*";/buck2-prelude = "'"$PRELUDE_HASH"'";/' \
+  "$NFILE"
+
+echo "Done; wrote $HFILE and updated version in $NFILE."
--- a/pkgs/development/tools/k6/default.nix
+++ b/pkgs/development/tools/k6/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "k6";
-  version = "0.45.0";
+  version = "0.45.1";

  src = fetchFromGitHub {
    owner = "grafana";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-nZXNUAS5HZTEMQ/sjetE30s/etpX/Hwp7QqgtOl3Rqs=";
+    sha256 = "sha256-TeZ4nAU5SorIrGeQ1zM8YWcDWPt3F2rhPLoKx2Vvl+Q=";
  };

  subPackages = [ "./" ];
--- a/pkgs/development/tools/misc/rustywind/default.nix
+++ b/pkgs/development/tools/misc/rustywind/default.nix
@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "rustywind";
-  version = "0.18.0";
+  version = "0.19.0";

  src = fetchFromGitHub {
    owner = "avencera";
    repo = "rustywind";
    rev = "v${version}";
-    hash = "sha256-rItLlyYUQODFazdVhCdAQgrrF8K2Cjuhyt5pvRyhSro=";
+    hash = "sha256-wPr+BNj3/YP+g0OkqkGSN1X8g/p3xDRcHvdDMAOP9Cc=";
  };

-  cargoHash = "sha256-sY4gXzMn7LTpJ/22BNKbmlHUbEx/CqS2+wa8DfLr/Fw=";
+  cargoHash = "sha256-frBE3pJvQdntt48/RHz3F2qqrgmXFR//5CyCfdcSfik=";

  buildInputs = lib.optionals stdenv.isDarwin [
    darwin.apple_sdk.frameworks.Security
--- a/pkgs/development/web/edge-runtime/default.nix
+++ b/pkgs/development/web/edge-runtime/default.nix
@ -11,7 +11,7 @@

 let
  pname = "edge-runtime";
-  version = "1.8.1";
+  version = "1.10.0";
 in
 rustPlatform.buildRustPackage {
  inherit pname version;
@ -20,11 +20,11 @@ rustPlatform.buildRustPackage {
    owner = "supabase";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-B8XsH2aOvd87nxUGpSpaNnpTIY0tKDWh7RkXoJcBjrs=";
+    hash = "sha256-AWdgqL7Io4v3Z4XNS5JDDGuUeSqsNpF/NpJQ7h5oJZs=";
    fetchSubmodules = true;
  };

-  cargoHash = "sha256-I8BC13WUlBdT6OxTD2t0Aw5qYXpUyOa0MYUB8H2XNx8=";
+  cargoHash = "sha256-AIwMoqbnCl4DFX0gSGblkV8DgtruwXPw8ngHeBDD6Dw=";

  nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];

--- a/pkgs/servers/sql/postgresql/ext/pg_net.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix
@ -0,0 +1,31 @@
+{ lib, stdenv, fetchFromGitHub, curl, postgresql }:
+
+stdenv.mkDerivation rec {
+  pname = "pg_net";
+  version = "0.7.2";
+
+  buildInputs = [ curl postgresql ];
+
+  src = fetchFromGitHub {
+    owner  = "supabase";
+    repo   = pname;
+    rev    = "refs/tags/v${version}";
+    hash   = "sha256-9Ki3fyinHTYrfckxAY0fCTlzJd9l+n7QRUV7mIWrqmc=";
+  };
+
+  installPhase = ''
+    mkdir -p $out/{lib,share/postgresql/extension}
+
+    cp *.so      $out/lib
+    cp sql/*.sql $out/share/postgresql/extension
+    cp *.control $out/share/postgresql/extension
+  '';
+
+  meta = with lib; {
+    description = "Async networking for Postgres";
+    homepage    = "https://github.com/supabase/pg_net";
+    maintainers = with maintainers; [ thoughtpolice ];
+    platforms   = postgresql.meta.platforms;
+    license     = licenses.postgresql;
+  };
+}
--- a/pkgs/servers/sql/postgresql/packages.nix
+++ b/pkgs/servers/sql/postgresql/packages.nix
@ -48,6 +48,8 @@ self: super: {

    pg_topn = super.callPackage ./ext/pg_topn.nix { };

+    pg_net = super.callPackage ./ext/pg_net.nix { };
+
    pgtap = super.callPackage ./ext/pgtap.nix { };

    pipelinedb = super.callPackage ./ext/pipelinedb.nix { };
--- a/pkgs/tools/admin/aws-nuke/default.nix
+++ b/pkgs/tools/admin/aws-nuke/default.nix
@ -5,23 +5,22 @@

 buildGoModule rec {
  pname = "aws-nuke";
-  version = "2.22.1";
+  version = "2.23.0";

  src = fetchFromGitHub {
    owner = "rebuy-de";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-cI6HoXclJDMDGBk2RdvzG7kNzfMu133mx+a83gQM5aA=";
+    hash = "sha256-fvEUZWnYjSZrdTLTq1WVuZ3GaIWqdk3+qnuXDwT0K/0=";
  };

-  vendorSha256 = "sha256-DkamoQxwJUhO3Q0dh3pig9j6ZiYhZXVPWltK1P8dzhc=";
+  vendorHash = "sha256-c9OpKsP4TQ4aDZnHPSy6tNmNBN6tsj4Kb8WOig5+ogI=";

-  preBuild = ''
-    if [ "x$outputHashAlgo" != "x" ]; then
-      # Only `go generate` when fetching the go mod vendor code
+  overrideModAttrs = _: {
+    preBuild = ''
      go generate ./...
-    fi
-  '';
+    '';
+  };

  doCheck = false;

--- a/pkgs/tools/audio/beets/common.nix
+++ b/pkgs/tools/audio/beets/common.nix
@ -181,5 +181,6 @@ EOF
    license = licenses.mit;
    maintainers = with maintainers; [ aszlig doronbehar lovesegfault pjones ];
    platforms = platforms.linux;
+    mainProgram = "beet";
  };
 }
--- a/pkgs/tools/misc/pgmetrics/default.nix
+++ b/pkgs/tools/misc/pgmetrics/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "pgmetrics";
-  version = "1.15.0";
+  version = "1.15.1";

  src = fetchFromGitHub {
    owner = "rapidloop";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-tEPn+/xTDBFWf3SH/+5R38zWGAmMCHcFw/JvuvG2Jvs=";
+    sha256 = "sha256-6JqlAJHFJAvJjLqOwXLmW7sRwQCmYFfLGrSw5lTY8Sc=";
  };

-  vendorHash = "sha256-jRgOIhRB5F/rbfNniXoOllvDqoHP8nkVwmEPSreHYXg=";
+  vendorHash = "sha256-KIMnvGMIipuIFPTSeERtCfvlPuvHvEHdjBJ1TbT2d1s=";

  doCheck = false;

--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "minio-client";
-  version = "2023-07-21T20-44-27Z";
+  version = "2023-08-08T17-23-59Z";

  src = fetchFromGitHub {
    owner = "minio";
    repo = "mc";
    rev = "RELEASE.${version}";
-    sha256 = "sha256-y0+AGDI4zxMgcC65U51/UHW2mo0NNNKc+MQCcFevHmk=";
+    sha256 = "sha256-rXYpAidwwd1sa+22r39VAirVCDdhzFRE5qSQNZf65sg=";
  };

-  vendorHash = "sha256-6duYIeNkqql9y1Wo+foMe88dmPmHZ625FBTDdKsHnCE=";
+  vendorHash = "sha256-2zBwqwYyE/9R8Ns5kkvu/JxxYyjnEULBnW+ObYnZ40w=";

  subPackages = [ "." ];

--- a/pkgs/tools/security/vault/vault-bin.nix
+++ b/pkgs/tools/security/vault/vault-bin.nix
@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  pname = "vault-bin";
-  version = "1.13.3";
+  version = "1.14.1";

  src =
    let
@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
        aarch64-darwin = "darwin_arm64";
      };
      sha256 = selectSystem {
-        x86_64-linux = "sha256-heC2VX656nAlYoTwfa4Tv+tlkclfKxNTTpWa+Y6XWLA=";
-        aarch64-linux = "sha256-Alx8Lacb0IO8kSjYwkeytGxQkCM57zTSk+JXATxZ1eU=";
-        i686-linux = "sha256-eJW6boE0KG4oF/Sf1UxWVXkwLOx5R6ohrpog3YXKfvY=";
-        x86_64-darwin = "sha256-lWLEr0arVR7fpgxGEZqkoj/w4YHzNQo+jILZRQ53Eok=";
-        aarch64-darwin = "sha256-hGlmOKLpb9P/pO8ilxG2dLYDULXarp55/e8HoSbHz98=";
+        x86_64-linux = "sha256-4CBj8XMRrK9BNzjC6/5A62q85LgnGx/K5jselB5bb+g=";
+        aarch64-linux = "sha256-MAIudk/2X+2WWF0hv3qKklIYuymQPx75Dg8e0gV1gt0=";
+        i686-linux = "sha256-bqkdOLa99uNwsUIkkIygFcWYgmMplty/YaL46o+LWEM=";
+        x86_64-darwin = "sha256-a1CSMOTVpYIjto25VkiAmKEwBr0CaMJhiTFYEUcwqPM=";
+        aarch64-darwin = "sha256-OZ3l6/gyHI80dABmhaLrFbsau3Yp9hE2U7qPLVBwjoo=";
      };
    in
    fetchzip {
--- a/pkgs/tools/text/rsbkb/default.nix
+++ b/pkgs/tools/text/rsbkb/default.nix
@ -1,29 +1,29 @@
-{ lib,
-  fetchFromGitHub,
-  rustPlatform,
-  enableAppletSymlinks ? true,
+{ lib
+, fetchFromGitHub
+, rustPlatform
+, enableAppletSymlinks ? true
 }:

 rustPlatform.buildRustPackage rec {
  pname = "rsbkb";
-  version = "1.1";
+  version = "1.2";

  src = fetchFromGitHub {
    owner = "trou";
    repo = "rsbkb";
    rev = "release-${version}";
-    hash = "sha256-SqjeH0eOo+upSfPWh2IW75p1VHMqmzAbCchDrXhvMxs=";
+    hash = "sha256-Y6YTjEbefNUPcl6rNYWVZLGZYTUPr5pvfLabS+zDWqA=";
  };
-  cargoSha256 = "N3Xlw2JzTjqWLiVNCZaomsWQl330kGVlwdz4Gf05TGU=";
+
+  cargoHash = "sha256-RMX+ZdPaqtqRJvhHFJJrPZnBGwQwZSCXNg1oNo+v2+8=";

  # Setup symlinks for all the utilities,
  # busybox style
-  postInstall = lib.optionalString enableAppletSymlinks
-    ''
+  postInstall = lib.optionalString enableAppletSymlinks ''
    cd $out/bin || exit 1
    path="$(realpath --canonicalize-missing ./rsbkb)"
    for i in $(./rsbkb list) ; do ln -s $path $i ; done
-    '';
+  '';

  meta = with lib; {
    description = "Command line tools to encode/decode things";
--- a/pkgs/tools/text/uwc/default.nix
+++ b/pkgs/tools/text/uwc/default.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "uwc";
-  version = "1.0.4";
+  version = "1.0.5";

  src = fetchFromGitLab {
    owner = "dead10ck";
    repo = pname;
    rev = "v${version}";
-    sha256 = "1ywqq9hrrm3frvd2sswknxygjlxi195kcy7g7phwq63j7hkyrn50";
+    hash = "sha256-x2mijB1GkxdraFroG1+PiBzWKPjsaAeoDt0HFL2v93I=";
  };

-  cargoSha256 = "04pslga3ff766cpb73n6ivzmqfa0hm19gcla8iyv6p59ddsajh3q";
+  cargoHash = "sha256-0IvOaQaXfdEz5tlXh5gTbnZG9QZSWDVHGOqYq8aWOIc=";

  doCheck = true;