Merge master into staging-nixos

Both `pam_unix.so` and `pam_unix_ng.so` look at `ENCRYPT_METHOD` in
`/etc/login.defs` to determine the algorithm to use for password
encryption: 66fbd0382b/src/pam_unix_ng-common.c (L27-L62)
If this is not set, both already default to `YESCRYPT`.
The shadow module makes this configurable via
`security.loginDefs.settings.ENCRYPT_METHOD`, which also defaults to `YESCRYPT`.
Seeing as what was previously hardcoded is default anyways, with a global
configuration option to change it, there is no point to keep this.

maintainers/maintainer-list.nix

@@ -15629,12 +15629,6 @@
     githubId = 632767;
     name = "Guillaume Maudoux";
   };
-  layzyoldman = {
-    email = "ricardopaivacampos@gmail.com";
-    github = "layzyoldman";
-    githubId = 193278607;
-    name = "Ricardo Campos";
-  };
   LazilyStableProton = {
     email = "LazilyStable@proton.me";
     github = "LazyStability";
@@ -19316,12 +19310,6 @@
     githubId = 220262;
     name = "Ion Mudreac";
   };
-  mugaizzo = {
-    email = "mugahedman@hotmail.com";
-    github = "mugaizzo";
-    githubId = 15838537;
-    name = "Mugahed Izzeldin";
-  };
   mulatta = {
     email = "seungwon@mulatta.io";
     github = "mulatta";

nixos/lib/test-driver/src/test_driver/__init__.py

@@ -89,6 +89,11 @@ def main() -> None:
         type=Path,
         required=True,
     )
+    arg_parser.add_argument(
+        "--test-script",
+        help="path to a test script to run, taking precedence over the one defined in the config file",
+        type=Path,
+    )
     arg_parser.add_argument(
         "--keep-vm-state",
         help=argparse.SUPPRESS,
@@ -163,8 +168,12 @@ def main() -> None:
     if args.debug_hook_attach is not None:
         debugger = Debug(logger, args.debug_hook_attach)
 
+    config = load_driver_configuration(args.config)
+    if args.test_script is not None:
+        config.test_script = args.test_script
+
     with Driver(
-        config=load_driver_configuration(args.config),
+        config=config,
         out_dir=output_directory,
         logger=logger,
         keep_machine_state=args.keep_machine_state,

nixos/modules/security/pam.nix

@@ -1422,7 +1422,6 @@ let
                 modulePath = config.security.pam.pam_unixModulePath;
                 settings = {
                   nullok = true;
-                  yescrypt = lib.mkIf config.security.pam.enableLegacySettings true;
                 };
               }
               {

nixos/modules/services/display-managers/gdm.nix

@@ -577,7 +577,6 @@ in
               control = "requisite";
               modulePath = config.security.pam.pam_unixModulePath;
               settings.nullok = true;
-              settings.yescrypt = true;
             }
           ];
 

nixos/modules/services/x11/display-managers/lightdm.nix

@@ -456,7 +456,6 @@ in
             control = "requisite";
             modulePath = config.security.pam.pam_unixModulePath;
             settings.nullok = true;
-            settings.yescrypt = true;
           }
         ];
 

nixos/tests/all-tests.nix

@@ -153,6 +153,7 @@ in
     console-log = runTest ./nixos-test-driver/console-log.nix;
     containers = runTest ./nixos-test-driver/containers.nix;
     nspawn-daemon-reexec-dbus = runTest ./nspawn-daemon-reexec-dbus.nix;
+    multi-arch-test = runTest ./nixos-test-driver/multi-arch-test.nix;
     skip-typecheck = runTest ./nixos-test-driver/skip-typecheck.nix;
     console-timeout = runTest ./nixos-test-driver/console-timeout.nix;
     options-doc-regression = import ./nixos-test-driver/options-doc-regression.nix { inherit pkgs; };

nixos/tests/login-nosuid.nix

