Merge staging-next into staging

doc/stdenv/platform-notes.chapter.md

@@ -60,3 +60,8 @@ Some common issues when packaging software for Darwin:
   ```
 
   The package `xcbuild` can be used to build projects that really depend on Xcode. However, this replacement is not 100% compatible with Xcode and can occasionally cause issues.
+
+- x86_64-darwin uses the 10.12 SDK by default, but some software is not compatible with that version of the SDK. In that case,
+  the 11.0 SDK used by aarch64-darwin is available for use on x86_64-darwin. To use it, reference `apple_sdk_11_0` instead of
+  `apple_sdk` in your derivation and use `pkgs.darwin.apple_sdk_11_0.callPackage` instead of `pkgs.callPackage`. On Linux, this will
+  have the same effect as `pkgs.callPackage`, so you can use `pkgs.darwin.apple_sdk_11_0.callPackage` regardless of platform.

pkgs/applications/emulators/dosbox/default.nix

@@ -1,7 +1,8 @@
 { lib
 , stdenv
 , fetchurl
-, SDL
+, autoreconfHook
+, SDL_compat
 , SDL_net
 , SDL_sound
 , copyDesktopItems
@@ -22,12 +23,13 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
+    autoreconfHook
     copyDesktopItems
     graphicsmagick
   ];
 
   buildInputs = [
-    SDL
+    SDL_compat
     SDL_net
     SDL_sound
     libGL

pkgs/applications/networking/cluster/k3s/default.nix

@@ -46,10 +46,10 @@ with lib;
 # Those pieces of software we entirely ignore upstream's handling of, and just
 # make sure they're in the path if desired.
 let
-  k3sVersion = "1.24.2+k3s1";     # k3s git tag
+  k3sVersion = "1.24.2+k3s2";     # k3s git tag
-  k3sCommit = "b0ed13485588651b1eba3cb0ba423c500325a28f"; # k3s git commit at the above version
+  k3sCommit = "a237260237b549b90dd3aae449de09231caf1351"; # k3s git commit at the above version
-  k3sRepoSha256 = "1hjp9wfp39ymvz7cal474df94s2b91gc4pg8lwz9c63xli2qnb4k";
+  k3sRepoSha256 = "1dmlsq7f0z0wq8ypbmdqwk1hl59pcnywvqhz7qblzm3wnbdb62cl";
-  k3sVendorSha256 = "sha256-m7jEVp7xoQHMeZcMU+DrVY23e8Ri9wEb0tWiDjEDsnw=";
+  k3sVendorSha256 = "sha256-w5dYkewoNnI9GvqCAkmecg7JsKgO+gu1WcyPRItLvWY=";
 
   # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9
   # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know.

pkgs/development/beam-modules/elixir-ls/pin.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.9.0",
+  "version": "0.10.0",
-  "sha256": "sha256-dHHmA9TAM5YEfbUoujgy1XLzdh7zGWhR9SsFoTnKX48=",
+  "sha256": "sha256-3/Ndf7cOZZ9H+Oq6LQgoMcbtUNoBaDuiy5YKT40yA3E=",
-  "depsSha256": "sha256-YkZ/tp537ULKfXka4IdD+RgLlXuv6ayxdYn9KFyXrr4="
+  "depsSha256": "sha256-6FghRXKNXgwxwtGeW+ejVsbaCN7rrCDYu3AZgJCYODU="
 }

pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch

@@ -9,3 +9,23 @@
      {
        fprintf (stderr, "%s:%i: Double plaintext message not detected\n",
  	       PGM, __LINE__);
+--- a/lang/python/tests/t-verify.py
++++ b/lang/python/tests/t-verify.py
+@@ -142,7 +142,7 @@
+     c.op_verify(sig, None, text)
+ except Exception as e:
+     assert type(e) == gpg.errors.GPGMEError
+-    assert e.getcode() == gpg.errors.BAD_DATA
++    assert e.getcode() != gpg.errors.NO_ERROR
+ else:
+     assert False, "Expected an error but got none."
+ 
+@@ -178,7 +178,7 @@
+     try:
+         c.verify(double_plaintext_sig)
+     except gpg.errors.GPGMEError as e:
+-        assert e.getcode() == gpg.errors.BAD_DATA
++        assert e.getcode() != gpg.errors.NO_ERROR
+     else:
+         assert False, "Expected an error but got none."
+ 

pkgs/development/libraries/proj/7.nix

@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
       url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff";
       sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf";
     })
+    ./tests-sqlite-3.39.patch
   ];
 
   postPatch = lib.optionalString (version == "7.2.1") ''

pkgs/development/libraries/proj/tests-sqlite-3.39.patch

@@ -0,0 +1,13 @@
+Drop tests that time out with newest sqlite.
+https://github.com/OSGeo/PROJ/issues/3254
+
+--- a/test/cli/CMakeLists.txt
++++ b/test/cli/CMakeLists.txt
+@@ -16 +15,0 @@
+-proj_add_test_script_sh("testprojinfo" PROJINFO_BIN)
+--- a/test/unit/CMakeLists.txt
++++ b/test/unit/CMakeLists.txt
+@@ -144,3 +143,0 @@
+-add_test(NAME proj_test_cpp_api COMMAND proj_test_cpp_api)
+-set_property(TEST proj_test_cpp_api
+-  PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT})

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

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "10.10.0";
+  version = "10.11.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "esphome";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
-    sha256 = "sha256-j1YYzyOLuH+COBDXJUpkUx8H2K8F5tC5LB8ysZKi6oI=";
+    sha256 = "sha256-Wb46t+bdXGDYKzMr73YNWw1ULSLEV1xFcK16jHITnRg=";
   };
 
   propagatedBuildInputs = [

pkgs/development/web/flyctl/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.0.348";
+  version = "0.0.350";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    sha256 = "sha256-Z5WHmwz1ds5xQkc7QrGsUjZu0ug66XNV7KFbzhaP32I=";
+    sha256 = "sha256-bpaDgjR1Om+4IYLIUjqJkxa9mbdscItwnTWYG7Wlms0=";
   };
 
-  vendorSha256 = "sha256-U5f2S5MoCk8PjkVYKlmVQvWb8/Q8n0J9julFz52bOec=";
+  vendorSha256 = "sha256-OKA3J4MExysucOJl9UkH3mI4VbJgoOEIVa/iv22kxac=";
 
   subPackages = [ "." ];
 

pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix

@@ -168,8 +168,8 @@ in rec {
   bareFrameworks = (
     lib.mapAttrs framework (import ./frameworks.nix {
       inherit frameworks libs;
-      inherit (pkgs.darwin) libobjc Libsystem;
+      inherit (pkgs.darwin.apple_sdk_11_0) libnetwork Libsystem;
-      inherit (pkgs.darwin.apple_sdk) libnetwork;
+      libobjc = pkgs.darwin.apple_sdk_11_0.objc4;
     })
   ) // (
     lib.mapAttrs privateFramework (import ./private-frameworks.nix {

pkgs/os-specific/darwin/apple-sdk-11.0/default.nix

@@ -1,4 +1,5 @@
-{ stdenvNoCC, fetchurl, newScope, pkgs
+{ stdenvNoCC, fetchurl, newScope, lib, pkgs
+, stdenv, overrideCC
 , xar, cpio, python3, pbzx }:
 
 let
@@ -54,5 +55,35 @@ let
     # questionable aliases
     configd = pkgs.darwin.apple_sdk.frameworks.SystemConfiguration;
     IOKit = pkgs.darwin.apple_sdk.frameworks.IOKit;
+
+    callPackage = newScope (lib.optionalAttrs stdenv.isDarwin rec {
+      inherit (pkgs.darwin.apple_sdk_11_0) stdenv;
+      darwin = pkgs.darwin.overrideScope (_: prev: {
+        inherit (prev.darwin.apple_sdk_11_0) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security;
+        apple_sdk = prev.darwin.apple_sdk_11_0;
+        CF = prev.darwin.apple_sdk_11_0.CoreFoundation;
+      });
+      xcodebuild = pkgs.xcbuild.override {
+        inherit (pkgs.darwin.apple_sdk_11_0.frameworks) CoreServices CoreGraphics ImageIO;
+        inherit stdenv;
+      };
+      xcbuild = xcodebuild;
+    });
+
+    stdenv =
+      let
+        clang = stdenv.cc.override {
+          bintools = stdenv.cc.bintools.override { libc = packages.Libsystem; };
+          libc = packages.Libsystem;
+        };
+      in
+      if stdenv.isAarch64 then stdenv
+      else
+        (overrideCC stdenv clang).override {
+          targetPlatform = stdenv.targetPlatform // {
+            darwinMinVersion = "10.12";
+            darwinSdkVersion = "11.0";
+          };
+        };
   };
 in packages

pkgs/servers/mpd/default.nix

@@ -116,13 +116,13 @@ let
 
     in stdenv.mkDerivation rec {
       pname = "mpd";
-      version = "0.23.6";
+      version = "0.23.7";
 
       src = fetchFromGitHub {
         owner  = "MusicPlayerDaemon";
         repo   = "MPD";
         rev    = "v${version}";
-        sha256 = "sha256-pVIbaCg3qDw7bjhLQHz6Rr3m498LeKNQVhRk4m5tpVQ=";
+        sha256 = "sha256-Tc2EVNOvZTz0gYClgqbAicYDyOf6GtVOFm8t7uM6dLQ=";
       };
 
       buildInputs = [

pkgs/shells/fish/oh-my-fish/default.nix

@@ -2,26 +2,24 @@
 , stdenv
 , fetchFromGitHub
 , fish
-, bash
 , runtimeShell
 , writeShellScript
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "oh-my-fish";
-  version = "7+unstable=2021-03-03";
+  version = "unstable-2022-03-27";
 
   src = fetchFromGitHub {
-    owner = pname;
+    owner = finalAttrs.pname;
-    repo = pname;
+    repo = finalAttrs.pname;
-    rev = "0b1396ad7962073fa25615bf03c43b53eddc2d56";
+    rev = "d428b723c8c18fef3b2a00b8b8b731177f483ad8";
-    hash = "sha256-lwMo4+PcYR9kYJPWK+ALiMfBdxFSgB2vjtSn8QrmmEA=";
+    hash = "sha256-msItKEPe7uSUpDAfCfdYZjt5NyfM3KtOrLUTO9NGqlg=";
   };
 
   strictDeps = true;
   buildInputs = [
     fish
-    bash
   ];
 
   dontConfigure = true;
@@ -30,21 +28,21 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    mkdir -pv $out/bin $out/share/${pname}
+    mkdir -pv $out/bin $out/share/${finalAttrs.pname}
-    cp -vr * $out/share/${pname}
+    cp -vr * $out/share/${finalAttrs.pname}
 
     cat << EOF > $out/bin/omf-install
     #!${runtimeShell}
 
     ${fish}/bin/fish \\
-      $out/share/${pname}/bin/install \\
+      $out/share/${finalAttrs.pname}/bin/install \\
       --noninteractive \\
-      --offline=$out/share/${pname}
+      --offline=$out/share/${finalAttrs.pname}
 
     EOF
     chmod +x $out/bin/omf-install
 
-    runHook PostInstall
+    runHook postInstall
   '';
 
   meta = with lib; {
@@ -60,5 +58,5 @@ stdenv.mkDerivation rec {
     mainProgram = "omf-install";
     platforms = fish.meta.platforms;
   };
-}
+})
 # TODO: customize the omf-install script

pkgs/shells/loksh/default.nix

@@ -1,25 +1,24 @@
 { lib
 , stdenv
+, fetchFromGitHub
 , meson
+, ncurses
 , ninja
 , pkg-config
-, ncurses
-, fetchFromGitHub
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "loksh";
-  version = "7.0";
+  version = "7.1";
 
   src = fetchFromGitHub {
     owner = "dimkr";
-    repo = pname;
+    repo = finalAttrs.pname;
-    rev = version;
+    rev = finalAttrs.version;
     fetchSubmodules = true;
-    sha256 = "sha256-q5RiY9/xEFCk+oHlxgNwDOB+TNjRWHKzU2kQH2LjCWY=";
+    sha256 = "sha256-APjY7wQUfUTXe3TRKWkDmMZuax0MpuU/KmgZfogdAGU=";
   };
 
-  strictDeps = true;
   nativeBuildInputs = [
     meson
     ninja
@@ -30,21 +29,32 @@ stdenv.mkDerivation rec {
     ncurses
   ];
 
+  strictDeps = true;
+
   postInstall = ''
     mv $out/bin/ksh $out/bin/loksh
     mv $out/share/man/man1/ksh.1 $out/share/man/man1/loksh.1
     mv $out/share/man/man1/sh.1 $out/share/man/man1/loksh-sh.1
   '';
 
-  passthru = {
-    shellPath = "/bin/loksh";
-  };
-
   meta = with lib; {
-    description = "Linux port of OpenBSD's ksh";
     homepage = "https://github.com/dimkr/loksh";
+    description = "Linux port of OpenBSD's ksh";
+    longDescription = ''
+      loksh is a Linux port of OpenBSD's ksh.
+
+      Unlike other ports of ksh, loksh targets only one platform, follows
+      upstream closely and keeps changes to a minimum. loksh does not add any
+      extra features; this reduces the risk of introducing security
+      vulnerabilities and makes loksh a good fit for resource-constrained
+      systems.
+    '';
     license = licenses.publicDomain;
     maintainers = with maintainers; [ cameronnemo ];
     platforms = platforms.linux;
   };
-}
+
+  passthru = {
+    shellPath = "/bin/loksh";
+  };
+})

pkgs/top-level/darwin-packages.nix

@@ -70,7 +70,7 @@ in
 
 impure-cmds // appleSourcePackages // chooseLibs // {
 
-  inherit apple_sdk;
+  inherit apple_sdk apple_sdk_10_12 apple_sdk_11_0;
 
   stdenvNoCF = stdenv.override {
     extraBuildInputs = [];