Merge master into staging-next

2024-11-08 06:04:48 +00:00
parent d16ff942dc a54c7dcc8e
commit 4ab3ca7c50
14 changed files with 343 additions and 62 deletions
@@ -31,21 +31,21 @@ let
  archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz";

  sha256 = {
-    x86_64-linux = "1dysz5yajm9v8p8x19lmbhbfij5k99h9m39ifvn1908dhgyc5d36";
-    x86_64-darwin = "175sxw1z6mzs5adcgy2902irp0yb666lgmrckbd3dr7rqfav9d36";
-    aarch64-linux = "04pf8b42kh23pii9qahsdf3979icvqbhadr5m8x79y16hv1h2h8j";
-    aarch64-darwin = "1766h2awzh8wjwzkc7r1ymsjyh4j7rfb7nj6bpigy2b2dyfp53w2";
-    armv7l-linux = "1zmqrvqq07vkhmb9shbrh2jjkv3rpvi3pv0b1cg690jfixnsyk04";
+    x86_64-linux = "1d99kbvbd17h02m85gd8dircb39jsbifdk61w1hsvhri6dbfah8f";
+    x86_64-darwin = "1bay90s0asfms4cg4hng9f4bpjyg5d884ffjrqy6mdxwyqmjyzb1";
+    aarch64-linux = "0g1v26qax14fghawjqb9xbkr8kwhzwh52qz30jg3pfsixw5q5kkx";
+    aarch64-darwin = "0m7b6dnfwqal20iq6nwwzvd23l5alqgbc02ih2pjflzk794fj2mf";
+    armv7l-linux = "04jbcqwpbp7d89van8dq5zilfcalxwbx62yzipdzsjlmfnxf65vy";
  }.${system} or throwSystem;
 in
  callPackage ./generic.nix rec {
    # Please backport all compatible updates to the stable release.
    # This is important for the extension ecosystem.
-    version = "1.95.1";
+    version = "1.95.2";
    pname = "vscode" + lib.optionalString isInsiders "-insiders";

    # This is used for VS Code - Remote SSH test
-    rev = "65edc4939843c90c34d61f4ce11704f09d3e5cb6";
+    rev = "e8653663e8840adaf45af01eab5c627a5af81807";

    executableName = "code" + lib.optionalString isInsiders "-insiders";
    longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -69,7 +69,7 @@ in
      src = fetchurl {
        name = "vscode-server-${rev}.tar.gz";
        url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-        sha256 = "05w76c50j85b7hc0q8gjzssy142ncbns0kmcyqydaqrzj8n41jd8";
+        sha256 = "14vfylcx3gcx5vjdp861mjr98wq2f3242ysygpa3r5xnl8941wki";
      };
      stdenv = stdenvNoCC;
    };
@@ -23,13 +23,13 @@ let
    if extension == "zip" then fetchzip args else fetchurl args;

  pname = "1password-cli";
-  version = "2.30.0";
+  version = "2.30.3";
  sources = rec {
-    aarch64-linux = fetch "linux_arm64" "sha256-KNduqspTzLEHmymSefLnnhIBcIQWx2tshvOc0NwDek0=" "zip";
-    i686-linux = fetch "linux_386" "sha256-StdWtD3tz6bKqSem/GFqeRHzkbv4aP7d7dKKtgNhuY8=" "zip";
-    x86_64-linux = fetch "linux_amd64" "sha256-bzhRkpR3te1bcBEfP2BR6SECTC9sRFDshl7B+/278Kg=" "zip";
+    aarch64-linux = fetch "linux_arm64" "sha256-dXhmRl48Uk4T4947Dwz6ZkaRkZlmcADXKt/m6d1VNe8=" "zip";
+    i686-linux = fetch "linux_386" "sha256-+B4fZ41DBe9TnIHOntBQDAvTYOckVwK5B+wwsIU6fAI=" "zip";
+    x86_64-linux = fetch "linux_amd64" "sha256-MsBSjJi7hJbS1wU3lVeywRrhGAZkoqxRb4FTg8fFN00=" "zip";
    aarch64-darwin =
-      fetch "apple_universal" "sha256-L1SZWQWjAJDZydlAttbWLS7igZNAvOmIyaUUdVbvEa8="
+      fetch "apple_universal" "sha256-RVng7huZfRRR99TLKwmmun6woSiIhM5YnaEfWgdPJr4="
        "pkg";
    x86_64-darwin = aarch64-darwin;
  };