@@ -57,6 +57,7 @@
     with subtest("create user"):
         machine.succeed("useradd -m alice")
         machine.succeed("(echo foobar; echo foobar) | passwd alice")
+        machine.succeed("grep -F 'alice:$y$' /etc/shadow")
 
     with subtest("Check whether switching VTs works"):
         machine.fail("pgrep -f 'agetty.*tty2'")

nixos/tests/login.nix

@@ -28,6 +28,7 @@
     with subtest("create user"):
         machine.succeed("useradd -m alice")
         machine.succeed("(echo foobar; echo foobar) | passwd alice")
+        machine.succeed("grep -F 'alice:$y$' /etc/shadow")
 
     with subtest("Check whether switching VTs works"):
         machine.fail("pgrep -f 'agetty.*tty2'")

nixos/tests/nixos-test-driver/multi-arch-test.nix

@@ -0,0 +1,55 @@
+{ pkgs, lib, ... }:
+{
+  name = "multi-arch-test";
+  meta.maintainers = with pkgs.lib.maintainers; [ tfc ];
+
+  node.pkgsReadOnly = false;
+
+  nodes = {
+    # Setting build = host platform because such standard VM setups
+    # are well-cached by the multi-arch build infrastructure of the
+    # project.
+    vmIntel = {
+      nixpkgs.buildPlatform = "x86_64-linux";
+      nixpkgs.hostPlatform = "x86_64-linux";
+    };
+    vmArm = {
+      nixpkgs.buildPlatform = "aarch64-linux";
+      nixpkgs.hostPlatform = "aarch64-linux";
+    };
+  };
+
+  defaults = {
+    # not needed for this test and shrinks the closure
+    # because we dont' need qemu for all architectures
+    virtualisation.qemu.guestAgent.enable = false;
+
+    # the test is already very slow but we don't need DHCP anyway
+    networking.dhcpcd.enable = false;
+
+    # fix the network-online target, otherwise it doesn't work
+    # properly as a synchronization mechanism.
+    systemd.network.wait-online.enable = true;
+    systemd.network.wait-online.anyInterface = true;
+  };
+
+  # slow due to SW emulation but shouldn't be slower than that
+  globalTimeout = 5 * 60;
+
+  testScript = { nodes, ... }: /* python */ ''
+    start_all()
+
+    vmIntel.systemctl("start network-online.target")
+    vmArm.systemctl("start network-online.target")
+    vmIntel.wait_for_unit("network-online.target")
+    vmArm.wait_for_unit("network-online.target")
+
+    vmIntel.succeed("ping -c 1 vmArm")
+    vmArm.succeed("ping -c 1 vmIntel")
+
+    archIntel = vmIntel.succeed("uname -m")
+    t.assertIn("${nodes.vmIntel.nixpkgs.hostPlatform.qemuArch}", archIntel, "machine1 is an intel VM")
+    archArm = vmArm.succeed("uname -m")
+    t.assertIn("${nodes.vmArm.nixpkgs.hostPlatform.qemuArch}", archArm, "machine1 is an ARM VM")
+  '';
+}

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -1508,12 +1508,12 @@
     "vendorHash": "sha256-8p6dJwGyTK+qtgplSLtIRKxnNAQAgHfs4z/EsBcg/iY="
   },
   "yandex-cloud_yandex": {
-    "hash": "sha256-0155GXJMfoCnyqaJiF5SJIA1Qz1q2AYe/BB0AYODG/0=",
+    "hash": "sha256-YiUARVEsGfD4IUuTFSrkAIAD6kOyFUoLebSaZtW9FcE=",
     "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
     "owner": "yandex-cloud",
     "repo": "terraform-provider-yandex",
-    "rev": "v0.218.0",
+    "rev": "v0.215.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-FfZvuC/XXhKS03E+l4/9KCLSwx+uTP1LzywckZqX6pA="
+    "vendorHash": "sha256-YNCd1i2HDa0aToZ0vEr6tRugXnBXE+zymhLM+rmRNPI="
   }
 }

