Merge master into staging-next

maintainers/maintainer-list.nix

@@ -8370,6 +8370,12 @@
     githubId = 3081095;
     name = "Jürgen Keck";
   };
+  jl178 = {
+    email = "jeredlittle1996@gmail.com";
+    github = "jl178";
+    githubId = 72664723;
+    name = "Jered Little";
+  };
   jlamur = {
     email = "contact@juleslamur.fr";
     github = "jlamur";

pkgs/applications/editors/vscode/extensions/default.nix

@@ -2735,8 +2735,8 @@ let
           publisher = "nvarner";
           # Please update the corresponding binary (typst-lsp) when updating
           # this extension.
-          version = "0.10.1";
-          sha256 = "sha256-+LOw9JPpL5eLNxmP4kyPo9S/w8ZxfPGSaY1oR8THmvI=";
+          version = "0.11.0";
+          sha256 = "sha256-fs+CBg3FwzTn608dm9EvfF2UrI2Sa5hsm0OK/WQyy6o=";
         };
 
         nativeBuildInputs = [ jq moreutils ];

pkgs/applications/networking/cluster/linkerd/edge.nix

@@ -2,7 +2,7 @@
 
 (callPackage ./generic.nix { }) {
   channel = "edge";
-  version = "23.10.1";
-  sha256 = "1m4inwim5iyahwza3i4zwz4iaja9p93vfacq324r9w8gciyvc26s";
-  vendorHash = "sha256-wjICOdn/YqRmWHZQYB/WS0fxJ+OQsnas6BphUC2C9go=";
+  version = "23.10.4";
+  sha256 = "1fbzxkfc957kdhk60x3ywwpn54zq8njqk313cgfygnrmmj3m67j9";
+  vendorHash = "sha256-WEnopX/tIRoA5wiiCMue1T3wottxv744Mp7XJl63j4k=";
 }

pkgs/by-name/ai/airlift/package.nix

@@ -0,0 +1,48 @@
+{ lib
+, python3
+, fetchPypi
+, argparse
+, kubernetes-helm
+, kind
+, docker
+}:
+
+python3.pkgs.buildPythonApplication rec {
+
+  pname = "airlift";
+  pyproject = true;
+  version = "0.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-1LE3fpfX4NExJdUdSjt4BXvxQTLJ8zrRkGHkxo/6Pb8=";
+  };
+  buildInputs = [
+    kubernetes-helm
+    kind
+    docker
+  ];
+  nativeBuildInputs = [
+    python3.pkgs.poetry-core
+  ];
+  propagatedBuildInputs = with python3.pkgs; [
+    argparse
+    halo
+    pyyaml
+    hiyapyco
+    jinja2
+    dotmap
+    requests
+  ];
+  pythonImportsCheck = [
+    "airlift"
+  ];
+  meta = with lib; {
+    description = "A flexible, configuration driven CLI for Apache Airflow local development";
+    homepage = "https://github.com/jl178/airlift";
+    license = licenses.mit;
+    changelog = "https://github.com/jl178/airlift/releases/tag/v${version}";
+    maintainers = with maintainers; [ jl178 ];
+    mainProgram = "airlift";
+  };
+}

pkgs/by-name/m2/m2-mesoplanet/package.nix

@@ -0,0 +1,48 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, m2libc
+, mescc-tools
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "m2-mesoplanet";
+  version = "1.11.0";
+
+  src = fetchFromGitHub {
+    owner = "oriansj";
+    repo = "M2-Mesoplanet";
+    rev = "Release_${finalAttrs.version}";
+    hash = "sha256-hE7xvX84q3tk0XakveYDJhrhfBnpoItQs456NCzFfws=";
+  };
+
+  # Don't use vendored M2libc
+  postPatch = ''
+    rmdir M2libc
+    ln -s ${m2libc}/include/M2libc M2libc
+  '';
+
+  # Upstream overrides the optimisation to be -O0, which is incompatible with fortify. Let's disable it.
+  hardeningDisable = [ "fortify" ];
+
+  doCheck = true;
+  checkTarget = "test";
+  nativeCheckInputs = [ mescc-tools ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D bin/M2-Mesoplanet $out/bin/M2-Mesoplanet
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Macro Expander Saving Our m2-PLANET";
+    homepage = "https://github.com/oriansj/M2-Mesoplanet";
+    license = licenses.gpl3Only;
+    maintainers = teams.minimal-bootstrap.members;
+    inherit (m2libc.meta) platforms;
+    mainProgram = "M2-Mesoplanet";
+  };
+})