@@ -0,0 +1,65 @@
+diff -ruZ source/CMakeLists.txt source2/CMakeLists.txt
+--- source/CMakeLists.txt	1969-12-31 17:00:01.000000000 -0700
+++ source2/CMakeLists.txt	2024-11-03 21:24:22.153712626 -0700
+@@ -12,9 +12,6 @@
+ 
+ set(WXSERVDISC_INSTALL OFF CACHE BOOL "Set to OFF to not include wxservdisc artifacts in install")
+ add_subdirectory(libwxservdisc/src)
+-set(LIBVNCSERVER_INSTALL OFF CACHE BOOL "Set to OFF to not include libvncserver artifacts in install")
+-set(WITH_EXAMPLES OFF CACHE BOOL "Set to OFF to not build libvncserver examples")
+-add_subdirectory(libvncserver)
+ 
+ add_subdirectory(src)
+ 
+diff -ruZ source/src/CMakeLists.txt source2/src/CMakeLists.txt
+--- source/src/CMakeLists.txt	1969-12-31 17:00:01.000000000 -0700
+++ source2/src/CMakeLists.txt	2024-11-03 21:51:56.015301604 -0700
+@@ -1,15 +1,17 @@
+ #
+ # dependencies
+ #
+include(FindPkgConfig)
+ find_package(wxWidgets 3.0 REQUIRED core base net adv qa)
+find_package(LibVNCServer)
+pkg_search_module(GTK3 REQUIRED gtk+-3.0)
+ include(${wxWidgets_USE_FILE})
+ include_directories(
+     ${CMAKE_BINARY_DIR}
+     ${CMAKE_SOURCE_DIR}
+     ${CMAKE_SOURCE_DIR}/src/
+     ${CMAKE_SOURCE_DIR}/libwxservdisc/src
+-    ${CMAKE_SOURCE_DIR}/libvncserver
+-    ${CMAKE_BINARY_DIR}/libvncserver
+    ${GTK3_INCXLUDE_DIRS}
+ )
+ 
+ 
+@@ -39,7 +41,7 @@
+ 
+ add_executable(${executable_name} MACOSX_BUNDLE ${multivnc_SRCS})
+ 
+-target_link_libraries(${executable_name} MultiVNCgui ${wxWidgets_LIBRARIES} wxservdisc vncclient)
+target_link_libraries(${executable_name} MultiVNCgui ${wxWidgets_LIBRARIES} wxservdisc vncclient ${GTK3_LIBRARIES})
+ 
+ if(APPLE AND wxWidgets_VERSION_STRING LESS 3.1)
+     set_target_properties(${executable_name} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in)
+@@ -47,7 +49,6 @@
+ 
+ 
+ 
+-
+ 
+ #original Makefile.am contents follow:
+ 
+diff -ruZ source/src/VNCConn.h source2/src/VNCConn.h
+--- source/src/VNCConn.h	1969-12-31 17:00:01.000000000 -0700
+++ source2/src/VNCConn.h	2024-11-03 21:28:06.620032553 -0700
+@@ -37,7 +37,7 @@
+ #include <wx/secretstore.h>
+ #endif
+ #include <wx/msgqueue.h>
+-#include "rfb/rfbclient.h"
+#include <rfb/rfbclient.h>
+ 
+ 
+ 
@@ -0,0 +1,104 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  wxGTK32,
+  gtk3,
+  zlib,
+  libjpeg,
+  libvncserver,
+  cmake,
+  pkg-config,
+  libsysprof-capture,
+  pcre2,
+  util-linux,
+  libselinux,
+  libsepol,
+  libthai,
+  libdatrie,
+  xorg,
+  lerc,
+  libxkbcommon,
+  libepoxy,
+  wrapGAppsHook3,
+}:
+
+let
+  # libvncserver does not support multicast. since multivnc is mostly about multicast, it requires a special branch of libvncserver.
+  libvncserver-patched = libvncserver.overrideAttrs {
+    src = fetchFromGitHub {
+      owner = "LibVNC";
+      repo = "libvncserver";
+      rev = "ef3b57438564f2877148a23055f3f0ffce66df11";
+      hash = "sha256-Cg96tsi6h1DX4VSsq1B8DTn0GxnBfoZK2nuxeT/+ca0=";
+    };
+    patches = [ ];
+  };
+
+in
+stdenv.mkDerivation {
+  pname = "MultiVNC";
+  version = "2.8.1";
+
+  src = fetchFromGitHub {
+    owner = "bk138";
+    repo = "multivnc";
+    rev = "89225243412f43ba2903ffeda98af7fe1f8f4975";
+    hash = "sha256-qdF6nUSGaTphoe6T3gTAJTSQwvu+v/g8xfYobFBmGsI=";
+    fetchSubmodules = true;
+  };
+
+  patches = [
+    # remove part of vendored libraries that can be provided by Nixpkgs
+    ./nixpkgs.patch
+
+    # silences a compiler warning
+    (fetchpatch {
+      url = "https://github.com/bk138/multivnc/commit/002ba7f6b5b88dac3da5c08f99be1f237dcde904.patch";
+      hash = "sha256-Qnk7RrUaw9jsaNTbzYqsH0LU8ivT9xX2jfxrES82ArE=";
+    })
+  ];
+
+  # remove submodules we don't need
+  # some submodules can be provided by nixpkgs
+  postPatch = ''
+    rm -rfv libvncserver libsshtunnel libjpeg-turbo libressl libssh2
+  '';
+
+  buildInputs = [
+    gtk3
+    wxGTK32
+    zlib
+    libjpeg
+    libvncserver-patched
+
+    # transitive dependencies
+    libsysprof-capture
+    pcre2
+    util-linux # mount
+    libselinux
+    libsepol
+    libthai
+    libdatrie
+    lerc
+    libxkbcommon
+    libepoxy
+    xorg.libXdmcp
+    xorg.libXtst
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapGAppsHook3
+  ];
+
+  meta = {
+    mainProgram = "multivnc";
+    description = "Cross-platform Multicast-enabled VNC viewer based on LibVNCClient";
+    homepage = "https://github.com/bk138/multivnc";
+    maintainers = with lib.maintainers; [ rhelmot ];
+    license = lib.licenses.gpl3Plus;
+  };
+}
@@ -11,18 +11,29 @@
 , buildPackages
 , buildDocs ? true
 , nix-update-script
