Merge master into staging-next

NixOS · Jun 12, 2024 · fddadbd · fddadbd
2 parents 898d059 + db4332c
commit fddadbd
Show file tree

Hide file tree

Showing 44 changed files with 226 additions and 286 deletions.
diff --git a/nixos/modules/services/hardware/power-profiles-daemon.nix b/nixos/modules/services/hardware/power-profiles-daemon.nix
@@ -39,6 +39,12 @@ in
  which conflicts with services.tlp.enable = true;
  '';
  }
+ { assertion = !config.services.auto-cpufreq.enable;
+ message = ''
+ You have set services.power-profiles-daemon.enable = true;
+ which conflicts with services.auto-cpufreq.enable = true;
+ '';
+ }
  ];
 
  environment.systemPackages = [ cfg.package ];

diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix
@@ -25,13 +25,13 @@
 
 mkDerivation rec {
  pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc";
- version = "0.29.5";
+ version = "0.29.6";
 
  src = fetchFromGitHub {
  owner = "bitcoin-ABC";
  repo = "bitcoin-abc";
  rev = "v${version}";
- hash = "sha256-1gw8VgAVflFjYq3/Rd+GgvCmpG2fjtpPvKU2TtxubWs=";
+ hash = "sha256-q+7NoZQDzEXBOFeob9Om5mnuocbaYjvdckv7Cur7nCI=";
  };
 
  nativeBuildInputs = [ pkg-config cmake ];

diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -29,13 +29,13 @@ let
  electron = electron_28;
 in buildNpmPackage rec {
  pname = "bitwarden-desktop";
- version = "2024.4.1";
+ version = "2024.5.0";
 
  src = fetchFromGitHub {
  owner = "bitwarden";
  repo = "clients";
  rev = "desktop-v${version}";
- hash = "sha256-UzVzo8tq719W2EwUE4NfvUrqhb61fvd60EGkavQmv3Q=";
+ hash = "sha256-ozR46snGD5yl98FslmnTeQmd2on/0bQPEnqJ0t8wx70=";
  };
 
  patches = [
@@ -60,7 +60,7 @@ in buildNpmPackage rec {
  makeCacheWritable = true;
  npmFlags = [ "--legacy-peer-deps" ];
  npmWorkspace = "apps/desktop";
- npmDepsHash = "sha256-qkg1psct/ekIXB6QmJX1n/UOKUhYSD9Su7t/b4/4miM=";
+ npmDepsHash = "sha256-gprJGOE/uSSM3NHpcbelB7sueObEl4o522WRHIRFmwo=";
 
  cargoDeps = rustPlatform.fetchCargoTarball {
  name = "${pname}-${version}";
@@ -76,7 +76,7 @@ in buildNpmPackage rec {
  patches;
  patchFlags = [ "-p4" ];
  sourceRoot = "${src.name}/${cargoRoot}";
- hash = "sha256-lvEJmjzhpMhm+9INYHWpdltinUOI3DMtFN/ddDQrUvo=";
+ hash = "sha256-FA7B+bipYSxwIGvn/v9+wG3Km6lrwV58LbxsMlDK8q0=";
  };
  cargoRoot = "apps/desktop/desktop_native";
 

diff --git a/pkgs/by-name/do/dovecot_exporter/package.nix b/pkgs/by-name/do/dovecot_exporter/package.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, fetchpatch
+, nixosTests
+}:
+buildGoModule rec {
+ pname = "dovecot_exporter";
+ version = "0.1.3-unstable-2019-07-19";
+
+ src = fetchFromGitHub {
+ owner = "kumina";
+ repo = "dovecot_exporter";
+ rev = "7ef79118ba619ff078594837377189477a4d059f";
+ sha256 = "sha256-qJbIBSfHYgFztuivuNjleDa+Bx0KC4OklCh3IvK2XFI=";
+ };
+
+ vendorHash = "sha256-+B8sROL1h6ElBfAUBT286yJF9m9zoRvMOrf0z2SVCj0=";
+
+ patches = [
+ # Migrate the project to Go modules
+ # https://github.com/kumina/dovecot_exporter/pull/23
+ (fetchpatch {
+ url = "https://github.com/kumina/dovecot_exporter/commit/b5184dd99cf8c79facf20cea281828d302327665.patch";
+ sha256 = "sha256-OcdI1fJ/wumDI/wk5PQVot9+Gw/PnsiwgJY7dcRyEsc=";
+ })
+ ];
+
+ passthru.tests = { inherit (nixosTests.prometheus-exporters) dovecot; };
+
+ meta = {
+ inherit (src.meta) homepage;
+ description = "Prometheus metrics exporter for Dovecot";
+ mainProgram = "dovecot_exporter";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ willibutz globin ];
+ };
+}
diff --git a/pkgs/by-name/dy/dynamodb-local/package.nix b/pkgs/by-name/dy/dynamodb-local/package.nix
@@ -26,11 +26,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "dynamodb-local";
- version = "2.5.0";
+ version = "2.5.1";
 
  src = fetchurl {
- url = "https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_2024-05-28.tar.gz";
- hash = "sha256-vwExzekzNdNWcEOHZ22b5F9pADdqZ4XSWscrndfPcsQ=";
+ url = "https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_2024-06-06.tar.gz";
+ hash = "sha256-fbd+F9sk/QJZgS4O2mFvEKbbV9hAMLuCt22BMriFYBQ=";
  };
 
  sourceRoot = ".";

diff --git a/...development/libraries/libopus/default.nix → pkgs/by-name/li/libopus/package.nix b/...development/libraries/libopus/default.nix → pkgs/by-name/li/libopus/package.nix
@@ -1,18 +1,19 @@
-{ lib
-, stdenv
-, fetchurl
-, gitUpdater
-, meson
-, python3
-, ninja
-, fixedPoint ? false
-, withCustomModes ? true
-, withIntrinsics ? stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isx86
-, withAsm ? false
+{
+ lib,
+ stdenv,
+ fetchurl,
+ gitUpdater,
+ meson,
+ python3,
+ ninja,
+ fixedPoint ? false,
+ withCustomModes ? true,
+ withIntrinsics ? stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isx86,
+ withAsm ? false,
 
-# tests
-, ffmpeg-headless
-, testers
+ # tests
+ ffmpeg-headless,
+ testers,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -33,7 +34,10 @@ stdenv.mkDerivation (finalAttrs: {
  patchShebangs meson/
  '';
 
- outputs = [ "out" "dev" ];
+ outputs = [
+ "out"
+ "dev"
+ ];
 
  nativeBuildInputs = [
  meson
@@ -68,12 +72,12 @@ stdenv.mkDerivation (finalAttrs: {
  };
  };
 
- meta = with lib; {
+ meta = {
  description = "Open, royalty-free, highly versatile audio codec";
  homepage = "https://opus-codec.org/";
  changelog = "https://gitlab.xiph.org/xiph/opus/-/releases/v${finalAttrs.version}";
- license = licenses.bsd3;
- platforms = platforms.all;
- maintainers = [ ];
+ license = lib.licenses.bsd3;
+ platforms = lib.platforms.all;
+ maintainers = with lib.maintainers; [ getchoo jopejoe1 ];
  };
 })
diff --git a/...ment/libraries/libopus/test-timeout.patch → pkgs/by-name/li/libopus/test-timeout.patch b/...ment/libraries/libopus/test-timeout.patch → pkgs/by-name/li/libopus/test-timeout.patch
diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix
@@ -2,16 +2,16 @@
 
 buildNpmPackage rec {
  pname = "lint-staged";
- version = "15.2.5";
+ version = "15.2.6";
 
  src = fetchFromGitHub {
  owner = "okonet";
  repo = "lint-staged";
  rev = "v${version}";
- hash = "sha256-Mr8Gtm5kXv+ZcLAMCe8JadJwlTRjD29xojN6Tyzdfb8=";
+ hash = "sha256-Jn6KGfgL4Si48hdg4glACe6AO5QzPgnasYhHMivzMGk=";
  };
 
- npmDepsHash = "sha256-BAVxloOuHodxPLoN5iMQcL04rdmkIEL6UYPnp2HbTe0=";
+ npmDepsHash = "sha256-6BKx06h+laYSMNm36R992oXYwCDS90F+nh21MnHA998=";
 
  dontNpmBuild = true;
 

diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
  pname = "misconfig-mapper";
- version = "1.3.0";
+ version = "1.3.1";
 
  src = fetchFromGitHub {
  owner = "intigriti";
  repo = "misconfig-mapper";
  rev = "refs/tags/v${version}";
- hash = "sha256-LrXx5OFpF+qsEhblBaXqsSGtw/Kp9FqjouCbMywpKg0=";
+ hash = "sha256-pQAv4waEocsSDGSOJlK7s5g9rkQGVJRGOpcB3HvG2yo=";
  };
 
- vendorHash = "sha256-lkVTgnWdk9eW6QtKScK8NckcXGzsHeIwjSoUx85AGU8=";
+ vendorHash = "sha256-T4SDL1Pq3mfN6Qd13Safof1EgCqQVB2+K1qJHm+2ilc=";
 
  ldflags = [
  "-s"

diff --git a/pkgs/by-name/wi/windmill/package.nix b/pkgs/by-name/wi/windmill/package.nix
@@ -74,7 +74,10 @@ rustPlatform.buildRustPackage {
  name = "librusty_v8-${args.version}";
  url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a";
  sha256 = args.shas.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}");
- meta = { inherit (args) version; };
+ meta = {
+ inherit (args) version;
+ sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+ };
  };
  in
  fetch_librusty_v8 {

diff --git a/pkgs/development/compilers/ocaml/builder.sh b/pkgs/development/compilers/ocaml/builder.sh
diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
@@ -18,13 +18,13 @@
 }@inputs:
 (if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv).mkDerivation rec {
  pname = "dlib";
- version = "19.24.2";
+ version = "19.24.4";
 
  src = fetchFromGitHub {
  owner = "davisking";
  repo = "dlib";
  rev = "v${version}";
- sha256 = "sha256-Z1fScuaIHjj2L1uqLIvsZ7ARKNjM+iaA8SAtWUTPFZk=";
+ sha256 = "sha256-1A/9u+ThtUtmmSwnFSn8S65Yavucl2X+o3bNYgew0Oc=";
  };
 
  postPatch = ''

diff --git a/pkgs/development/libraries/json-fortran/default.nix b/pkgs/development/libraries/json-fortran/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
  pname = "json-fortran";
- version = "8.5.2";
+ version = "9.0.1";
 
  src = fetchFromGitHub {
  owner = "jacobwilliams";
  repo = pname;
  rev = version;
- hash = "sha256-ja/MIqAe4V5nasdtWThkRxNWCx4+twz7/dX4+8X+Bt8=";
+ hash = "sha256-nhT2zLyt3ORi35h9KzOiIuD50GGUCZ/Z5SX8UF3rqQs=";
  };
 
  nativeBuildInputs = [

diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
  pname = "aioopenexchangerates";
- version = "0.4.11";
+ version = "0.4.12";
  pyproject = true;
 
  disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
  owner = "MartinHjelmare";
  repo = "aioopenexchangerates";
  rev = "refs/tags/v${version}";
- hash = "sha256-8AScYCDgv8Dkjt/0WJ4P2q2H9dykuq3w00qDDP8PiSs=";
+ hash = "sha256-A9d7nAqVwiIsS6f+A4PCGbONdhZb55JSmNuAFG990Ek=";
  };
 
  postPatch = ''

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -366,15 +366,15 @@
 
 buildPythonPackage rec {
  pname = "boto3-stubs";
- version = "1.34.122";
+ version = "1.34.124";
  pyproject = true;
 
  disabled = pythonOlder "3.7";
 
  src = fetchPypi {
  pname = "boto3_stubs";
  inherit version;
- hash = "sha256-gJdKU5mNiAr5dMVNWE/XBzOxD4QkbkDnRY6vTTsnoXY=";
+ hash = "sha256-X+092AtE6I/k6MLyFiBVGJRGNty8vSgG0E4NGVN68Ws=";
  };
 
  build-system = [ setuptools ];

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,15 +10,15 @@
 
 buildPythonPackage rec {
  pname = "botocore-stubs";
- version = "1.34.122";
+ version = "1.34.124";
  pyproject = true;
 
  disabled = pythonOlder "3.7";
 
  src = fetchPypi {
  pname = "botocore_stubs";
  inherit version;
- hash = "sha256-oX1MW1o8EOj6tm3Bf78qHbzJ2mC44J0jps+FHM7b+q8=";
+ hash = "sha256-naShit9yT/YXT0/TaEwb4bFhe8fdWPSsBPghiY1SuX8=";
  };
 
  nativeBuildInputs = [ poetry-core ];

diff --git a/pkgs/development/python-modules/dlib/build-cores.patch b/pkgs/development/python-modules/dlib/build-cores.patch
@@ -1,15 +1,17 @@
 diff --git a/setup.py b/setup.py
-index 0c8d8f16..565ef8ef 100644
+index 219583b..3ca5f88 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -172,21 +172,7 @@ class CMakeBuild(build_ext):
+@@ -170,23 +170,7 @@ class CMakeBuild(build_ext):
  subprocess.check_call(cmake_build, cwd=build_folder)
 
  def num_available_cpu_cores(ram_per_build_process_in_gb):
 - if 'TRAVIS' in os.environ and os.environ['TRAVIS']=='true':
 - # When building on travis-ci, just use 2 cores since travis-ci limits
 - # you to that regardless of what the hardware might suggest.
-- return 2 
+- return 2
+- elif 'CMAKE_BUILD_PARALLEL_LEVEL' in os.environ and os.environ['CMAKE_BUILD_PARALLEL_LEVEL'].isnumeric():
+- return int(os.environ['CMAKE_BUILD_PARALLEL_LEVEL'])
 - try:
 - mem_bytes = os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') 
 - mem_gib = mem_bytes/(1024.**3)

diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
  pname = "goodwe";
- version = "0.4.6";
+ version = "0.4.7";
  pyproject = true;
 
  disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
  owner = "marcelblijleven";
  repo = "goodwe";
  rev = "refs/tags/v${version}";
- hash = "sha256-Si2sdqaAhENF/PjaJeD3VdZATecJUsX7TtfX819800A=";
+ hash = "sha256-Z+CTwG9aJ/HFnrWXJXpUDgh60/crxaBXJuBSozZIoxI=";
  };
 
  postPatch = ''

diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix
@@ -10,15 +10,15 @@
 
 buildPythonPackage rec {
  pname = "model-checker";
- version = "0.4.4";
+ version = "0.4.9";
  pyproject = true;
 
  disabled = pythonOlder "3.8";
 
  src = fetchPypi {
  pname = "model_checker";
  inherit version;
- hash = "sha256-Ypp1h4qfrY3q27Oohf/UXsl2Vlmuj78hPhlcAzXVMq4=";
+ hash = "sha256-BUkbCllM2qN5yKTvte2iwnmBXQAzu2N8LTGRfvOTKUQ=";
  };
 
  # z3 does not provide a dist-info, so python-runtime-deps-check will fail