Merge staging-next into staging (7356db3c) · Commits · nix / nixpkgs

pkgs/by-name/ep/epson-escpr2/package.nix

+9 −23

Original line number	Diff line number	Diff line
		@@ -4,37 +4,23 @@
		fetchurl,
		autoreconfHook,
		cups,
		rpm,
		cpio,
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation {
		pname = "epson-inkjet-printer-escpr2";
		version = "1.2.26";
		version = "1.2.27";

		src = fetchurl {
		# To find the most recent version go to
		# https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php
		# and retrieve the download link for source package for x86 CPU
		url = "https://download3.ebz.epson.net/dsc/f/03/00/16/65/06/8fdecc271f6473178d08ffd6b6f6ca2abc92e32f/epson-inkjet-printer-escpr2-1.2.26-1.src.rpm";
		sha256 = "sha256-Js2iZCS9ZzJVRF8PbDA/U1muOne+upq4sA0u+NVIk/0=";
		# and retrieve the download link for source package for arm CPU for the tar.gz (the x86 link targets to rpm source files)
		url = "https://download3.ebz.epson.net/dsc/f/03/00/16/77/53/1540531c6f47c62d3846d9a8943b1ecec7f825a1/epson-inkjet-printer-escpr2-1.2.27-1.tar.gz";
		hash = "sha256-h1RaqkN+hdVGVy0ancqfYoeNp/TTfJYy5oRxhPizO2Q=";
		};

		unpackPhase = ''
		runHook preUnpack

		rpm2cpio $src \| cpio -idmv
		tar xvf ${pname}-${version}-1.tar.gz
		cd ${pname}-${version}

		runHook postUnpack
		'';

		buildInputs = [ cups ];
		nativeBuildInputs = [
		autoreconfHook
		rpm
		cpio
		];

		patches = [
		@@ -51,7 +37,7 @@ stdenv.mkDerivation rec {
		"--with-cupsppddir=${builtins.placeholder "out"}/share/cups/model"
		];

		meta = with lib; {
		meta = {
		homepage = "http://download.ebz.epson.net/dsc/search/01/search/";
		description = "ESC/P-R 2 Driver (generic driver)";
		longDescription = ''
		@@ -60,12 +46,12 @@ stdenv.mkDerivation rec {

		Refer to the description of epson-escpr for usage.
		'';
		license = licenses.gpl2Plus;
		maintainers = with maintainers; [
		license = lib.licenses.gpl2Plus;
		maintainers = with lib.maintainers; [
		ma9e
		ma27
		shawn8901
		];
		platforms = platforms.linux;
		platforms = lib.platforms.linux;
		};
		}

pkgs/by-name/gl/glusterfs/package.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -159,6 +159,12 @@ stdenv.mkDerivation rec {
		"--localstatedir=/var"
		];

		# FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009
		postConfigure = ''
		substituteInPlace libtool \
		--replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a'
		'';

		nativeBuildInputs = [
		autoconf
		automake

pkgs/by-name/ko/ko/package.nix

+3 −2

Original line number	Diff line number	Diff line
		{
		lib,
		buildGoModule,
		# broken with go 1.24 for some reason
		buildGo123Module,
		fetchFromGitHub,
		gitMinimal,
		installShellFiles,
		}:

		buildGoModule rec {
		buildGo123Module rec {
		pname = "ko";
		version = "0.15.4";

pkgs/by-name/ni/nilaway/package.nix

+5 −5

Original line number	Diff line number	Diff line
		@@ -4,18 +4,18 @@
		fetchFromGitHub,
		}:

		buildGoModule rec {
		buildGoModule {
		pname = "nilaway";
		version = "0-unstable-2024-10-10";
		version = "0-unstable-2025-03-07";

		src = fetchFromGitHub {
		owner = "uber-go";
		repo = "nilaway";
		rev = "ba14292918d814eeaea4de62da2ad0daae92f8b0";
		hash = "sha256-HAfuhGxmnMJvkz2vxBZ5kWsgSIw5KKlZp36HCLfCRxo=";
		rev = "19305c7c699bd0d370acd26d6769df1d7af8fb29";
		hash = "sha256-99L9dF76vZbh1NdXtKu5Bcnnca94Roybm3q18SDmZAk=";
		};

		vendorHash = "sha256-5qaEvQoK5S0svqzFAbJb8wy8yApyRpz4QE8sOhcjdaA=";
		vendorHash = "sha256-pthCLpy5pISKwdmeaJxPq8BxJLUwLwS2/hGMBt6/O4I=";

		subPackages = [ "cmd/nilaway" ];
		excludedPackages = [ "tools" ];

pkgs/by-name/un/unparam/package.nix

+5 −5

Original line number	Diff line number	Diff line
		@@ -4,18 +4,18 @@
		fetchFromGitHub,
		}:

		buildGoModule rec {
		buildGoModule {
		pname = "unparam";
		version = "0-unstable-2024-05-28";
		version = "0-unstable-2025-03-01";

		src = fetchFromGitHub {
		owner = "mvdan";
		repo = "unparam";
		rev = "8a5130ca722ffad18c95cc467b561f1668b9b0d2";
		hash = "sha256-CYCXTriGUd4bNY6ZPfkX4puE1imcqYHnX1SXVdnXPGM=";
		rev = "0df0534333a487d07b143c1b2c2e0046671d2d63";
		hash = "sha256-k/BgHvjB3fXz4CWTHRFja/EiGlof/c80jhRb91FaINs=";
		};

		vendorHash = "sha256-2lNC4V1WQkJdkagIlBu6tj4SA4KJKstHXc+B4emKu6s=";
		vendorHash = "sha256-Q7q0NZgofxChaSpYL5dS4NDadwfrXlLtkG/F7tGJuhA=";

		subPackages = [ "." ];

Admin message