pkgs/by-name/m2/m2-planet/package.nix

@@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, m2libc
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "m2-planet";
+  version = "1.11.0";
+
+  src = fetchFromGitHub {
+    owner = "oriansj";
+    repo = "M2-Planet";
+    rev = "Release_${finalAttrs.version}";
+    hash = "sha256-xVwUO67PlRiBj/YBnnTXFGh3jH470fcbaNjABoyYes4=";
+  };
+
+  # Don't use vendored M2libc
+  postPatch = ''
+    rmdir M2libc
+    ln -s ${m2libc}/include/M2libc M2libc
+  '';
+
+  # Upstream overrides the optimisation to be -O0, which is incompatible with fortify. Let's disable it.
+  hardeningDisable = [ "fortify" ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D bin/M2-Planet $out/bin/M2-Planet
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "PLAtform NEutral Transpiler";
+    homepage = "https://github.com/oriansj/M2-Planet";
+    license = licenses.gpl3Only;
+    maintainers = teams.minimal-bootstrap.members;
+    inherit (m2libc.meta) platforms;
+    mainProgram = "M2-Planet";
+  };
+})

pkgs/by-name/m2/m2libc/package.nix

@@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "m2libc";
+  version = "unstable-2023-05-22";
+
+  src = fetchFromGitHub {
+    owner = "oriansj";
+    repo = "M2libc";
+    rev = "de7c75f144176c3b9be77695d9bf94440445aeae";
+    hash = "sha256-248plvODhBRfmx7zOmf05ICbk8vzSbaceZJ0j+wPaAY=";
+  };
+
+  patches = [
+    # # aarch64: syscall: mkdir -> mkdirat
+    # https://github.com/oriansj/M2libc/pull/17
+    (fetchpatch {
+      url = "https://github.com/oriansj/M2libc/commit/ff7c3023b3ab6cfcffc5364620b25f8d0279e96b.patch";
+      hash = "sha256-QAKddv4TixIQHpFa9SVu9fAkeKbzhQaxjaWzW2yJy7A=";
+    })
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/include
+    cp -r . $out/include/M2libc
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "More standards compliant C library written in M2-Planet's C subset";
+    homepage = "https://github.com/oriansj/m2libc";
+    license = licenses.gpl3Only;
+    maintainers = teams.minimal-bootstrap.members;
+    platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "riscv32-linux" "riscv64-linux" ];
+  };
+})

pkgs/by-name/me/mescc-tools-extra/package.nix

@@ -0,0 +1,40 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, m2libc
+, perl
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mescc-tools-extra";
+  version = "1.3.0";
+
+  src = fetchFromGitHub {
+    owner = "oriansj";
+    repo = "mescc-tools-extra";
+    rev = "Release_${finalAttrs.version}";
+    hash = "sha256-LS9Eq1z+OsDF7Jq0TfF4u8jEJ5bjcLZNfKtnpIbtG20=";
+  };
+
+  # Don't use vendored M2libc
+  postPatch = ''
+    rmdir M2libc
+    ln -s ${m2libc}/include/M2libc M2libc
+  '';
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+  checkTarget = "test";
+  nativeCheckInputs = [ perl ];
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = with lib; {
+    description = "Collection of tools written for use in bootstrapping";
+    homepage = "https://github.com/oriansj/mescc-tools-extra";
+    license = licenses.gpl3Only;
+    maintainers = teams.minimal-bootstrap.members;
+    inherit (m2libc.meta) platforms;
+  };
+})