pkgs/by-name/bt/btrfs-progs/package.nix

@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "btrfs-progs";
-  version = "7.0";
+  version = "7.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${finalAttrs.version}.tar.xz";
-    hash = "sha256-wobWh2y81yMnoLQX5M/SgDU+wj43tUn9vNeACoMtmpk=";
+    hash = "sha256-0fVcwpcTmMkULqp50gPmPVhqO0uGf5VmZKHWgyLNTjQ=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ca/caesura/package.nix

@@ -1,10 +1,7 @@
 {
   lib,
   fetchFromGitHub,
-  fetchpatch2,
   rustPlatform,
-  cacert,
-  writableTmpDirAsHomeHook,
   flac,
   lame,
   makeBinaryWrapper,
@@ -19,37 +16,24 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "caesura";
-  version = "0.31.0";
+  version = "0.27.2";
 
   src = fetchFromGitHub {
     owner = "RogueOneEcho";
     repo = "caesura";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+REt+MKImO7fnYWJ32P6mKzulGJTnxc+9ednVF5aCJU=";
+    hash = "sha256-ifaZ+rmMmWhn8HM25sRPXJKuXvWE5VG+5hFMi9hqxA0=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "normalize-sox-dependent-full-spectrogram-widths.patch";
-      url = "https://github.com/RogueOneEcho/caesura/commit/3af818ae35a3e18f444c889d9d3b88294f4f110f.patch?full_index=1";
-      hash = "sha256-znAbk6hFVj198BUUwwDo76SWei0cKINeXzlYEFvTwHA=";
-    })
-  ];
-
-  cargoHash = "sha256-0+vZma8AC44XqVHzmJT/roV7sy8w6DYhujRK9N91J5c=";
+  cargoHash = "sha256-g8Duhl5nZ6umIrAafW7s4vtDS+f06CWnFLoLSw0wa4o=";
 
   nativeBuildInputs = [
     makeBinaryWrapper
   ];
-  nativeCheckInputs = [
-    cacert
-    writableTmpDirAsHomeHook
-  ]
-  ++ runtimeDeps;
+  nativeCheckInputs = runtimeDeps;
 
   env = {
     CAESURA_NIX = "1";
-    SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
   };
 
   postPatch = ''

pkgs/by-name/ge/gecode/package.nix

@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   bison,
-  cmake,
   flex,
   perl,
   gmp,
@@ -12,22 +12,30 @@
   enableGist ? true,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation rec {
   pname = "gecode";
-  version = "6.4.0";
+  version = "6.2.0";
 
   src = fetchFromGitHub {
     owner = "Gecode";
     repo = "gecode";
-    tag = "release-${finalAttrs.version}";
-    hash = "sha256-WhMN7QC+VQfvHUV1LLaW7I7fG++/fznh1ZDUY/Q8zD8=";
+    rev = "release-${version}";
+    sha256 = "0b1cq0c810j1xr2x9y9996p894571sdxng5h74py17c6nr8c6dmk";
   };
 
+  patches = [
+    # https://github.com/Gecode/gecode/pull/74
+    (fetchpatch {
+      name = "fix-const-weights-clang.patch";
+      url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch";
+      sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc";
+    })
+  ];
+
   enableParallelBuilding = true;
   dontWrapQtApps = true;
   nativeBuildInputs = [
     bison
-    cmake
     flex
   ];
   buildInputs = [
@@ -44,4 +52,4 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.all;
     maintainers = [ ];
   };
-})
+}

pkgs/by-name/ki/kiro-cli/package.nix

@@ -3,17 +3,10 @@
   stdenv,
   fetchurl,
   autoPatchelfHook,
-  makeBinaryWrapper,
   undmg,
   versionCheckHook,
   xz,
   bzip2,
-  wl-clipboard,
-  # On Wayland, kiro-cli shells out to wl-clipboard (wl-copy/wl-paste) for
-  # clipboard access. Enabling this puts wl-clipboard on the runtime PATH so
-  # clipboard support works out of the box under Wayland sessions. Has no
-  # effect on Darwin.
-  waylandSupport ? stdenv.hostPlatform.isLinux,
 }:
 
 let
