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

pkgs/applications/audio/go-musicfox/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,13 +10,13 @@
		# gcc only supports objc on darwin
		buildGoModule.override { stdenv = clangStdenv; } rec {
		pname = "go-musicfox";
		version = "4.0.4";
		version = "4.0.5";

		src = fetchFromGitHub {
		owner = "anhoder";
		repo = pname;
		rev = "v${version}";
		hash = "sha256-EPORD8jDmTnCm/ON1Vz2R7DpFVyAR8q7r2KZyKTiGr4=";
		hash = "sha256-NAAl/XmJqRnJyOYNJqmMlCIiGsCsSH7gGTMbD46gpss=";
		};

		deleteVendor = true;

pkgs/applications/misc/dockbarx/default.nix

+4 −6

Original line number	Diff line number	Diff line
		@@ -11,25 +11,23 @@

		python3Packages.buildPythonApplication rec {
		pname = "dockbarx";
		version = "${ver}-${rev}";
		ver = "1.0-beta";
		rev = "d98020ec49f3e3a5692ab2adbb145bbe5a1e80fe";
		version = "1.0-beta2";

		src = fetchFromGitHub {
		owner = "xuzhen";
		repo = "dockbarx";
		rev = rev;
		sha256 = "0xwqxh5mr2bi0sk54b848705awp0lfpd91am551811j2bdkbs04m";
		rev = version;
		sha256 = "sha256-WMRTtprDHUbOOYVHshx7WpBlYshbiDjI12Rw3tQQuPI=";
		};

		nativeBuildInputs = [
		glib.dev
		gobject-introspection
		python3Packages.polib
		wrapGAppsHook
		];

		buildInputs = [
		gobject-introspection
		gtk3
		libwnck
		keybinder3

pkgs/applications/networking/cluster/kubeseal/default.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -2,16 +2,16 @@

		buildGoModule rec {
		pname = "kubeseal";
		version = "0.20.2";
		version = "0.20.5";

		src = fetchFromGitHub {
		owner = "bitnami-labs";
		repo = "sealed-secrets";
		rev = "v${version}";
		sha256 = "sha256-dzrxOZ8gsLm3cw54id7edhqsqZfuOG90P3aAdf/b66M=";
		sha256 = "sha256-G7v5hRSUtO7AwotQ/2eftfs31+IbyzGHydT/IR1bhOY=";
		};

		vendorHash = "sha256-376PGm8VQ9B7/YYYqJyRZoMwAmaHYqEerBW5PV9Z8nY=";
		vendorHash = "sha256-fndK1PO4CfTGQV1f9PJ+ju5VUW/RIE5i8IBARJn0g6g=";

		subPackages = [ "cmd/kubeseal" ];

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -428,13 +428,13 @@
		"vendorHash": null
		},
		"gitlab": {
		"hash": "sha256-bn02BLLSgdo7/Oh95rNOxVUVvwflSvU43DOsii5LM0E=",
		"hash": "sha256-im5YyI1x9ys0MowuNm7JcbJvXPCHxcXXWJeRXRrRIr4=",
		"homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",
		"owner": "gitlabhq",
		"repo": "terraform-provider-gitlab",
		"rev": "v15.10.0",
		"rev": "v15.11.0",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-s4FynUO6bT+8uZYkecbQCtFw1jFTAAYUkSzONI6Ba9g="
		"vendorHash": "sha256-SLFpH7isx4OM2X9bzWYYD4VlejlgckBovOxthg47OOQ="
		},
		"google": {
		"hash": "sha256-rF68NnqyEY4BWl+oLOxfTaQw5zEGs6Ue/L9DwzsJ46M=",

pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix

+15 −13

Original line number	Diff line number	Diff line
		@@ -2,28 +2,25 @@
		, stdenv
		, fetchFromGitHub
		, bash
		, cmake
		, dockbarx
		, gobject-introspection
		, keybinder3
		, pkg-config
		, python3Packages
		, vala
		, wafHook
		, wrapGAppsHook
		, xfce
		}:

		stdenv.mkDerivation rec {
		pname = "xfce4-dockbarx-plugin";
		version = "${ver}-${rev}";
		ver = "0.6";
		rev = "5213876151f1836f044e9902a22d1e682144c1e0";
		version = "0.7.2";

		src = fetchFromGitHub {
		owner = "xuzhen";
		repo = "xfce4-dockbarx-plugin";
		rev = rev;
		sha256 = "sha256-VqtGcBRjvpCO9prVHOv6Gt1rAZtcAgkQkVCoR6ykC2k=";
		rev = "v${version}";
		sha256 = "sha256-ZxaWORqA8LiM4CzakxClg5C6AsyHrzCGydgboCrC45g=";
		};

		pythonPath = [
		@@ -32,11 +29,10 @@ stdenv.mkDerivation rec {
		];

		nativeBuildInputs = [
		cmake
		gobject-introspection
		pkg-config
		python3Packages.wrapPython
		vala
		wafHook
		wrapGAppsHook
		];

		@@ -49,14 +45,20 @@ stdenv.mkDerivation rec {
		++ pythonPath;

		postPatch = ''
		substituteInPlace wscript --replace /usr/share/ "\''${PREFIX}/share/"
		substituteInPlace src/dockbarx.vala --replace /usr/share/ $out/share/
		substituteInPlace src/dockbarx.vala --replace '/usr/bin/env python3' ${bash}/bin/bash
		# We execute the wrapped xfce4-panel-plug directly.
		# Since argv is used for g_free() we also need to shift the indexes.
		substituteInPlace src/xfce_panel_plugin.c \
		--replace '"python3",' "" \
		--replace "g_free(argv[3]);" "g_free(argv[2]);" \
		--replace "g_free(argv[5]);" "g_free(argv[4]);"

		patchShebangs src/xfce4-dockbarx-plug.py
		'';

		postFixup = ''
		makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
		wrapPythonProgramsIn "$out/share/xfce4/panel/plugins" "$out $pythonPath"
		chmod +x $out/share/dockbarx/xfce4-panel-plug
		wrapPythonProgramsIn "$out/share/dockbarx" "$out $pythonPath"
		'';

		meta = with lib; {

Admin message