Merge master into staging-next

pkgs/by-name/dm/dmidecode/package.nix

@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "dmidecode";
-  version = "3.6";
+  version = "3.7";
 
   src = fetchurl {
     url = "mirror://savannah/dmidecode/dmidecode-${version}.tar.xz";
-    sha256 = "sha256-5Axl8+w9r+Ma2DSaTvGpcSLTj2UATtZldeGo1XXdi64=";
+    sha256 = "sha256-LDrtEshaHmqUENQG1eQXxFVGbcG8fIkni7Ms98rZHoo=";
   };
 
   makeFlags = [

pkgs/by-name/op/opencode/package.nix

@@ -13,12 +13,12 @@
 }:
 let
   pname = "opencode";
-  version = "1.0.204";
+  version = "1.0.210";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${version}";
-    hash = "sha256-LZosk50kqhr5Waf01GA5GQZ4hXz3y+Bn0NlGS/Q5fdg=";
+    hash = "sha256-0bWhOquP17U7F2NO+f8pubulqfOG03wMxzPpD/yqe3A=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -70,7 +70,7 @@ let
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-4RckAej/MeG7I7qbFkx5wwsvESueOCGOHkHrIK6//3M=";
+    outputHash = "sha256-P9ZiSW8aZWEUGE1OCej/S2biyJzSwlObcuRzBxJsEZU=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };

pkgs/by-name/sm/smuxi/package.nix

@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   ];
 
   preConfigure = ''
-    NOCONFIGURE=1 NOGIT=1 ./autogen.sh
+    NOCONFIGURE=1 NOGIT=1 ACLOCAL_FLAGS="-I ${gettext}/share/gettext/m4" ./autogen.sh
   '';
 
   configureFlags = [