Merge master into staging-next (fd29280a) · Commits · nix / nixpkgs

pkgs/applications/audio/hqplayer-desktop/default.nix

+34 −22

Original line number	Diff line number	Diff line
		{ mkDerivation
		, alsa-lib
		, autoPatchelfHook
		, evince
		, fetchurl
		, flac
		, gcc11
		, gcc12
		, lib
		, libmicrohttpd
		, libusb-compat-0_1
		, llvmPackages_10
		, qtcharts
		, qtdeclarative
		@@ -18,15 +20,15 @@

		mkDerivation rec {
		pname = "hqplayer-desktop";
		version = "4.13.1-38";
		version = "4.22.0-65";

		src = fetchurl {
		url = "https://www.signalyst.eu/bins/hqplayer/fc34/hqplayer4desktop-${version}.fc34.x86_64.rpm";
		sha256 = "sha256-DEZWEGk5SfhcNQddehCBVbfeTH8KfVCdaxQ+F3MrRe8=";
		url = "https://www.signalyst.eu/bins/hqplayer4desktop-${version}.fc36.x86_64.rpm";
		sha256 = "sha256-PA8amsqy4O9cMruNYVhG+uBiUGQ5WfnZC2ARppmZd7g=";
		};

		unpackPhase = ''
		${rpmextract}/bin/rpmextract $src
		${rpmextract}/bin/rpmextract "$src"
		'';

		nativeBuildInputs = [ autoPatchelfHook rpmextract ];
		@@ -34,8 +36,9 @@ mkDerivation rec {
		buildInputs = [
		alsa-lib
		flac
		gcc11.cc.lib
		gcc12.cc.lib
		libmicrohttpd
		libusb-compat-0_1
		llvmPackages_10.openmp
		qtcharts
		qtdeclarative
		@@ -45,41 +48,52 @@ mkDerivation rec {
		wavpack
		];

		dontPatch = true;
		dontConfigure = true;
		dontBuild = true;

		installPhase = ''
		runHook preInstall

		# main executable
		mkdir -p $out/bin
		cp ./usr/bin/* $out/bin
		# additional library
		mkdir -p "$out"/lib
		mv ./opt/hqplayer4desktop/lib/* "$out"/lib

		# desktop files
		mkdir -p $out/share/applications
		cp ./usr/share/applications/* $out/share/applications
		# main executable
		mkdir -p "$out"/bin
		mv ./usr/bin/* "$out"/bin

		# documentation
		mkdir -p $out/share/doc/${pname}
		cp ./usr/share/doc/hqplayer4desktop/* $out/share/doc/${pname}
		mkdir -p "$doc/share/doc/${pname}" "$doc/share/applications"
		mv ./usr/share/doc/hqplayer4desktop/* "$doc/share/doc/${pname}"
		mv ./usr/share/applications/hqplayer4desktop-manual.desktop "$doc/share/applications"

		# desktop files
		mkdir -p "$out/share/applications"
		mv ./usr/share/applications/* "$out/share/applications"

		# pixmaps
		mkdir -p $out/share/pixmaps
		cp ./usr/share/pixmaps/* $out/share/pixmaps
		mkdir -p "$out/share/pixmaps"
		mv ./usr/share/pixmaps/* "$out/share/pixmaps"

		runHook postInstall
		'';

		# doc has dependencies on evince that is not required by main app
		outputs = [ "out" "doc" ];

		postInstall = ''
		for desktopFile in $out/share/applications/*; do
		for desktopFile in $out/share/applications/hqplayer4{desktop-nostyle,desktop-highdpi,-client,desktop}.desktop; do
		substituteInPlace "$desktopFile" \
		--replace /usr/bin/ $out/bin/ \
		--replace /usr/share/doc/ $out/share/doc/
		--replace /usr/bin "$out"/bin
		done
		substituteInPlace "$doc/share/applications/hqplayer4desktop-manual.desktop" \
		--replace /usr/share/doc/hqplayer4desktop "$doc/share/doc/${pname}" \
		--replace evince "${evince}/bin/evince"
		'';

		postFixup = ''
		patchelf --replace-needed libomp.so.5 libomp.so $out/bin/.hqplayer4desktop-wrapped
		patchelf --replace-needed libomp.so.5 libomp.so "$out/bin/.hqplayer4desktop-wrapped"
		'';

		meta = with lib; {
		@@ -89,7 +103,5 @@ mkDerivation rec {
		sourceProvenance = with sourceTypes; [ binaryNativeCode ];
		platforms = [ "x86_64-linux" ];
		maintainers = with maintainers; [ lovesegfault ];
		# src link returns 403
		broken = true;
		};
		}

pkgs/applications/editors/vim/plugins/generated.nix

+24 −12

Original line number	Diff line number	Diff line
		@@ -775,12 +775,12 @@ final: prev:

		auto-session = buildVimPluginFrom2Nix {
		pname = "auto-session";
		version = "2023-04-29";
		version = "2023-05-05";
		src = fetchFromGitHub {
		owner = "rmagatti";
		repo = "auto-session";
		rev = "9752e6b11327329ed3ba5ec2bec36abe4535a8e0";
		sha256 = "0hqh8mzs9vxfasxb1sr4vx2igcjl9f9vmf5spd7vriaxi331sf1p";
		rev = "21033c6815f249a7839c3a85fc8a6b44d74925c9";
		sha256 = "1xw2azfkwn2q0nz3g67wy6wkaqlmhxy26x7bnjl7n21lh2gxv7fm";
		};
		meta.homepage = "https://github.com/rmagatti/auto-session/";
		};
		@@ -2827,6 +2827,18 @@ final: prev:
		meta.homepage = "https://github.com/sainnhe/edge/";
		};

		edgedb-vim = buildVimPluginFrom2Nix {
		pname = "edgedb-vim";
		version = "2022-10-26";
		src = fetchFromGitHub {
		owner = "edgedb";
		repo = "edgedb-vim";
		rev = "a888b285a30ede6f5fcb03617733b3974356c450";
		sha256 = "012jd6652f681ja22gvnrnlvsn1fllj9vmf6idghcdzz6lyjir07";
		};
		meta.homepage = "https://github.com/edgedb/edgedb-vim/";
		};

		editorconfig-vim = buildVimPluginFrom2Nix {
		pname = "editorconfig-vim";
		version = "2023-03-22";
		@@ -3288,12 +3300,12 @@ final: prev:

		fzf-lua = buildVimPluginFrom2Nix {
		pname = "fzf-lua";
		version = "2023-04-27";
		version = "2023-05-05";
		src = fetchFromGitHub {
		owner = "ibhagwan";
		repo = "fzf-lua";
		rev = "79c7c3480cc363b3d4ecdfcb8b56623d9decd570";
		sha256 = "0vay2k6hv30fhchjd59m4xqdyl9642xs5gjlc1rrb9v3s2xs9g53";
		rev = "2dbedc91386a78ce08967135969d39392f7f36d7";
		sha256 = "11850qbyr83bh5im75lf74ssizw956gf3n34s3wcqdhxx6nv5xbp";
		};
		meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
		};
		@@ -6419,12 +6431,12 @@ final: prev:

		nvim-highlite = buildVimPluginFrom2Nix {
		pname = "nvim-highlite";
		version = "2023-05-04";
		version = "2023-05-05";
		src = fetchFromGitHub {
		owner = "Iron-E";
		repo = "nvim-highlite";
		rev = "624fddaf856add7a4a9a40b33fad3bb3818f4fc8";
		sha256 = "1r65wcpbdqi05mpa9382bawv32l2r0s8avr9in5q07sl66wd59v8";
		rev = "d5654c3a8951f6c503cb8083a0e9dbfc35a5f59c";
		sha256 = "1c00jijxqa83xbg3spn8830h8gmn1mqh6m4jifhahglanh3y5228";
		};
		meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
		};
		@@ -14305,12 +14317,12 @@ final: prev:

		vista-vim = buildVimPluginFrom2Nix {
		pname = "vista.vim";
		version = "2023-04-17";
		version = "2023-05-05";
		src = fetchFromGitHub {
		owner = "liuchengxu";
		repo = "vista.vim";
		rev = "cbe87c86505d80fe5ad7fd508f2d92185f2e2aa1";
		sha256 = "0vx99bhrgwr72az85imp7qwni54q9kk1v9vhdbglfc4h1rd3fzm5";
		rev = "522a5e0ef955c037d530d5c89944043c92e4e8da";
		sha256 = "0g9vjji4760824q7w0ik89b1wrq0k0rv54c3wmpxk9hxfd34wlb1";
		};
		meta.homepage = "https://github.com/liuchengxu/vista.vim/";
		};

pkgs/applications/editors/vim/plugins/vim-plugin-names

+1 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,7 @@ https://github.com/Mofiqul/dracula.nvim/,HEAD,
		https://github.com/stevearc/dressing.nvim/,,
		https://github.com/Shougo/echodoc.vim/,,
		https://github.com/sainnhe/edge/,,
		https://github.com/edgedb/edgedb-vim/,,
		https://github.com/editorconfig/editorconfig-vim/,,
		https://github.com/gpanders/editorconfig.nvim/,,
		https://github.com/elixir-tools/elixir-tools.nvim/,HEAD,

pkgs/applications/networking/cluster/terraform-providers/providers.json

+23 −23

Original line number	Diff line number	Diff line
		@@ -9,14 +9,14 @@
		"vendorHash": null
		},
		"acme": {
		"hash": "sha256-uyycmae+OAZ/dC4GReEF5xrClQvophLX1/EZv+kpFU4=",
		"hash": "sha256-Q8uoWKdpo6S3XHyZrMvUqxY08IOoHmRhmS/3fuShr8s=",
		"homepage": "https://registry.terraform.io/providers/vancluever/acme",
		"owner": "vancluever",
		"proxyVendor": true,
		"repo": "terraform-provider-acme",
		"rev": "v2.13.1",
		"rev": "v2.14.0",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-C78RPGpENvn6mBm8xsnl3DXKUQ0xtdN8k25t8USigWE="
		"vendorHash": "sha256-VizPxWLvNpZ9FAs8FGuBhXjJoxhePiB/RIzbNfiEwOQ="
		},
		"age": {
		"hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=",
		@@ -110,11 +110,11 @@
		"vendorHash": null
		},
		"aws": {
		"hash": "sha256-oD8I7wWLdn9Yv6naRcq0myg1L2DcvP/a6VL/fUfdC+g=",
		"hash": "sha256-bJScfyTNDW0cKGp93cffDcZ/PZQ8trNbemHT5OoCkvg=",
		"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
		"owner": "hashicorp",
		"repo": "terraform-provider-aws",
		"rev": "v4.66.0",
		"rev": "v4.66.1",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-tetNRSjQTgFzFLSdmRL6f+UlwKp62zr00JzFXJs8nMs="
		},
		@@ -128,11 +128,11 @@
		"vendorHash": null
		},
		"azurerm": {
		"hash": "sha256-1K+uM8uRpFigr9scvBL/FDoqc7TKh4ZnppEHnl8i8EA=",
		"hash": "sha256-frIlEojIK/6KhPquliQPveP279bFHvLAy830bx6Yd2c=",
		"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
		"owner": "hashicorp",
		"repo": "terraform-provider-azurerm",
		"rev": "v3.54.0",
		"rev": "v3.55.0",
		"spdx": "MPL-2.0",
		"vendorHash": null
		},
		@@ -182,11 +182,11 @@
		"vendorHash": "sha256-jOscYbwZ8m4smGiAy2vNhPMTAUnINkpuVRQ8E6LpWVw="
		},
		"buildkite": {
		"hash": "sha256-nwGnt/+pSR1rGiXZ1RJIpekT+i0k4ZmMN27VpYCDVU0=",
		"hash": "sha256-5R3aX0tzUnewsYguHlelYXn1JrfowrOCaqYtfvrnoSE=",
		"homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
		"owner": "buildkite",
		"repo": "terraform-provider-buildkite",
		"rev": "v0.17.0",
		"rev": "v0.17.1",
		"spdx": "MIT",
		"vendorHash": "sha256-ZXjmR1maiiLeWipXGOAGfLEuot9TsrzAX4EPRNQ5Gbo="
		},
		@@ -209,13 +209,13 @@
		"vendorHash": null
		},
		"cloudamqp": {
		"hash": "sha256-cFXQgB++BcTKCFuJ3bMm8Qw3Zdr9m9d6LaZMz5tKXBM=",
		"hash": "sha256-z7SE69j+9qlwO53xbvSvBQd41zL+1jDDhJ0ByfVEqqo=",
		"homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp",
		"owner": "cloudamqp",
		"repo": "terraform-provider-cloudamqp",
		"rev": "v1.26.0",
		"rev": "v1.26.1",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-wyPwStUCprrnq0S6jKzDqAXeWTZW43ml+vBOuX05eRs="
		"vendorHash": "sha256-IXhs9fSrIKuhLUwamaSd8vY4ePK8DAre9crvonpUvys="
		},
		"cloudflare": {
		"hash": "sha256-0bHKQe4wIieKdxPF0S7Qv8QLlg+AZzBOG8n2qiMOM0g=",
		@@ -282,13 +282,13 @@
		"vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA="
		},
		"datadog": {
		"hash": "sha256-i6v55pIooA+7L5V2yNL+T2KCgGNLU5ZrqeKzdzdvNoA=",
		"hash": "sha256-bay1hBIfgYBqY1SSpbezPMW4L6ZpJIYfH/5up13wgUo=",
		"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
		"owner": "DataDog",
		"repo": "terraform-provider-datadog",
		"rev": "v3.24.1",
		"rev": "v3.25.0",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-MMPE1Urnlt7QCoiEnHqWnFZzmeSs/i4UtiotyrXZF2U="
		"vendorHash": "sha256-0KuoVcM/pvXMxdLL1HO6XsVTUOfQylzl6yGfQF6HdvQ="
		},
		"dhall": {
		"hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=",
		@@ -419,11 +419,11 @@
		"vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk="
		},
		"github": {
		"hash": "sha256-gMuQNI0+zvveVqyhRdIyPyxVNfdk6PUXpf4Iv2Y+jI4=",
		"hash": "sha256-BDYnzyda7I+Oz3YVUSpR24S+FxZwRPjmBgFeyzr0iZQ=",
		"homepage": "https://registry.terraform.io/providers/integrations/github",
		"owner": "integrations",
		"repo": "terraform-provider-github",
		"rev": "v5.24.0",
		"rev": "v5.25.0",
		"spdx": "MIT",
		"vendorHash": null
		},
		@@ -728,13 +728,13 @@
		"vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
		},
		"minio": {
		"hash": "sha256-URn6XFqKTE3nXE5ZcaXmRvGl6qLdffLLSoMRq70zh4I=",
		"hash": "sha256-LL3jOuNNCd5isNPyt+I35j5BdxAbnWRQ2o2RBLSOc/E=",
		"homepage": "https://registry.terraform.io/providers/aminueza/minio",
		"owner": "aminueza",
		"repo": "terraform-provider-minio",
		"rev": "v1.14.0",
		"rev": "v1.15.0",
		"spdx": "Apache-2.0",
		"vendorHash": "sha256-Mdy9uXYb7MH9XHqSNkG0QqTVzjvTy4+/Mr6VHXJBEZE="
		"vendorHash": "sha256-Xz6WxAxzvLfgJTD2oDgZoeHffcdA7dyfgwY1g6lFkbk="
		},
		"mongodbatlas": {
		"hash": "sha256-NvKthj+rVT23v/V1C8w8CMTfOy3yNsMjg2knXECzay4=",
		@@ -1226,13 +1226,13 @@
		"vendorHash": null
		},
		"vsphere": {
		"hash": "sha256-VScIcK4bInS9yhIYkYRsU8Hhzex9iyVkPiyjnnjshkI=",
		"hash": "sha256-XVMTKYb9RuK5sErVHsP0j5otUEioxp6C7GV7/J6OYVA=",
		"homepage": "https://registry.terraform.io/providers/hashicorp/vsphere",
		"owner": "hashicorp",
		"repo": "terraform-provider-vsphere",
		"rev": "v2.3.1",
		"rev": "v2.4.0",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-guUjkk7oW+Gvu015LUAxGqUwZF4H+4xmmOaMqKixZaI="
		"vendorHash": "sha256-wKKrBSJkbdqqnDLoS+jhvI26rOzvMWjjsN8wh67Le5U="
		},
		"vultr": {
		"hash": "sha256-4Um4UyDjtamy2s15K3Idm5edZj5BOy13+kr39wl9e0Q=",

pkgs/development/tools/analysis/checkov/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -22,14 +22,14 @@ with py.pkgs;

		buildPythonApplication rec {
		pname = "checkov";
		version = "2.3.223";
		version = "2.3.224";
		format = "setuptools";

		src = fetchFromGitHub {
		owner = "bridgecrewio";
		repo = pname;
		rev = "refs/tags/${version}";
		hash = "sha256-/m/B2yR/NxQnd2di6ERZHFTT4xOI5mH6xFQwp3p2bEo=";
		hash = "sha256-WvNGHFAGJfW0IutlIulxNTYG4q/pzd5Bn5AKyh1o24w=";
		};

		patches = [

Admin message