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

pkgs/applications/audio/pbpctrl/default.nix

+3 −3

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

		rustPlatform.buildRustPackage rec {
		pname = "pbpctrl";
		version = "0.1.5";
		version = "0.1.6";

		src = fetchFromGitHub {
		owner = "qzed";
		repo = "${pname}";
		rev = "v${version}";
		hash = "sha256-tOdKXYfeO+HsYIDDU3fDb76ytRHVOcIqffEjFnLwOTI=";
		hash = "sha256-V7wfEXJ0tVQNsi1OFU1Dk2d9ImsNFRriGutpJzh2tV8=";
		};

		cargoHash = "sha256-yP4tsXCAPE1KUDU5oBIejL4kACK1dNXK7Kmw37VMexM=";
		cargoHash = "sha256-8D+WD5bOxoUhw4a7SUr+D2gn1NA7OkmoCcALO9HY8Qk=";

		nativeBuildInputs = [ pkg-config protobuf ];
		buildInputs = [ dbus ];

+12 −0

Original line number	Diff line number	Diff line
		@@ -861,6 +861,18 @@ let
		'';
		});

		clingo-mode = super.clingo-mode.overrideAttrs (
		finalAttrs: previousAttrs: {
		patches = previousAttrs.patches or [ ] ++ [
		(pkgs.fetchpatch {
		name = "add-missing-end-parenthesis.patch";
		url = "https://github.com/llaisdy/clingo-mode/pull/3/commits/063445a24afb176c3f16af7a2763771dbdc4ecf6.patch";
		hash = "sha256-OYP5LaZmCUJFgFk1Pf30e7sml8fC+xI4HSyDz7lck7E=";
		})
		];
		}
		);

		# https://github.com/atilaneves/cmake-ide/issues/176
		cmake-ide = addPackageRequires super.cmake-ide [ self.dash ];

+0 −30

Original line number	Diff line number	Diff line
		@@ -122,34 +122,4 @@
		versionSuffix = "esr";
		};
		};

		firefox-esr-115 = (buildMozillaMach rec {
		pname = "firefox-esr-115";
		version = "115.16.1esr";
		applicationName = "Mozilla Firefox ESR";
		src = fetchurl {
		url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
		sha512 = "eca42b3494fdab73e67d5c8e8b76520729adb75b5cad85172953dba56b225b0f05dcfea70fe8cc3e1bf1cd3d7103159cc20095d5480bb1b0e6d3ec90588988a8";
		};

		meta = {
		changelog = "https://www.mozilla.org/en-US/firefox/${lib.removeSuffix "esr" version}/releasenotes/";
		description = "Web browser built from Firefox Extended Support Release source tree";
		homepage = "http://www.mozilla.com/en-US/firefox/";
		maintainers = with lib.maintainers; [ hexa ];
		platforms = lib.platforms.unix;
		badPlatforms = lib.platforms.darwin;
		broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
		# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
		license = lib.licenses.mpl20;
		mainProgram = "firefox";
		};
		tests = [ nixosTests.firefox-esr-115 ];
		updateScript = callPackage ./update.nix {
		attrPath = "firefox-esr-115-unwrapped";
		versionPrefix = "115";
		versionSuffix = "esr";
		};
		})
		.override { python3 = python311; };
		}

+1 −4

Original line number	Diff line number	Diff line
		@@ -51,10 +51,7 @@ let versions = callPackage ./versions.nix { };
		sublist = l: lib.sublist 0 n l;
		in lib.compareLists lib.compare (sublist as) (sublist bs) == 0;

		matchesDoc = v:
		builtins.match (if webdoc
		then ".*[0-9]_LIN(UX)?.sh"
		else ".*_B[Nn][Dd][Ll].sh") v.src.name != null;
		matchesDoc = v: (builtins.match ".*[0-9]_LIN(UX)?.sh" v.src.name != null) == webdoc;

		in

+13 −10

Original line number	Diff line number	Diff line
		{ lib
		, buildNpmPackage
		, fetchFromGitHub
		{
		lib,
		buildNpmPackage,
		fetchFromGitHub,
		}:

		buildNpmPackage rec {
		pname = "clean-css-cli";
		version = "5.6.2";

		let
		version = "5.6.3";
		src = fetchFromGitHub {
		owner = "clean-css";
		repo = "clean-css-cli";
		rev = "v${version}";
		hash = "sha256-ONWJn6mehXeNwRVEEM+Ad/heXwNWC9E9yA5eUQsi98A=";
		hash = "sha256-tsFNcQg55uY2gL5xLLLS6INLlYzbsU6M3hnsYeOFGEw=";
		};
		in
		buildNpmPackage {
		pname = "clean-css-cli";
		inherit version src;

		npmDepsHash = "sha256-eVd6YSTHhp6qzGYn5PlikUgjNS+GJoRwfm6KPrEJKGE=";
		npmDepsHash = "sha256-uvI9esVVOE18syHUCJpoiDY+Vh3hJO+GsMOTZSYJaxg=";

		dontNpmBuild = true;

		@@ -24,6 +27,6 @@ buildNpmPackage rec {
		homepage = "https://github.com/clean-css/clean-css-cli";
		license = lib.licenses.mit;
		mainProgram = "cleancss";
		maintainers = [ ];
		maintainers = with lib.maintainers; [ momeemt ];
		};
		}