@@ -48,9 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
     lib.optionals stdenv.hostPlatform.isLinux [
       autoPatchelfHook
     ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && waylandSupport) [
-      makeBinaryWrapper
-    ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       undmg
     ];
@@ -75,12 +65,6 @@ stdenv.mkDerivation (finalAttrs: {
     install -Dm755 bin/kiro-cli-chat $out/bin/kiro-cli-chat
     install -Dm755 bin/kiro-cli-term $out/bin/kiro-cli-term
   ''
-  + lib.optionalString (stdenv.hostPlatform.isLinux && waylandSupport) ''
-    for bin in kiro-cli kiro-cli-chat kiro-cli-term; do
-      wrapProgram $out/bin/$bin \
-        --suffix PATH : ${lib.makeBinPath [ wl-clipboard ]}
-    done
-  ''
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/bin $out/Applications
     cp -r "../Kiro CLI.app" "$out/Applications/"

pkgs/by-name/ku/ku/package.nix

@@ -8,14 +8,14 @@
 
 buildGo126Module (finalAttrs: {
   pname = "ku";
-  version = "0.9.0";
+  version = "0.8.2";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "bjarneo";
     repo = "ku";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4z4lPvmkEqC7YBEaAa8cUyB42hkFkTFRkHGaA58/Vpg=";
+    hash = "sha256-vUv4eKTCucJ/ol76z0Q3jOigYBSwM823ZxjvBFqv1yY=";
   };
 
   vendorHash = "sha256-x7O2/uKnIIFDr8WK0ej3FJiIGxN5Fq5Czqrv4OJ5A44=";

pkgs/by-name/mi/minizinc/package.nix

@@ -13,6 +13,22 @@
   zlib,
 }:
 
+let
+  gecode_6_3_0 = gecode.overrideAttrs (_: {
+    version = "6.3.0";
+    src = fetchFromGitHub {
+      owner = "gecode";
+      repo = "gecode";
+      rev = "f7f0d7c273d6844698f01cec8229ebe0b66a016a";
+      hash = "sha256-skf2JEtNkRqEwfHb44WjDGedSygxVuqUixskTozi/5k=";
+    };
+    patches = [ ];
+  });
+in
+let
+  gecode = gecode_6_3_0;
+in
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "minizinc";
   version = "2.9.7";

pkgs/by-name/op/openresolv/package.nix

@@ -13,8 +13,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "NetworkConfiguration";
     repo = "openresolv";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-I86BHiSI3G4xlYRJC99elHw8RyUd3eHdkV5kiEGRXNE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-I86BHiSI3G4xlYRJC99elHw8RyUd3eHdkV5kiEGRXNE=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -38,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
+    changelog = "https://github.com/NetworkConfiguration/openresolv/releases/tag/${finalAttrs.src.tag}";
     description = "Program to manage /etc/resolv.conf";
     mainProgram = "resolvconf";
     homepage = "https://roy.marples.name/projects/openresolv";

pkgs/by-name/ph/phpantom-lsp/package.nix

@@ -6,17 +6,19 @@
   _experimental-update-script-combinators,
   nix-update-script,
 }:
+
 let
   stubsSrc = fetchFromGitHub {
     owner = "JetBrains";
     repo = "phpstorm-stubs";
-    rev = "f6dd2dd35d99fb774251a83555fe07bf2109d57e";
-    hash = "sha256-H9Td/yi9Um0Z9ifxZdh74bvGCMVSC+MA1OHrtbGD8vE=";
+    rev = "517b9ad1adaf2c5453c00ec2fbb02d192a4a9b6c";
+    hash = "sha256-IDWAuy301avfTF/E7Mby2JQQtIr/gnN5flZ3uctUpus=";
   };
 in
+
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "phpantom-lsp";
-  version = "0.9.0";
+  version = "0.8.0";
 
   __structuredAttrs = true;
 
@@ -24,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "AJenbo";
     repo = "phpantom_lsp";
     tag = finalAttrs.version;
-    hash = "sha256-euWaFH40VHefZewUcKvsLwwHZP+GwfTN8kfuAkaABB8=";
+    hash = "sha256-00NAiPm3qqxyS1u1GPpJlgnBlUjDx9VmjK6oOwH8kcU=";
   };
 
   postPatch = ''