pkgs/by-name/me/mescc-tools/package.nix

@@ -0,0 +1,39 @@
+{ lib
+, stdenv
+, fetchFromSavannah
+, m2libc
+, which
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mescc-tools";
+  version = "1.5.1";
+
+  src = fetchFromSavannah {
+    repo = "mescc-tools";
+    rev = "Release_${finalAttrs.version}";
+    hash = "sha256-jFDrmzsjKEQKOKlsch1ceWtzUhoJAJVyHjXGVhjE9/U=";
+  };
+
+  # Don't use vendored M2libc
+  postPatch = ''
+    rmdir M2libc
+    ln -s ${m2libc}/include/M2libc M2libc
+  '';
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+  checkTarget = "test";
+  nativeCheckInputs = [ which ];
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = with lib; {
+    description = "Collection of tools written for use in bootstrapping";
+    homepage = "https://savannah.nongnu.org/projects/mescc-tools";
+    license = licenses.gpl3Only;
+    maintainers = teams.minimal-bootstrap.members;
+    inherit (m2libc.meta) platforms;
+  };
+})

pkgs/by-name/oe/oelint-adv/package.nix

@@ -6,13 +6,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "oelint-adv";
-  version = "3.26.1";
+  version = "3.26.2";
   format = "setuptools";
 
   src = fetchPypi {
     inherit version;
     pname = "oelint_adv";
-    hash = "sha256-xQC3y9YeY8o4L4pLV+nLs1Ao8KH6q1BprwTeUm8f+2w=";
+    hash = "sha256-tR4CB4i91XHoyFtZH1LsDxVI791v0LCtvCd28Ahlxlc=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

pkgs/development/libraries/libuv/default.nix

@@ -103,7 +103,9 @@ stdenv.mkDerivation (finalAttrs: {
   # https://github.com/NixOS/nixpkgs/issues/219466
   separateDebugInfo = !stdenv.hostPlatform.isStatic;
 
-  doCheck = true;
+  doCheck =
+    # routinely hangs on powerpc64le
+    !stdenv.hostPlatform.isPower64;
 
   # Some of the tests use localhost networking.
   __darwinAllowLocalNetworking = true;

pkgs/development/python-modules/django/5.nix

@@ -42,14 +42,14 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "5.0a1";
+  version = "5.0b1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-OlIFL7xeAfIgLAIKgkGqQNwDCxbI+0ncSAzEarhzUVg=";
+    hash = "sha256-yIY15zPwoO9GwhljXiHI9ZeOsqFMORgiRlRUG8XVcDA=";
   };
 
   patches = [

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

@@ -2,60 +2,35 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
-, cmake
-, ninja
-, cython
-, rapidfuzz-capi
-, scikit-build
 , setuptools
-, wheel
-, jarowinkler-cpp
+, rapidfuzz
 , hypothesis
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "jarowinkler";
-  version = "1.2.3";
-  format = "pyproject";
+  version = "2.0.1";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
+
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "maxbachmann";
     repo = "JaroWinkler";
     rev = "refs/tags/v${version}";
-    hash = "sha256-j+ZabVsiVitNkTPhGjDg72XogjvPaL453lTW45ITm90=";
+    hash = "sha256-B3upTBNqMyi+CH7Zx04wceEXjGJnr6S3BIl87AQkfbo=";
   };
 
-  # We cannot use Cython version 3.0.0 because the code in jarowinkler has not
-  # been adapted for https://github.com/cython/cython/issues/4280 yet
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'scikit-build==' 'scikit-build>=' \
-      --replace 'Cython==3.0.0a11' 'Cython'
-  '';
-
   nativeBuildInputs = [
-    cmake
-    cython
-    ninja
-    rapidfuzz-capi
-    scikit-build
     setuptools
-    wheel
   ];
 
-  buildInputs = [
-    jarowinkler-cpp
+  propagatedBuildInputs = [
+    rapidfuzz
   ];
 
-  preBuild = ''
-    export JAROWINKLER_BUILD_EXTENSION=1
-  '';
-
-  dontUseCmakeConfigure = true;
-
   nativeCheckInputs = [
     hypothesis
     pytestCheckHook

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

@@ -5,23 +5,28 @@
 , pillow
 , pytestCheckHook
 , pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "pilkit";
-  version = "unstable-2022-02-17";
-  format = "setuptools";
+  version = "3.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "matthewwithanm";
     repo = pname;
-    rev = "09ffa2ad33318ae5fd3464655c14c7f01ffc2097";
-    hash = "sha256-jtnFffKr0yhSv2jBmXzPa6iP2r41MbmGukfmnvgABhk=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-NmD9PFCkz3lz4AnGoQUpkt35q0zvDVm+kx7lVDFBcHk=";
   };
 
-  buildInputs = [
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  propagatedBuildInputs = [
     pillow
   ];
 
@@ -44,7 +49,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "A collection of utilities and processors for the Python Imaging Library";
     homepage = "https://github.com/matthewwithanm/pilkit/";
-    license = licenses.bsd0;
+    license = licenses.bsd3;
     maintainers = with maintainers; [ domenkozar ];
   };
 }

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

@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pyenphase";
-  version = "1.14.0";
+  version = "1.14.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.11";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "pyenphase";
     repo = "pyenphase";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Eh4OtdOes9ApIlivHkc8zA84pkQ+HBOBp0r+6E8RE8Y=";
+    hash = "sha256-IK+PaLE2hDLPfxsXqypFXpVYpQH+6VynIq7aGVUZkm4=";
   };
 
   postPatch = ''

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

@@ -10,16 +10,16 @@
 
 buildPythonPackage rec {
   pname = "questionary";
-  version = "unstable-2022-07-27";
+  version = "2.0.1";
   format = "pyproject";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "tmbo";
     repo = pname;
-    rev = "848b040c5b7086ffe75bd92c656e15e94d905146";
-    hash = "sha256-W0d1Uoy5JdN3BFfeyk1GG0HBzmgKoBApaGad0UykZaY=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-JY0kXomgiGtOrsXfRf0756dTPVgud91teh+jW+kFNdk=";
   };
 
   nativeBuildInputs = [
@@ -50,6 +50,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python library to build command line user prompts";
     homepage = "https://github.com/tmbo/questionary";
+    changelog = "https://github.com/tmbo/questionary/blob/${src.rev}/docs/pages/changelog.rst";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

pkgs/development/tools/initool/default.nix

@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "initool";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "dbohdan";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-99dkog0fr+IrMyrEBDf21tSGGREgAoHcU2+MJdGIvCM=";
+    hash = "sha256-qi8K3O6K9ZIKFlNFJ3O9/iKE+8M/mf/8V8qgl1BOaKo=";
   };
 
   nativeBuildInputs = [ mlton ];

pkgs/development/tools/language-servers/typst-lsp/default.nix

@@ -9,31 +9,35 @@ rustPlatform.buildRustPackage rec {
   pname = "typst-lsp";
   # Please update the corresponding vscode extension when updating
   # this derivation.
-  version = "0.10.1";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "nvarner";
     repo = "typst-lsp";
     rev = "v${version}";
-    hash = "sha256-ZQLxZzWVGwFtU68ASlzBDMz8RHrA0h925u6UDk7vPe4=";
+    hash = "sha256-L0d+fDCLxU/XHC99VlIcZdiO3RohtWfoRnUPGIHodcc=";
   };
 
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "typst-0.8.0" = "sha256-q2b/PoNwpzarJbIPzokYgZRD2/Oe/XB40C4VXdwL/NA=";
+      "typst-0.9.0" = "sha256-LwRB/AQE8TZZyHEQ7kKB10itzEgYjg4R/k+YFqmutDc=";
       "typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg=";
-      "typstfmt_lib-0.2.5" = "sha256-+iQOS+WPCWevUFurLfuC5mhuRdJ/1ZsekFoFDzZviag=";
+      "typstfmt_lib-0.2.6" = "sha256-UUVbnxIj7kQVpZvSbbB11i6wAvdTnXVk5cNSNoGBeRM=";
     };
   };
 
   buildInputs = lib.optionals stdenv.isDarwin [
-    darwin.apple_sdk.frameworks.Security
+    darwin.apple_sdk.frameworks.SystemConfiguration
   ];
 
   checkFlags = [
     # requires internet access
     "--skip=workspace::package::external::remote_repo::test::full_download"
+  ] ++ lib.optionals stdenv.isDarwin [
+    # both tests fail on darwin with 'Attempted to create a NULL object.'
+    "--skip=workspace::fs::local::test::read"
+    "--skip=workspace::package::external::manager::test::local_package"
   ];
 
   # workspace::package::external::manager::test::local_package tries to access the data directory

