Merge master into staging-next

doc/hooks/versionCheckHook.section.md

@@ -28,7 +28,7 @@ It does so in a clean environment (using `env --ignore-environment`), and it che
 
 The variables that this phase control are:
 
-- `dontVersionCheck`: Disable adding this hook to the [`preDistPhases`](#var-stdenv-preDist). Useful if you do want to load the bash functions of the hook, but run them differently.
+- `dontVersionCheck`: Disable adding this hook to the [`preInstallCheckHooks`](#ssec-installCheck-phase). Useful if you do want to load the bash functions of the hook, but run them differently.
 - `versionCheckProgram`: The full path to the program that should print the `${version}` string. Defaults roughly to `${placeholder "out"}/bin/${pname}`. Using `$out` in the value of this variable won't work, as environment variables from this variable are not expanded by the hook. Hence using `placeholder` is unavoidable.
 - `versionCheckProgramArg`: The argument that needs to be passed to `versionCheckProgram`. If undefined the hook tries first `--help` and then `--version`. Examples: `version`, `-V`, `-v`.
 - `preVersionCheck`: A hook to run before the check is done.

doc/stdenv/passthru.chapter.md

@@ -79,7 +79,7 @@ Besides tests provided by upstream, that you run in the [`checkPhase`](#ssec-che
 
 - They access the package as consumers would, independently from the environment in which it was built
 - They can be run and debugged without rebuilding the package, which is useful if that takes a long time
-- They don't add overhead to each build, as opposed checks added to the [`distPhase`](#ssec-distribution-phase), such as [`versionCheckHook`](#versioncheckhook).
+- They don't add overhead to each build, as opposed checks added to the [`installCheckPhase`](#ssec-installCheck-phase), such as [`versionCheckHook`](#versioncheckhook).
 
 It is also possible to use `passthru.tests` to test the version with [`testVersion`](#tester-testVersion), but since that is pretty trivial and recommended thing to do, we recommend using [`versionCheckHook`](#versioncheckhook) for that, which has the following advantages over `passthru.tests`:
 

maintainers/maintainer-list.nix

@@ -13736,6 +13736,13 @@
     github = "mi-ael";
     githubId = 12199265;
   };
+  miampf = {
+    email = "[email protected]";
+    github = "miampf";
+    githubId = 111570799;
+    name = "Mia Motte Mallon";
+    keys = [ { fingerprint = "7008 92AA 6F32 8CAC 8740  0070 EF03 9364 B5B6 886C"; } ];
+  };
   miangraham = {
     github = "miangraham";
     githubId = 704580;

nixos/tests/croc.nix

@@ -3,11 +3,11 @@ let
   client = { pkgs, ... }: {
     environment.systemPackages = [ pkgs.croc ];
   };
-  pass = pkgs.writeText "pass" "PassRelay";
+  pass = "PassRelay";
 in {
   name = "croc";
   meta = with pkgs.lib.maintainers; {
-    maintainers = [ hax404 julm ];
+    maintainers = [ equirosa SuperSandro2000 ];
   };
 
   nodes = {
@@ -38,12 +38,12 @@ in {
     sender.execute("echo Hello World > testfile01.txt")
     sender.execute("echo Hello Earth > testfile02.txt")
     sender.execute(
-        "croc --pass ${pass} --relay relay send --code topSecret testfile01.txt testfile02.txt >&2 &"
+        "env CROC_SECRET=topSecret croc --pass ${pass} --relay relay send testfile01.txt testfile02.txt >&2 &"
     )
 
     # receive the testfiles and check them
     receiver.succeed(
-        "croc --pass ${pass} --yes --relay relay topSecret"
+        "env CROC_SECRET=topSecret croc --pass ${pass} --yes --relay relay"
     )
     assert "Hello World" in receiver.succeed("cat testfile01.txt")
     assert "Hello Earth" in receiver.succeed("cat testfile02.txt")

pkgs/applications/blockchains/bitcoin/default.nix

@@ -34,24 +34,16 @@ let
 in
 stdenv.mkDerivation rec {
   pname = if withGui then "bitcoin" else "bitcoind";
-  version = "27.1";
+  version = "28.0";
 
   src = fetchurl {
     urls = [
       "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
     ];
     # hash retrieved from signed SHA256SUMS
-    sha256 = "0c1051fd921b8fae912f5c2dfd86b085ab45baa05cd7be4585b10b4d1818f3da";
+    sha256 = "700ae2d1e204602eb07f2779a6e6669893bc96c0dca290593f80ff8e102ff37f";
   };
 
-  patches = [
-    # upnp: fix build with miniupnpc 2.2.8
-    (fetchpatch2 {
-      url = "https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1";
-      hash = "sha256-oDvHUvwAEp0LJCf6QBESn38Bu359TcPpLhvuLX3sm6M=";
-    })
-  ];
-
   nativeBuildInputs =
     [ autoreconfHook pkg-config installShellFiles ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]

pkgs/applications/networking/instant-messengers/element/element-desktop.nix

@@ -17,6 +17,8 @@
 , CoreServices
 , desktopToDarwinBundle
 , useKeytar ? true
+# command line arguments which are always set
+, commandLineArgs ? ""
 }:
 
 let
@@ -106,7 +108,8 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
     makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
       --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
       --add-flags "$out/share/element/electron" \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
+      --add-flags ${lib.escapeShellArg commandLineArgs}
 
     runHook postInstall
   '';

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

@@ -45,14 +45,14 @@ let
 
   pname = "slack";
 
-  x86_64-darwin-version = "4.39.95";
-  x86_64-darwin-sha256 = "1bvafqnh60ps5dba473l6zpm6hw7qcmpj55mxm6amakvkp63d92s";
+  x86_64-darwin-version = "4.40.128";
+  x86_64-darwin-sha256 = "0hfgl2pfarnd9gh921rfz9s9kkvyf8fmmhgb6j87jgbwf8rjrjmm";
 
-  x86_64-linux-version = "4.39.95";
-  x86_64-linux-sha256 = "06d4mnvk3fj57laygf08nlh970wb4jvq1kycv27h1bq6bq365b6n";
+  x86_64-linux-version = "4.40.128";
+  x86_64-linux-sha256 = "1p7ybwrsfy5iq5ggpz1p4mx58ilwzsvn7k149i5ifi0zifahwwdg";
 
-  aarch64-darwin-version = "4.39.95";
-  aarch64-darwin-sha256 = "0kmbf9nd6ccng8a9qb02i2n2mcrjk45cqphx0k7drwd4nyn6zzmy";
+  aarch64-darwin-version = "4.40.128";
+  aarch64-darwin-sha256 = "0h6659lny80kxrqaf9qidirkw702wi7hjwwdhk9y0gcy87s9rqwd";
 
   version = {
     x86_64-darwin = x86_64-darwin-version;

pkgs/applications/networking/p2p/qbittorrent/default.nix

@@ -93,5 +93,8 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
     maintainers = with maintainers; [ Anton-Latukha kashw2 ];
+    mainProgram =
+      "qbittorrent"
+      + lib.optionalString (!guiSupport) "-nox";
   };
 }

pkgs/by-name/az/azure-cli/extensions-manual.nix

@@ -8,6 +8,9 @@
   mkAzExtension,
   mycli,
   python3Packages,
+  autoPatchelfHook,
+  python3,
+  openssl_1_1,
 }:
 
 {
@@ -58,6 +61,26 @@
     meta.maintainers = with lib.maintainers; [ mikut ];
   };
 
+  confcom = mkAzExtension rec {
+    pname = "confcom";
+    version = "1.0.0";
+    url = "https://azcliprod.blob.core.windows.net/cli-extensions/confcom-${version}-py3-none-any.whl";
+    sha256 = "73823e10958a114b4aca84c330b4debcc650c4635e74c568679b6c32c356411d";
+    description = "Microsoft Azure Command-Line Tools Confidential Container Security Policy Generator Extension";
+    nativeBuildInputs = [ autoPatchelfHook ];
+    buildInputs = [ openssl_1_1 ];
+    propagatedBuildInputs = with python3Packages; [
+      pyyaml
+      deepdiff
+      docker
+      tqdm
+    ];
+    postInstall = ''
+      chmod +x $out/${python3.sitePackages}/azext_confcom/bin/genpolicy-linux
+    '';
+    meta.maintainers = with lib.maintainers; [ miampf ];
+  };
+
   containerapp = mkAzExtension rec {
     pname = "containerapp";
     version = "1.0.0b1";

pkgs/by-name/ba/baddns/package.nix

@@ -0,0 +1,64 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  python3,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "baddns";
+  version = "1.1.869";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "blacklanternsecurity";
+    repo = "baddns";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-BoRR7duvkXjI8vVP59IOACuIV7NmQe1loMEUgPfsdNw=";
+  };
+
+  pythonRelaxDeps = true;
+
+  build-system = with python3.pkgs; [
+    poetry-core
+    poetry-dynamic-versioning
+  ];
+
+  dependencies = with python3.pkgs; [
+    colorama
+    dnspython
+    httpx
+    python-dateutil
+    python-whois
+    pyyaml
+    setuptools
+    tldextract
+  ];
+
+  nativeCheckInputs = with python3.pkgs; [
+    mock
+    pyfakefs
+    pytest-asyncio
+    pytest-httpx
+    pytest-mock
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "baddns" ];
+
+  disabledTests = [
+    # Tests require network access
+    "test_cli_validation_customnameservers_valid"
+    "test_modules_customnameservers"
+    "test_references_cname_css"
+    "test_references_cname_js"
+  ];
+
+  meta = {
+    description = "Tool to check subdomains for subdomain takeovers and other DNS issues";
+    homepage = "https://github.com/blacklanternsecurity/baddns/";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "baddns";
+  };
+}

pkgs/by-name/bc/bcachefs-tools/package.nix

@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bcachefs-tools";
-  version = "1.11.0";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "koverstreet";
     repo = "bcachefs-tools";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-L2eIYdQnnmKNI8QWSy8nk4GzJ8jv+qt98gqdzcJH31Q=";
+    hash = "sha256-w55Fs1RZ4c55vTvb3jArPcmBLij1nuLi2MUHMMXPhng=";
   };
 
   nativeBuildInputs = [
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     src = finalAttrs.src;
-    hash = "sha256-Ol3wKdxKYJWDC/JREOfVSQRNnWVano7qilMRvqrLsgA==";
+    hash = "sha256-rO4AjCnxmHQPk0hxgXK4yxUK5eag/+Q+fRG/BsRi0i0=";
   };
 
   makeFlags = [

pkgs/by-name/no/noto-fonts-color-emoji/package.nix

@@ -16,13 +16,13 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "noto-fonts-color-emoji";
-  version = "2.042";
+  version = "2.047";
 
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "noto-emoji";
     rev = "v${version}";
-    hash = "sha256-otJQMXrBIPrxD1vCdgcrZ2h1a9XAMbqEBFumjz1XJ54=";
+    hash = "sha256-v1vLXs8peNF6S7iBLViAWQSW042lwIDqAjB270pRPF0=";
   };
 
   depsBuildBuild = [