@@ -36,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       > stubs/jetbrains/phpstorm-stubs/.commit
   '';
 
-  cargoHash = "sha256-2MIJxVRqyCv5HzCwY1s+rCp1A4vFRsyAEEuyIEegZMA=";
+  cargoHash = "sha256-FyMI8Kb3QUD8Jui9k7vayMcQC+KWL8sZi3A05NPbXsg=";
 
   checkFlags = [
     "--test"

pkgs/by-name/po/pomo/package.nix

@@ -1,39 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-  iana-etc,
-  libredirect,
-  stdenvNoCC,
-}:
-buildGoModule (finalAttrs: {
-  pname = "pomo";
-  version = "1.2.1";
-
-  __structuredAttrs = true;
-
-  src = fetchFromGitHub {
-    owner = "Bahaaio";
-    repo = "pomo";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-gQ7bHQGaQPujpOwVdcwKgiYQjUECi/Pjt5LKwa1v1J8=";
-  };
-
-  vendorHash = "sha256-kbTYq4Xc86bcmNMhInq1rwYTbGRmu2TEXT2e7bqT5YY=";
-
-  nativeCheckInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ libredirect.hook ];
-
-  preCheck = lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
-    export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/services=${iana-etc}/etc/services
-  '';
-
-  meta = {
-    description = "Customizable TUI Pomodoro timer with ASCII art, progress bar, notifications, and stats";
-    homepage = "https://github.com/Bahaaio/pomo";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      mugaizzo
-    ];
-    mainProgram = "pomo";
-  };
-})

pkgs/by-name/pv/pvetui/package.nix

@@ -7,7 +7,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "pvetui";
-  version = "1.4.3";
+  version = "1.4.2";
 
   __structuredAttrs = true;
 
@@ -15,10 +15,10 @@ buildGoModule (finalAttrs: {
     owner = "devnullvoid";
     repo = "pvetui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8mfp5bfROqT6DcxByaHZRTkDHJpfclCpeaJaINLKmlk=";
+    hash = "sha256-yYYGXb+CriDRZcV8e/7MN4Pq8GKP35JdMrcxozWVBpE=";
   };
 
-  vendorHash = "sha256-7Tuh9T3uTlNxdSlSL7gQIYXpfpNbCkQrRWj/FoU8fbU=";
+  vendorHash = "sha256-JOo/7/3J9LqefIYuRl9efSlSfzLvQ/B8Jpy2e5cdEio=";
 
   subPackages = [ "cmd/pvetui" ];
 

pkgs/by-name/sc/schemat/package.nix

@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "schemat";
-  version = "0.5.3";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "raviqqe";
     repo = "schemat";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vA5J76wU2FlKz1fxTgv8jVuV4RIOML+tI5Y/dXyc9f0=";
+    hash = "sha256-Ij7JigbXhE2o0Z61uZ3W/pK7zcQyrX+SMpF0iKsVx30=";
   };
 
-  cargoHash = "sha256-LGZE3r9n+KtnCiCxc/3K981wq4fN6ZR/KD8b638DmeM=";
+  cargoHash = "sha256-oaET2IGU78TUC98HKsiQnbg7R262ugrn8oiLeKC767s=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

pkgs/by-name/ve/vesta-viewer/package.nix

@@ -6,11 +6,9 @@
   makeDesktopItem,
   copyDesktopItems,
   autoPatchelfHook,
-  wrapGAppsHook3,
-  makeWrapper,
   _7zz,