+, ninjaRelease ? "latest"
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "ninja";
-  version = "1.12.1";
+  version = lib.removePrefix "v" finalAttrs.src.rev;

-  src = fetchFromGitHub {
-    owner = "ninja-build";
-    repo = "ninja";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-RT5u+TDvWxG5EVQEYj931EZyrHUSAqK73OKDAascAwA=";
-  };
+  src = {
+    # TODO: Remove Ninja 1.11 as soon as possible.
+    "1.11" = fetchFromGitHub {
+      owner = "ninja-build";
+      repo = "ninja";
+      rev = "v1.11.1";
+      hash = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI=";
+    };
+
+    latest = fetchFromGitHub {
+      owner = "ninja-build";
+      repo = "ninja";
+      rev = "v1.12.1";
+      hash = "sha256-RT5u+TDvWxG5EVQEYj931EZyrHUSAqK73OKDAascAwA=";
+    };
+  }.${ninjaRelease} or (throw "Unsupported Ninja release: ${ninjaRelease}");

  depsBuildBuild = [ buildPackages.stdenv.cc ];

@@ -15,6 +15,7 @@
  libglvnd,
  xorg,
  udev,
+  vulkan-loader,
 }:

 buildDotnetModule rec {
@@ -57,6 +58,9 @@ buildDotnetModule rec {
    # [verbose]: SDL error log [debug]: Failed loading udev_device_get_action: /nix/store/*-osu-lazer-*/lib/osu-lazer/runtimes/linux-x64/native/libSDL2.so: undefined symbol: _udev_device_get_action
    # [verbose]: SDL error log [debug]: Failed loading libudev.so.1: libudev.so.1: cannot open shared object file: No such file or directory
    udev
+
+    # needed for vulkan renderer, can fall back to opengl if omitted
+    vulkan-loader
  ];

  executables = [ "osu!" ];
@@ -6,7 +6,7 @@
 , coreutils
 , gnugrep
 , perl
-, ninja
+, ninja_1_11
 , pkg-config
 , clang
 , bintools
@@ -190,6 +190,14 @@ let
    '';
  };

