Merge master into staging-next

pkgs/by-name/aa/aaaaxy/package.nix

@@ -21,17 +21,17 @@
 
 buildGoModule rec {
   pname = "aaaaxy";
-  version = "1.5.220";
+  version = "1.5.250";
 
   src = fetchFromGitHub {
     owner = "divVerent";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-XNLX5LDbL29Ko0zstgo+O5V0oe37dSChk8iJeVrYlLA=";
+    hash = "sha256-+avaHICyaNbNCaOWb+AgpEq4SONacFJ//AZx+2Aa7SY=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-tDQKU/1fKDPCrUHfFi79u4d2XwOqjvTuIlsUAB74e4c=";
+  vendorHash = "sha256-mDVpxPkRGbpAtZ0jCKd3uOxwUdBqjd0kISg22JdpLpE=";
 
   buildInputs = [
     alsa-lib

pkgs/by-name/am/amazon-ec2-utils/package.nix

@@ -1,12 +1,18 @@
 {
-  stdenv,
   lib,
   bash,
+  coreutils,
   curl,
   fetchFromGitHub,
   gawk,
+  gnugrep,
+  gnused,
   installShellFiles,
+  makeWrapper,
+  nix-update-script,
   python3,
+  stdenv,
+  util-linux,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,15 +26,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-plTBh2LAXkYVSxN0IZJQuPr7QxD7+OAqHl/Zl8JPCmg=";
   };
 
-  outputs = [
-    "out"
-    "man"
-  ];
-
   strictDeps = true;
 
   nativeBuildInputs = [
     installShellFiles
+    makeWrapper
   ];
 
   buildInputs = [
@@ -36,51 +38,76 @@ stdenv.mkDerivation rec {
     python3
   ];
 
-  postInstall = ''
-    install -Dm755 -t $out/bin/ ebsnvme-id
-    install -Dm755 -t $out/bin/ ec2-metadata
-    install -Dm755 -t $out/bin/ ec2nvme-nsid
-    install -Dm755 -t $out/bin/ ec2udev-vbd
+  installPhase = ''
+    mkdir $out
 
-    install -Dm644 -t $out/lib/udev/rules.d/ 51-ec2-hvm-devices.rules
-    install -Dm644 -t $out/lib/udev/rules.d/ 51-ec2-xen-vbd-devices.rules
-    install -Dm644 -t $out/lib/udev/rules.d/ 53-ec2-read-ahead-kb.rules
-    install -Dm644 -t $out/lib/udev/rules.d/ 70-ec2-nvme-devices.rules
-    install -Dm644 -t $out/lib/udev/rules.d/ 60-cdrom_id.rules
+    for file in {ebsnvme-id,ec2-metadata,ec2nvme-nsid,ec2udev-vbd}; do
+      install -D -m 755 -t $out/bin "$file"
+    done
+
+    wrapProgram $out/bin/ec2-metadata \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils
+          curl
+          util-linux
+        ]
+      }
+
+    wrapProgram $out/bin/ec2nvme-nsid \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils
+        ]
+      }
+
+    wrapProgram $out/bin/ec2udev-vbd \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils
+          gnugrep
+          gnused
+        ]
+      }
+
+    for file in *.rules; do
+      install -D -m 644 -t $out/lib/udev/rules.d "$file"
+    done
+
+    substituteInPlace $out/lib/udev/rules.d/{51-ec2-hvm-devices,70-ec2-nvme-devices}.rules \
+      --replace-fail /usr/sbin $out/bin
+
+    substituteInPlace $out/lib/udev/rules.d/53-ec2-read-ahead-kb.rules \
+      --replace-fail /bin/awk ${gawk}/bin/awk
 
     installManPage doc/*.8
   '';
 
-  postFixup = ''
-    substituteInPlace $out/lib/udev/rules.d/{51-ec2-hvm-devices,70-ec2-nvme-devices}.rules \
-      --replace-fail '/usr/sbin' "$out/bin"
-
-    substituteInPlace $out/lib/udev/rules.d/53-ec2-read-ahead-kb.rules \
-      --replace-fail '/bin/awk' '${gawk}/bin/awk'
-
-    substituteInPlace "$out/bin/ec2-metadata" \
-      --replace-fail 'curl' '${curl}/bin/curl'
-  '';
+  outputs = [
+    "out"
+    "man"
+  ];
 
   doInstallCheck = true;
 
-  # We cannot run
-  #     ec2-metadata --help
-  # because it actually checks EC2 metadata even if --help is given
-  # so it won't work in the test sandbox.
+  # We can't run `ec2-metadata` since it calls IMDS even with `--help`.
   installCheckPhase = ''
     $out/bin/ebsnvme-id --help
   '';
 
-  meta = with lib; {
-    changelog = "https://github.com/amazonlinux/amazon-ec2-utils/releases/tag/v${version}";
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
     description = "Contains a set of utilities and settings for Linux deployments in EC2";
     homepage = "https://github.com/amazonlinux/amazon-ec2-utils";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      anthonyroussel
+      arianvp
       ketzacoatl
       thefloweringash
-      anthonyroussel
     ];
   };
 }

pkgs/by-name/ca/candy-icons/package.nix

@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "candy-icons";
-  version = "0-unstable-2024-10-22";
+  version = "0-unstable-2025-01-04";
 
   src = fetchFromGitHub {
     owner = "EliverLara";
     repo = "candy-icons";
-    rev = "f8a4125d338d86a58723ab36f9f827248d07c85c";
-    hash = "sha256-Bv91a5NglKWwddqx0kPgdCrik9SOPtcfQFJDWOdcQG4=";
+    rev = "504d31851e1d87af8ddb8ee2b6b2de43e32aaa11";
+    hash = "sha256-dfCk3ZdMol91YTpAzi0tPQgZYnZQHvCeHPLoFYe5xts=";
   };
 
   nativeBuildInputs = [ gtk3 ];

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

@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "2.64.0";
+  version = "2.65.0";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-5OdUA0rwBUjfoUZfXzFBmt/GFuvH3pm8JV2iLhaJQek=";
+    hash = "sha256-Rg6GAItG0OFDCK7rEuJs6i4QWHK3sveIh6UQVlA37mg=";
   };
 
-  vendorHash = "sha256-lMhSJSQHCY/bDeFM2L2Dfo4ApkjTkg8R0PwOpGr+Gi0=";
+  vendorHash = "sha256-MVjZUT1OEMAJZVsbCRg/ds57QgyiL9rLRfIo4HHHSmU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/my/myks/package.nix

@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "myks";
-  version = "4.2.6";
+  version = "4.3.0";
 
   src = fetchFromGitHub {
     owner = "mykso";
     repo = "myks";
     tag = "v${version}";
-    hash = "sha256-0kR1lluTRhDwpXhdUn4HJr5bYzJqnY1p77j/tiWyV68=";
+    hash = "sha256-r8OT5cbHicJVAVIJ9cfDHPLcJrZGPVYdZ42Sbvu8Jvc=";
   };
 
   vendorHash = "sha256-LmWuztR6X3x0aOYCqRv3aLiFEZQkaSnh3LT7IOu2Xa0=";

pkgs/by-name/nc/nchat/package.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  buildGoModule,
   fetchFromGitHub,
   file, # for libmagic
   ncurses,
@@ -13,8 +14,7 @@
   darwin,
 }:
 
-stdenv.mkDerivation rec {
-  pname = "nchat";
+let
   version = "5.4.2";
 
   src = fetchFromGitHub {
@@ -24,16 +24,55 @@ stdenv.mkDerivation rec {
     hash = "sha256-NrAU47GA7ZASJ7vCo1S8nyGBpfsZn4EBBqx2c4HKx7k=";
   };
 
+  libcgowm = buildGoModule {
+    pname = "nchat-wmchat-libcgowm";
+    inherit version src;
+
+    sourceRoot = "${src.name}/lib/wmchat/go";
+    vendorHash = "sha256-EdbOO5cCDT1CcPlCBgMoPDg65FcoOYvBwZa4bz0hfGE=";
+
+    buildPhase = ''
+      mkdir -p $out/
+      go build -o $out/ -buildmode=c-archive
+      mv $out/go.a $out/libcgowm.a
+      ln -s $out/libcgowm.a $out/libref-cgowm.a
+      mv $out/go.h $out/libcgowm.h
+    '';
+  };
+in
+stdenv.mkDerivation rec {
+  pname = "nchat";
+  inherit version src;
+
+  nl = "\n";
   postPatch = ''
     substituteInPlace lib/tgchat/ext/td/CMakeLists.txt \
       --replace "get_git_head_revision" "#get_git_head_revision"
     substituteInPlace lib/tgchat/CMakeLists.txt \
       --replace-fail "list(APPEND OPENSSL_ROOT_DIR" "#list(APPEND OPENSSL_ROOT_DIR"
+
+    # specific mangling to handle whatsapp go module:
+
+    substituteInPlace CMakeLists.txt \
+      --replace "if(HAS_WHATSAPP AND (NOT GO_VERSION VERSION_GREATER_EQUAL GO_VERSION_MIN))" \
+      "if(FALSE AND (NOT GO_VERSION VERSION_GREATER_EQUAL GO_VERSION_MIN))"
+
+    substituteInPlace lib/wmchat/CMakeLists.txt \
+      --replace-fail "add_subdirectory(go)" \
+    "set(GO_LIBRARIES ${libcgowm}/libcgowm.a)${nl}target_include_directories(wmchat PRIVATE ${libcgowm})"
+
+    substituteInPlace lib/wmchat/CMakeLists.txt \
+      --replace-fail "target_link_libraries(wmchat PUBLIC ref-cgowm ncutil \''${GO_LIBRARIES})" \
+      "target_link_libraries(wmchat PUBLIC ${libcgowm}/libcgowm.a ncutil \''${GO_LIBRARIES})"
+
+    substituteInPlace lib/wmchat/CMakeLists.txt \
+      --replace-fail "add_dependencies(wmchat ref-cgowm)" "#add_dependencies(wmchat ref-cgowm)"
   '';
 
   nativeBuildInputs = [
     cmake
     gperf
+    libcgowm
   ];
 
   buildInputs =
@@ -56,7 +95,6 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DCMAKE_INSTALL_LIBDIR=lib"
-    "-DHAS_WHATSAPP=OFF" # go module build required
   ];
 
   meta = {

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

@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "openwebifpy";
-  version = "4.3.0";
+  version = "4.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-fsGHTmi+dWP0SBPvF51RdL2zBMHtjry/XTGjyU5jKpI=";
+    hash = "sha256-FaynJT+bR63nIwLEwXjTjwPXZ3Q5/X+zpx0gTA3Pqo8=";
   };
 
   build-system = [ hatchling ];

pkgs/kde/default.nix

@@ -41,7 +41,10 @@ let
       ) allUrls;
     in
     (
-      qt6Packages
+      # This removes reference to deprecated `qt6Packages.stdenv`
+      # so when a KDE package asks for a stdenv, it won't trigger
+      # an eval warning
+      (lib.removeAttrs qt6Packages [ "stdenv" ])
       // frameworks
       // gear
       // plasma
@@ -66,10 +69,6 @@ let
         # Alias because it's just data
         plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols;
 
-        # Alias because `self.callPackage` would give deprecated
-        # `qt6Packages.stdenv` when asked for `stdenv`
-        inherit stdenv;
-
         selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub
 
         alpaka = self.callPackage ./misc/alpaka { };

pkgs/os-specific/linux/zfs/unstable.nix

@@ -21,14 +21,14 @@ callPackage ./generic.nix args {
   # IMPORTANT: Always use a tagged release candidate or commits from the
   # zfs-<version>-staging branch, because this is tested by the OpenZFS
   # maintainers.
-  version = "2.3.0-rc4";
+  version = "2.3.0-rc5";
   # rev = "";
 
   tests = {
     inherit (nixosTests.zfs) unstable;
   };
 
-  hash = "sha256-6O+XQvggyVCZBYpx8/7jbq15tLZsvzmDqp+AtEb9qFU=";
+  hash = "sha256-gTpj1hYEkx+f/VvvfgeZeqwUhBVQyOIMKic8AaiwYzg=";
 
   extraLongDescription = ''
     This is "unstable" ZFS, and will usually be a pre-release version of ZFS.

pkgs/top-level/qt6-packages.nix

@@ -126,5 +126,6 @@ makeScopeWithSplicing' {
   xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { };
   });
 } // lib.optionalAttrs config.allowAliases {
+  # when removing, don't forget to remove a workaround in `pkgs/kde/default.nix`
   stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv; # Added for 25.05
 }