+
   glib,
-  gsettings-desktop-schemas,
   libGL,
   libGLU,
   libgcc,
@@ -33,10 +31,7 @@ let
     platforms = [
       "x86_64-linux"
     ];
-    maintainers = with lib.maintainers; [
-      ulysseszhan
-      layzyoldman
-    ];
+    maintainers = with lib.maintainers; [ ulysseszhan ];
     mainProgram = "VESTA";
   };
 
@@ -44,12 +39,9 @@ let
     nativeBuildInputs = [
       copyDesktopItems
       autoPatchelfHook
-      wrapGAppsHook3
-      makeWrapper
     ];
     buildInputs = [
       glib
-      gsettings-desktop-schemas
       libGL
       libGLU
       libgcc
@@ -60,9 +52,6 @@ let
       libxtst
     ];
 
-    # Prevent wrapGAppsHook3 from auto-wrapping binaries.
-    dontWrapGApps = true;
-
     src = fetchzip {
       url = "https://jp-minerals.org/vesta/archives/${version}/VESTA-gtk3.tar.bz2";
       hash = "sha256-Dm4exMUgNZ6Sh8dVhsvLZGS38UXxe9t+9s3ttBQajGg=";
@@ -75,7 +64,7 @@ let
       cp -r * $out/lib/VESTA
 
       mkdir -p $out/bin
-      ln -s $out/lib/VESTA/VESTA{-core,-gui} -t $out/bin
+      ln -s $out/lib/VESTA/VESTA{,-core,-gui} -t $out/bin
 
       mkdir -p $out/share/icons/hicolor/{128x128,256x256}/apps
       ln -s $out/lib/VESTA/img/logo.png $out/share/icons/hicolor/128x128/apps/VESTA.png
@@ -84,11 +73,6 @@ let
       runHook postInstall
     '';
 
-    # Wrap GSettings/XDG_DATA_DIRS into a single wrapper.
-    postFixup = ''
-      makeWrapper $out/lib/VESTA/VESTA $out/bin/VESTA "''${gappsWrapperArgs[@]}"
-    '';
-
     desktopItems = [
       (makeDesktopItem {
         name = "vesta";
@@ -98,18 +82,14 @@ let
         exec = "VESTA %u";
         icon = "VESTA";
         categories = [ "Science" ];
-        mimeTypes = [
-          "chemical/x-cif"
-          "chemical/x-pdb"
-          "chemical/x-xyz"
-        ];
+        mimeTypes = [ "application/x-vesta" ];
       })
     ];
   };
 
   darwinArgs = {
     nativeBuildInputs = [
-      _7zz
+      _7zz # instead of undmg because of APFS
     ];
     src = fetchurl {
       url = "https://jp-minerals.org/vesta/archives/${version}/VESTA.dmg";

pkgs/by-name/vi/vivliostyle/0001-allow-specifying-browser-path-via-env-var.patch

@@ -1,20 +0,0 @@
----
- src/browser.ts | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/browser.ts b/src/browser.ts
-index 8e653e2..ae57d2f 100644
---- a/src/browser.ts
-+++ b/src/browser.ts
-@@ -355,6 +355,8 @@ export async function getExecutableBrowserPath({
-   type,
-   tag,
- }: ResolvedTaskConfig['browser']): Promise<string> {
-+  const envPath = process.env.VIVLIOSTYLE_BROWSER_PATH;
-+  if (envPath && fs.existsSync(envPath)) return envPath;
-   const browsers = await importNodeModule('@puppeteer/browsers');
-   const buildId = await resolveBuildId({ type, tag, browsers });
-   return browsers.computeExecutablePath({
--- 
-2.54.0
-

pkgs/by-name/vi/vivliostyle/package.nix

@@ -1,99 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchPnpmDeps,
-  nix-update-script,
-
-  # build-time
-  makeBinaryWrapper,
-  nodejs,
-  pnpmBuildHook,
-  pnpmConfigHook,
-  pnpm_10,
-
-  chromium,
-  defaultBrowser ? chromium,
-}:
-
-let
-  pnpm = pnpm_10;
-in
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "vivliostyle";
-  version = "11.1.0";
-
-  src = fetchFromGitHub {
-    owner = "vivliostyle";
-    repo = "vivliostyle-cli";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-rbb/av3amlLit7OjTc+S/pf1SrxEnsENQOArgnc7k3s=";
-  };
-
-  patches = [
-    ./0001-allow-specifying-browser-path-via-env-var.patch
-  ];
-
-  __structuredAttrs = true;
-  strictDeps = true;
-
-  pnpmDeps = fetchPnpmDeps {
-    inherit (finalAttrs) pname version src;
-    inherit pnpm;
-    fetcherVersion = 4;
-    hash = "sha256-WPTCLAEWmD1TY84281TJCzp+mcjMFM5Xwf02s7U+M4U=";
-  };
-
-  nativeBuildInputs = [
-    makeBinaryWrapper
-    nodejs
-    pnpm
-    pnpmBuildHook
-    pnpmConfigHook
-  ];
-
-  pnpmBuildFlags = [
-    "--mode"
-    "production"
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/{bin,lib}
-    mv {node_modules,dist,examples,packages,package.json} $out/lib
-
-    runHook postInstall
-  '';
-
-  postFixup = ''
-    chmod +x $out/lib/dist/cli.js
-    patchShebangs $out/usr/lib/dist/cli.js
-
-    makeWrapper $out/lib/dist/cli.js $out/bin/vivliostyle \
-      --prefix PATH : ${lib.makeBinPath [ nodejs ]} \
-      --set VIVLIOSTYLE_BROWSER_PATH ${lib.getExe defaultBrowser}
-
-    ln -s $out/bin/vivliostyle $out/bin/vs
-  '';
-
-  passthru = {
-    updateScript = nix-update-script { };
-  };
-
-  meta = {
-    description = "CLI tool for typesetting HTML and Markdown documents";
-    longDescription = ''
-      Vivliostyle is a CSS typesetting ecosystem for creating beautifully
-      formatted documents using web technologies.
-    '';
-    homepage = "https://github.com/vivliostyle/vivliostyle-cli";
-    changelog = "https://github.com/vivliostyle/vivliostyle-cli/blob/${finalAttrs.src.rev}/CHANGELOG.md";
-    mainProgram = "vivliostyle";
-    license = lib.licenses.agpl3Only;
-    platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ eljamm ];
-    teams = with lib.teams; [ ngi ];
-  };
-})

pkgs/development/python-modules/mkdocs-awesome-nav/default.nix

@@ -3,7 +3,6 @@
   gitMinimal,
   buildPythonPackage,
   fetchFromGitHub,
-  pyprojectVersionPatchHook,
   flit-core,
   mkdocs,
   mkdocs-exclude,
@@ -26,10 +25,6 @@ buildPythonPackage rec {
     hash = "sha256-guv+c4QwaATYEZ6XcWVZaOcZ7U9oLsW+RdWBtB1Xrnc=";
   };
 
-  nativeBuildInputs = [
-    pyprojectVersionPatchHook
-  ];
-
   build-system = [ flit-core ];
 
   dependencies = [

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

@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "osmnx";
-  version = "2.1.1";
+  version = "2.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gboeing";
     repo = "osmnx";
     tag = "v${version}";
-    hash = "sha256-PX4Vhf3R9UGKMYp636+tJ5NV/oURd3Zzxfvj7LLCaPM=";
+    hash = "sha256-3uLgc6zptmXlPg93qtsWbqNxXiBD/SEnXBL/IM/1m2c=";
   };
 
   build-system = [ uv-build ];

pkgs/top-level/all-packages.nix

@@ -7981,7 +7981,6 @@ with pkgs;
 
   qemu_test = lowPrio (
     qemu.override {
-      hostCpuOnly = true;
       nixosTestRunner = true;
     }
   );