+  # https://github.com/NixOS/nixpkgs/issues/327836
+  # Fail to build with ninja 1.12 when NIX_BUILD_CORES is low (Hydra or Github Actions).
+  # Can reproduce using `nix --option cores 2 build -f . swiftPackages.swift-unwrapped`.
+  # Until we find out the exact cause, follow [swift upstream][1], pin ninja to version
+  # 1.11.1.
+  # [1]: https://github.com/swiftlang/swift/pull/72989
+  ninja = ninja_1_11;
+
 in stdenv.mkDerivation {
  pname = "swift";
  inherit (sources) version;
@@ -19,7 +19,16 @@ stdenv.mkDerivation rec {
    # fix reproducibile output, in particular in the grub2 build
    # https://savannah.gnu.org/bugs/index.php?59658
    ./0001-msginit-Do-not-use-POT-Creation-Date.patch
-  ];
+  ]
+    # An accidental inclusion in https://marc.info/?l=glibc-alpha&m=150511271003225&w=2
+    # resulted in a getcwd prototype to be added in when it isn't needed.
+    # Clang does not like this unless the "overridable" attribute was appied.
+    # Since we don't need to redeclare getcwd, we can just remove it.
+    #
+    # Issue: https://github.com/NixOS/nixpkgs/issues/348658
+    # Fixed in https://github.com/autotools-mirror/gettext/commit/cb2c1486336462c8180f487221181ee798b0e73e
+    # Remove in 0.22.5 upgrade.
+    ++ lib.optional (stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin) ./fix-getcwd-clang.patch;

  outputs = [ "out" "man" "doc" "info" ];

