Merge master into staging-next

Author: github-actions[bot]

maintainers/maintainer-list.nix

@@ -12001,6 +12001,12 @@
     githubId = 12898828;
     keys = [ { fingerprint = "B44A DFDF F869 A66A 3FDF  DD8B 8609 A7B5 19E5 E342"; } ];
   };
+  kmatasfp = {
+    email = "[email protected]";
+    name = "Kaur Matas";
+    github = "kmatasfp";
+    githubId = 33095685;
+  };
   kmcopper = {
     email = "[email protected]";
     name = "Kyle Copperfield";
@@ -23433,6 +23439,12 @@
     githubId = 17836748;
     name = "Mason Mackaman";
   };
+  usertam = {
+    email = "[email protected]";
+    github = "usertam";
+    githubId = 22500027;
+    name = "Samuel Tam";
+  };
   uskudnik = {
     email = "[email protected]";
     github = "uskudnik";

pkgs/applications/radio/welle-io/default.nix

@@ -17,6 +17,8 @@
   fftwSinglePrec,
   lame,
   mpg123,
+  withFlac ? true,
+  flac,
 }:
 
 stdenv.mkDerivation rec {
@@ -48,12 +50,12 @@ stdenv.mkDerivation rec {
     qt5compat
     rtl-sdr
     soapysdr-with-plugins
-  ];
+  ] ++ lib.optional withFlac flac;
 
   cmakeFlags = [
     "-DRTLSDR=true"
     "-DSOAPYSDR=true"
-  ];
+  ] ++ lib.optional withFlac "-DFLAC=true";
 
   meta = {
     description = "DAB/DAB+ Software Radio";

pkgs/by-name/ci/circt/package.nix

@@ -19,12 +19,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "circt";
-  version = "1.98.0";
+  version = "1.99.1";
   src = fetchFromGitHub {
     owner = "llvm";
     repo = "circt";
     rev = "firtool-${version}";
-    hash = "sha256-wkaspxwWJ7xJVQ+VZ9Z85zbzOcLAb3v55EJQjd+jiw8=";
+    hash = "sha256-pnC8BLf2encv7UR10q6rTTpAZ6T0fETwumwTSu+Q8Ro=";
     fetchSubmodules = true;
   };
 

pkgs/by-name/do/dolibarr/package.nix

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dolibarr";
-  version = "20.0.0";
+  version = "20.0.2";
 
   src = fetchFromGitHub {
     owner = "Dolibarr";
     repo = "dolibarr";
-    rev = version;
-    hash = "sha256-nxytzUEpEo1qeIlpbPQ4mETl5DAAP+d1bqUcYxEW26E=";
+    tag = version;
+    hash = "sha256-5OEZpBxTYXhO27ea/GBmJI9uDLRDgMNc9ehQ7mvvSrY=";
   };
 
   dontBuild = true;
@@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
     find . -type f -name "*.php" -print0 | xargs -0 sed -i 's|/etc/dolibarr|${stateDir}|g'
 
     substituteInPlace htdocs/filefunc.inc.php \
-      --replace '//$conffile = ' '$conffile = ' \
-      --replace '//$conffiletoshow = ' '$conffiletoshow = '
+      --replace-fail '//$conffile = ' '$conffile = ' \
+      --replace-fail '//$conffiletoshow = ' '$conffiletoshow = '
 
     substituteInPlace htdocs/install/inc.php \
-      --replace '//$conffile = ' '$conffile = ' \
-      --replace '//$conffiletoshow = ' '$conffiletoshow = '
+      --replace-fail '//$conffile = ' '$conffile = ' \
+      --replace-fail '//$conffiletoshow = ' '$conffiletoshow = '
   '';
 
   installPhase = ''
@@ -38,10 +38,11 @@ stdenv.mkDerivation rec {
 
   passthru.tests = { inherit (nixosTests) dolibarr; };
 
-  meta = with lib; {
+  meta = {
     description = "Enterprise resource planning (ERP) and customer relationship manager (CRM) server";
+    changelog = "https://github.com/Dolibarr/dolibarr/releases/tag/${src.tag}";
     homepage = "https://dolibarr.org/";
-    license = licenses.gpl3Plus;
-    maintainers = [ ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
   };
 }