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

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,12 @@
		github = "13r0ck";
		githubId = 58987761;
		};
		_21eleven = {
		name = "Noah Lidell";
		email = "noahlidell@gmail.com";
		github = "21eleven";
		githubId = 8813855;
		};
		_2gn = {
		name = "Hiram Tanner";
		github = "2gn";

nixos/modules/config/update-users-groups.pl

+3 −12

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ use File::Path qw(make_path);
		use File::Slurp;
		use Getopt::Long;
		use JSON;
		use DateTime;
		use Time::Piece;

		# Keep track of deleted uids and gids.
		my $uidMapFile = "/var/lib/nixos/uid-map";
		@@ -26,17 +26,8 @@ sub updateFile {
		# Converts an ISO date to number of days since 1970-01-01
		sub dateToDays {
		my ($date) = @_;
		my ($year, $month, $day) = split('-', $date, -3);
		my $dt = DateTime->new(
		year => $year,
		month => $month,
		day => $day,
		hour => 0,
		minute => 0,
		second => 0,
		time_zone => 'UTC',
		);
		return $dt->epoch / 86400;
		my $time = Time::Piece->strptime($date, "%Y-%m-%d");
		return $time->epoch / 60 / 60 / 24;
		}

		sub nscdInvalidate {

nixos/modules/config/users-groups.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -648,7 +648,7 @@ in {
		install -m 0700 -d /root
		install -m 0755 -d /home

		${pkgs.perl.withPackages (p: [ p.FileSlurp p.JSON p.DateTime ])}/bin/perl \
		${pkgs.perl.withPackages (p: [ p.FileSlurp p.JSON ])}/bin/perl \
		-w ${./update-users-groups.pl} ${spec}
		'';
		};

pkgs/applications/misc/gpxsee/default.nix

+20 −17

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@
		, qttools
		, qtlocation ? null # qt5 only
		, qtpositioning ? null # qt6 only
		, qtpbfimageplugin
		, qtserialport
		, qtsvg
		, qt5compat ? null # qt6 only
		@@ -16,21 +15,21 @@

		let
		isQt6 = lib.versions.major qtbase.version == "6";

		in
		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "gpxsee";
		version = "13.4";
		version = "13.7";

		src = fetchFromGitHub {
		owner = "tumic0";
		repo = "GPXSee";
		rev = version;
		hash = "sha256-Zf2eyDx5QK69W6HNz/IGGHkX2qCDnxYsU8KLCgU9teY=";
		rev = finalAttrs.version;
		hash = "sha256-Y3JcWkg0K724i/5Leyi8r26uKpq/aDwghJBG8xfxpd4=";
		};

		buildInputs = [ qtpbfimageplugin qtserialport ]
		++ (if isQt6 then [
		buildInputs = [
		qtserialport
		] ++ (if isQt6 then [
		qtbase
		qtpositioning
		qtsvg
		@@ -39,7 +38,11 @@ stdenv.mkDerivation rec {
		qtlocation
		]);

		nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];
		nativeBuildInputs = [
		qmake
		qttools
		wrapQtAppsHook
		];

		preConfigure = ''
		lrelease gpxsee.pro
		@@ -56,17 +59,17 @@ stdenv.mkDerivation rec {
		updateScript = nix-update-script { };
		};

		meta = with lib; {
		meta = {
		broken = isQt6 && stdenv.isDarwin;
		changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes";
		description = "GPS log file viewer and analyzer";
		homepage = "https://www.gpxsee.org/";
		license = lib.licenses.gpl3Only;
		longDescription = ''
		GPXSee is a Qt-based GPS log file viewer and analyzer that supports
		all common GPS log file formats.
		'';
		homepage = "https://www.gpxsee.org/";
		changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes";
		license = licenses.gpl3Only;
		maintainers = with maintainers; [ womfoo sikmir ];
		platforms = platforms.unix;
		broken = isQt6 && stdenv.isDarwin;
		maintainers = with lib.maintainers; [ womfoo sikmir ];
		platforms = lib.platforms.unix;
		};
		}
		})

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

+2 −2

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

		buildGoModule rec {
		pname = "kubeshark";
		version = "41.6";
		version = "50.2";

		src = fetchFromGitHub {
		owner = "kubeshark";
		repo = "kubeshark";
		rev = version;
		sha256 = "sha256-UFBht8H8iOHwMU8PM2FCb+oh7rTkN/XC3/W3EmuTp84=";
		sha256 = "sha256-bABPfy790cMIfunKYfZwDbEn07fhq6g0m/yqeFgJg4Y=";
		};

		vendorHash = "sha256-rcxnvKkc9zerfULRdU5eGRRqSDQQDNMYaLJ7oEMQghk=";

Admin message