pkgs/os-specific/linux/kernel/generic.nix

@@ -25,6 +25,10 @@
   # Additional make flags passed to kbuild
 , extraMakeFlags ? []
 
+, # enables the options in ./common-config.nix; if `false` then only
+  # `structuredExtraConfig` is used
+ enableCommonConfig ? true
+
 , # kernel intermediate config overrides, as a set
  structuredExtraConfig ? {}
 
@@ -181,7 +185,9 @@ let
       moduleStructuredConfig = (lib.evalModules {
         modules = [
           module
+        ] ++ lib.optionals enableCommonConfig [
           { settings = commonStructuredConfig; _file = "pkgs/os-specific/linux/kernel/common-config.nix"; }
+        ] ++ [
           { settings = structuredExtraConfig; _file = "structuredExtraConfig"; }
         ]
         ++  structuredConfigFromPatches

pkgs/test/cross/default.nix

@@ -145,6 +145,12 @@ let
     pkgs.pkgsCross.mips64el-linux-gnuabi64.stdenv
     pkgs.pkgsCross.mips64el-linux-gnuabin32.stdenv
     pkgs.pkgsCross.mingwW64.stdenv
+
+  ] ++ lib.optionals (with pkgs.stdenv.buildPlatform; isx86_64 && isLinux) [
+    # Musl-to-glibc cross on the same architecture tends to turn up
+    # lots of interesting corner cases.  Only expected to work for
+    # x86_64-linux buildPlatform.
+    pkgs.pkgsMusl.pkgsCross.gnu64.hello
   ];
 
 in {

pkgs/tools/misc/open-pdf-sign/default.nix

@@ -7,12 +7,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "0.1.6";
+  version = "0.1.7";
   pname = "open-pdf-sign";
 
   src = fetchurl {
     url = "https://github.com/open-pdf-sign/open-pdf-sign/releases/download/v${finalAttrs.version}/open-pdf-sign.jar";
-    hash = "sha256-GpMDgN4P8neHOQsXtg2AKXNeCMnv3nEHH50ZVU0uVvY=";
+    hash = "sha256-pUIE2pTa+5Rt8PNYtfbtqoX0dxdS6lViqdqjJU5feoo=";
   };
 
   nativeBuildInputs = [

pkgs/top-level/python-packages.nix

@@ -5570,9 +5570,7 @@ self: super: with self; {
 
   jaraco-text = callPackage ../development/python-modules/jaraco-text { };
 
-  jarowinkler = callPackage ../development/python-modules/jarowinkler {
-    inherit (pkgs) cmake ninja;
-  };
+  jarowinkler = callPackage ../development/python-modules/jarowinkler { };
 
   javaobj-py3 = callPackage ../development/python-modules/javaobj-py3 { };