Merge remote-tracking branch 'origin/master' into staging-next

nixos/modules/image/repart-image.nix

@@ -81,6 +81,7 @@ let
     "erofs" = [ erofs-utils ];
     "btrfs" = [ btrfs-progs ];
     "xfs" = [ xfsprogs ];
+    "swap" = [ util-linux ];
   };
 
   fileSystemTools = builtins.concatMap (f: fileSystemToolMapping."${f}") fileSystems;

nixos/tests/appliance-repart-image.nix

@@ -73,6 +73,14 @@ in
               SizeMinBytes = if config.nixpkgs.hostPlatform.isx86_64 then "64M" else "96M";
             };
           };
+          "swap" = {
+            repartConfig = {
+              Type = "swap";
+              Format = "swap";
+              SizeMinBytes = "10M";
+              SizeMaxBytes = "10M";
+            };
+          };
           "root" = {
             storePaths = [ config.system.build.toplevel ];
             repartConfig = {

nixos/tests/zenohd.nix

@@ -82,7 +82,6 @@ import ./make-test-python.nix (
     };
 
     testScript = ''
-      start_all()
       router.wait_for_unit("zenohd.service")
       client.wait_for_unit("multi-user.target")
 

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

@@ -87,6 +87,9 @@ stdenv.mkDerivation {
     substituteInPlace phoenix.pro \
       --replace-fail "6.5.10" "${qtbase.version}"
 
+    substituteInPlace src/simulation/ngspice_simulator.cpp \
+      --replace-fail 'path + "/" + libName' '"${libngspice}/lib/libngspice.so"'
+
     mkdir parts
     cp -a ${parts}/* parts/
   '';

pkgs/build-support/rust/build-rust-package/default.nix

@@ -54,9 +54,6 @@
 
   depsExtraArgs ? { },
 
-  # Toggles whether a custom sysroot is created when the target is a .json file.
-  __internal_dontAddSysroot ? false,
-
   # Needed to `pushd`/`popd` into a subdir of a tarball if this subdir
   # contains a Cargo.toml, but isn't part of a workspace (which is e.g. the
   # case for `rustfmt`/etc from the `rust-sources).
@@ -125,36 +122,17 @@ let
 
   target = stdenv.hostPlatform.rust.rustcTargetSpec;
   targetIsJSON = lib.hasSuffix ".json" target;
-  useSysroot = targetIsJSON && !__internal_dontAddSysroot;
-
-  sysroot = callPackage ./sysroot { } {
-    inherit target;
-    shortTarget = stdenv.hostPlatform.rust.cargoShortTarget;
-    RUSTFLAGS = args.RUSTFLAGS or "";
-    originalCargoToml = src + /Cargo.toml; # profile info is later extracted
-  };
-
 in
 
-# Tests don't currently work for `no_std`, and all custom sysroots are currently built without `std`.
-# See https://os.phil-opp.com/testing/ for more information.
-assert useSysroot -> !(args.doCheck or true);
-
 stdenv.mkDerivation (
   (removeAttrs args [
     "depsExtraArgs"
     "cargoUpdateHook"
     "cargoDeps"
     "cargoLock"
   ])
-  // lib.optionalAttrs useSysroot {
-    RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or "");
-  }
   // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && buildType == "debug") {
-    RUSTFLAGS =
-      "-C split-debuginfo=packed "
-      + lib.optionalString useSysroot "--sysroot ${sysroot} "
-      + (args.RUSTFLAGS or "");
+    RUSTFLAGS = "-C split-debuginfo=packed " + (args.RUSTFLAGS or "");
   }
   // {
     cargoDeps = cargoDeps';

pkgs/by-name/ae/aerospike/package.nix

@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aerospike-server";
-  version = "7.2.0.6";
+  version = "8.0.0.1";
 
   src = fetchFromGitHub {
     owner = "aerospike";
     repo = "aerospike-server";
     rev = version;
-    hash = "sha256-YjX/2+0n+nrtNwQaZSY5PPYAOnhR+jrIMp02STcJHRY=";
+    hash = "sha256-uVHi1/cT/3Rr/r3JudA09d3TMaTPYjc0ZpvTlz4m8aU=";
     fetchSubmodules = true;
   };
 

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

@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "byedpi";
-  version = "0.15";
+  version = "0.16";
 
   src = fetchFromGitHub {
     owner = "hufrea";
     repo = "byedpi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jsQFfIvWvpJRBewUSS5bhDGocfPTvtG6LiejUxdqk28=";
+    hash = "sha256-/K60znoC/5NNOJ5olQI7YZkjShkGZaJDdub+LwZ/FKc=";
   };
 
   installPhase = ''

pkgs/by-name/cn/cnquery/package.nix

@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnquery";
-  version = "11.37.1";
+  version = "11.39.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnquery";
     tag = "v${version}";
-    hash = "sha256-H8qilsIlXA9NdPrdJYmkX+Ccc5fJHcEZThzPUo6Vi4M=";
+    hash = "sha256-xTeN6VGMqgUEsce9nh5xm5bF0tWgug/xFiXcQehP9iE=";
   };
 
   subPackages = [ "apps/cnquery" ];
 
-  vendorHash = "sha256-rqWGaENzFoC4+VhH1FRX9veLOXxXEAxdhcvrd2OoZY8=";
+  vendorHash = "sha256-l293xIerCnsDe/mau/0+hePJ+CyDlQb1kHmB946a9Do=";
 
   ldflags = [
     "-w"

pkgs/by-name/fo/fourmolu/package.nix

@@ -0,0 +1,11 @@
+{
+  haskellPackages,
+  haskell,
+}:
+
+let
+  inherit (haskell.lib.compose)
+    justStaticExecutables
+    ;
+in
+justStaticExecutables haskellPackages.fourmolu

pkgs/by-name/gu/gum/package.nix

@@ -29,17 +29,14 @@ buildGoModule rec {
     "-X=main.Version=${version}"
   ];
 
-  postInstall =
-    ''
-      $out/bin/gum man > gum.1
-      installManPage gum.1
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd gum \
-        --bash <($out/bin/gum completion bash) \
-        --fish <($out/bin/gum completion fish) \
-        --zsh <($out/bin/gum completion zsh)
-    '';
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    $out/bin/gum man > gum.1
+    installManPage gum.1
+    installShellCompletion --cmd gum \
+      --bash <($out/bin/gum completion bash) \
+      --fish <($out/bin/gum completion fish) \
+      --zsh <($out/bin/gum completion zsh)
+  '';
 
   meta = with lib; {
     description = "Tasty Bubble Gum for your shell";