@@ -0,0 +1,63 @@
+From cb2c1486336462c8180f487221181ee798b0e73e Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Thu, 9 Feb 2023 16:58:20 +0100
+Subject: [PATCH] Fix compilation errors with ISO C 23 compilers.
+
+* gettext-runtime/intl/dcigettext.c (getwd, getcwd): Assume a declaration in the
+system header files.
+* gettext-runtime/intl/gettextP.h (SWAP): Drop K&C compatibility.
+---
+ gettext-runtime/intl/dcigettext.c | 5 +----
+ gettext-runtime/intl/gettextP.h   | 7 +------
+ 2 files changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c
+index e7cb9b962..666a624b0 100644
+--- a/gettext-runtime/intl/dcigettext.c
+++ b/gettext-runtime/intl/dcigettext.c
+@@ -1,5 +1,5 @@
+ /* Implementation of the internal dcigettext function.
+-   Copyright (C) 1995-2021 Free Software Foundation, Inc.
+   Copyright (C) 1995-2023 Free Software Foundation, Inc.
+ 
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+@@ -139,13 +139,10 @@ extern int errno;
+ # define tfind __tfind
+ #else
+ # if !defined HAVE_GETCWD
+-char *getwd ();
+ #  define getcwd(buf, max) getwd (buf)
+ # else
+ #  if VMS
+ #   define getcwd(buf, max) (getcwd) (buf, max, 0)
+-#  else
+-char *getcwd ();
+ #  endif
+ # endif
+ # ifndef HAVE_STPCPY
+diff --git a/gettext-runtime/intl/gettextP.h b/gettext-runtime/intl/gettextP.h
+index bb00555ee..536e8bd43 100644
+--- a/gettext-runtime/intl/gettextP.h
+++ b/gettext-runtime/intl/gettextP.h
+@@ -1,5 +1,5 @@
+ /* Header describing internals of libintl library.
+-   Copyright (C) 1995-2021 Free Software Foundation, Inc.
+   Copyright (C) 1995-2023 Free Software Foundation, Inc.
+    Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
+ 
+    This program is free software: you can redistribute it and/or modify
+@@ -113,12 +113,7 @@ extern char *libintl_dcigettext (const char *__domainname,
+ # define SWAP(i) bswap_32 (i)
+ #else
+ static inline nls_uint32
+-# ifdef __cplusplus
+ SWAP (nls_uint32 i)
+-# else
+-SWAP (i)
+-     nls_uint32 i;
+-# endif
+ {
+   return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
+ }
+
@@ -12,6 +12,7 @@

  # tests
  djangorestframework,
+  pytest-cov-stub,
  pytest-django,
  pytest-mock,
  pytestCheckHook,
@@ -29,10 +30,6 @@ buildPythonPackage rec {
    hash = "sha256-Ya0KlX+vtLXN2Fgk0Gv7KemJCUTwkaH+4GQA1ByUlBY=";
  };

-  postPatch = ''
-    sed -i '/cov/d' pyproject.toml
-  '';
-
  build-system = [ setuptools ];

  dependencies = [
@@ -42,12 +39,15 @@ buildPythonPackage rec {
    requests
  ];

-  DJANGO_SETTINGS_MODULE = "tests.settings";
+  preCheck = ''
+    export DJANGO_SETTINGS_MODULE=tests.settings
+  '';

  # xdist is disabled right now because it can cause race conditions on high core machines
  # https://github.com/jazzband/django-oauth-toolkit/issues/1300
  nativeCheckInputs = [
    djangorestframework
+    pytest-cov-stub
    pytest-django
    # pytest-xdist
    pytest-mock
@@ -1,47 +1,49 @@
-{ lib
-, stdenv
-, fetchurl
-, unzip
-, joker
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  unzip,
+  joker,
+  nix-update-script,
 }:

-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "goku";
-  version = "0.6.0";
+  version = "0.7.2";

-  src = if stdenv.hostPlatform.isAarch64 then
-    fetchurl {
-      url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku-arm.zip";
-      hash = "sha256-TIoda2kDckK1FBLAmKudsDs3LXO4J0KWiAD2JlFb4rk=";
-    }
-    else fetchurl {
-      url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.zip";
-      hash = "sha256-8HdIwtpzR6O2WCbMYIJ6PHcM27Xmb+4Tc5Fmjl0dABQ=";
-    };
+  src =
+    if stdenvNoCC.hostPlatform.isAarch64 then
+      fetchurl {
+        url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${finalAttrs.version}/goku-arm.zip";
+        hash = "sha256-mjz1JD12U23Pi8kumELtT9ENhXpX8Db4LUS3DOtP5GM=";
+      }
+    else
+      fetchurl {
+        url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${finalAttrs.version}/goku.zip";
+        hash = "sha256-8HdIwtpzR6O2WCbMYIJ6PHcM27Xmb+4Tc5Fmjl0dABQ=";
+      };

-  nativeBuildInputs = [
-    unzip
-  ];
+  nativeBuildInputs = [ unzip ];

-  buildInputs = [
-    joker
-  ];
+  buildInputs = [ joker ];

-  sourceRoot = if stdenv.hostPlatform.isAarch64 then "goku" else ".";
+  sourceRoot = if stdenvNoCC.hostPlatform.isAarch64 then "goku" else ".";
+
+  passthru.updateScript = nix-update-script { };

  installPhase = ''
-    chmod +x goku
-    chmod +x gokuw
-    mkdir -p $out/bin
-    cp goku $out/bin
-    cp gokuw $out/bin
+    runHook preInstall
+    mkdir -p "$out/bin"
+    chmod +x {goku,gokuw}
+    cp {goku,gokuw} "$out/bin"
+    runHook postInstall
  '';

-  meta = with lib; {
+  meta = {
    description = "Karabiner configurator";
    homepage = "https://github.com/yqrashawn/GokuRakuJoudo";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.nikitavoloboev ];
-    platforms = platforms.darwin;
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.nikitavoloboev ];
+    platforms = lib.platforms.darwin;
  };
-}
+})
@@ -14,15 +14,24 @@ let
 in
 buildGoModule rec {
  pname = "immudb";
-  version = "1.9DOM.2";
+  version = "1.9.5";

  src = fetchFromGitHub {
    owner = "codenotary";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-bNMJZWXelHQatW9rhqf3eYs61nJJEBwMXZhUZWQv6S0=";
+    sha256 = "sha256-XKioPk0Rv+I916OLInJEtOaDV9KcBMWSHmPOq2k3LTQ=";
  };

+  postPatch = ''
+    EXPECTED_WEBCONSOLE_STRING='DEFAULT_WEBCONSOLE_VERSION=${webconsoleVersion}'
+    if ! grep -F "$EXPECTED_WEBCONSOLE_STRING" Makefile ; then
+      echo "Did not find $EXPECTED_WEBCONSOLE_STRING in Makefile. " \
+        "Our webconsole version may need bumping (or the Makefile may have changed)"
+      exit 3
+    fi
+  '';
+
  preBuild = ''
    mkdir -p webconsole/dist
    cp -r ${webconsoleDist}/* ./webconsole/dist
@@ -30949,6 +30949,8 @@ with pkgs;

  node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { };

+  ninja_1_11 = callPackage ../by-name/ni/ninja/package.nix { ninjaRelease = "1.11"; };
+
  ninjas2 = callPackage ../applications/audio/ninjas2 { };

  nootka = qt5.callPackage ../applications/audio/nootka { };
@@ -204,6 +204,10 @@ in {
       then latest
       else testing;

+    linux_default = packageAliases.linux_default.kernel;
+
+    linux_latest = packageAliases.linux_latest.kernel;
+
    # Using zenKernels like this due lqx&zen came from one source, but may have different base kernel version
    # https://github.com/NixOS/nixpkgs/pull/161773#discussion_r820134708
    zenKernels = callPackage ../os-specific/linux/kernel/zen-kernels.nix;