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

nixos/modules/hardware/tenstorrent.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ in
		];

		environment.systemPackages = with pkgs; [
		python3Packages.tt-smi
		tt-smi
		tt-system-tools
		];
		};

nixos/modules/services/networking/pppd.nix

+2 −1

Original line number	Diff line number	Diff line
		@@ -96,7 +96,8 @@ in
		];
		in
		{
		ExecStart = "${getBin cfg.package}/sbin/pppd call ${peerCfg.name} nodetach nolog";
		Type = "notify";
		ExecStart = "${getBin cfg.package}/sbin/pppd call ${peerCfg.name} up_sdnotify nolog";
		Restart = "always";
		RestartSec = 5;

pkgs/applications/graphics/gimp/plugins/default.nix

+0 −10

Original line number	Diff line number	Diff line
		@@ -362,16 +362,6 @@ lib.makeScope pkgs.newScope (

		# =============== simple script files ====================

		# also have a look at enblend-enfuse in all-packages.nix
		exposureBlend = scriptDerivation {
		name = "exposure-blend";
		src = fetchurl {
		url = "http://tir.astro.utoledo.edu/jdsmith/code/eb/exposure-blend.scm";
		sha256 = "1b6c9wzpklqras4wwsyw3y3jp6fjmhnnskqiwm5sabs8djknfxla";
		};
		meta.broken = true;
		};

		lightning = scriptDerivation {
		name = "Lightning";
		src = fetchurl {

pkgs/applications/networking/hpmyroom/default.nix

deleted100644 → 0

+0 −97

Original line number	Diff line number	Diff line
		{
		mkDerivation,
		stdenv,
		lib,
		fetchurl,
		rpmextract,
		autoPatchelfHook,
		libuuid,
		libXtst,
		libXfixes,
		glib,
		gst_all_1,
		alsa-lib,
		freetype,
		fontconfig,
		libXext,
		libGL,
		libpng,
		libXScrnSaver,
		libxcb,
		xorg,
		libpulseaudio,
		libdrm,
		}:
		mkDerivation rec {
		pname = "hpmyroom";
		version = "12.13.0.0749";

		src = fetchurl {
		url = "https://www.myroom.hpe.com/downloadfiles/${pname}-${version}.x86_64.rpm";
		sha256 = "sha256-Ff3j14rC2ZHhNJLPxvKn9Sxyv351HuHbggclwOuFfX4=";
		};

		nativeBuildInputs = [
		rpmextract
		autoPatchelfHook
		];

		buildInputs = [
		libuuid
		libXtst
		libXScrnSaver
		libXfixes
		alsa-lib
		freetype
		fontconfig
		libXext
		libGL
		libpng
		libxcb
		libpulseaudio
		libdrm
		glib # For libgobject
		stdenv.cc.cc # For libstdc++
		xorg.libX11
		]
		++ (with gst_all_1; [
		gstreamer
		gst-plugins-base
		]);

		unpackPhase = ''
		rpmextract $src
		'';

		installPhase = ''
		runHook preInstall

		mv usr $out

		runHook postInstall
		'';

		qtWrapperArgs = [
		"--prefix QT_XKB_CONFIG_ROOT : '${xorg.xkeyboardconfig}/share/X11/xkb'"
		];

		postFixup = ''
		substituteInPlace $out/share/applications/HP-myroom.desktop \
		--replace /usr/bin/hpmyroom hpmyroom \
		--replace Icon=/usr/share/hpmyroom/Resources/MyRoom.png Icon=$out/share/hpmyroom/Resources/MyRoom.png

		ln -s ${libpng}/lib/libpng.so $out/lib/hpmyroom/libpng15.so.15
		'';

		meta = {
		description = "Client for HPE's MyRoom web conferencing solution";
		maintainers = with lib.maintainers; [ johnazoidberg ];
		sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
		license = lib.licenses.unfree;
		homepage = "https://myroom.hpe.com";
		# TODO: A Darwin binary is available upstream
		platforms = [ "x86_64-linux" ];
		mainProgram = "hpmyroom";
		broken = true; # requires libpng15
		};
		}

pkgs/applications/window-managers/phosh/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ let
		in
		stdenv.mkDerivation (finalAttrs: {
		pname = "phosh";
		version = "0.48.0";
		version = "0.50.0";

		src = fetchFromGitLab {
		domain = "gitlab.gnome.org";
		@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
		owner = "Phosh";
		repo = "phosh";
		tag = "v${finalAttrs.version}";
		hash = "sha256-HnjR0hVjkGfoD8RYCJqpGjRhl0W+QO8tYwSo71XFL6A=";
		hash = "sha256-AvnMiLapHKSObz6x/fkLxqreksBkwLbcG6myj5xMuwc=";
		};

		nativeBuildInputs = [