Merge pull request #309577 from obsidiansystems/bsd-reformat (f5710818) · Commits · nix / nixpkgs

.git-blame-ignore-revs

+3 −0

Original line number	Diff line number	Diff line
		@@ -108,3 +108,6 @@ fb0e5be84331188a69b3edd31679ca6576edb75a

		# postgresql: move packages.nix to ext/default.nix
		719034f6f6749d624faa28dff259309fc0e3e730

		# pkgs/os-specific/bsd: Reformat with nixfmt-rfc-style 2024-03-01
		3fe3b055adfc020e6a923c466b6bcd978a13069a

.github/workflows/check-nix-format.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ jobs:
		# Each environment variable beginning with NIX_FMT_PATHS_ is a list of
		# paths to check with nixfmt.
		env:
		NIX_FMT_PATHS_BSD: pkgs/os-specific/bsd
		NIX_FMT_PATHS_MPVSCRIPTS: pkgs/applications/video/mpv/scripts
		# Format paths related to the Nixpkgs CUDA ecosystem.
		NIX_FMT_PATHS_CUDA: \|

pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix

+9 −2

Original line number	Diff line number	Diff line
		{ lib, stdenv, linuxHeaders, freebsd, runCommandCC, buildPackages }:
		{
		lib,
		stdenv,
		linuxHeaders,
		freebsd,
		runCommandCC,
		buildPackages,
		}:

		stdenv.mkDerivation {
		pname = "evdev-proto";

pkgs/os-specific/bsd/freebsd/lib/default.nix

+10 −8

Original line number	Diff line number	Diff line
		@@ -3,14 +3,16 @@
		{
		inherit version;

		mkBsdArch = stdenv': {
		mkBsdArch =
		stdenv':
		{
		x86_64 = "amd64";
		aarch64 = "arm64";
		i486 = "i386";
		i586 = "i386";
		i686 = "i386";
		}.${stdenv'.hostPlatform.parsed.cpu.name}
		or stdenv'.hostPlatform.parsed.cpu.name;
		}
		.${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name;

		install-wrapper = builtins.readFile ./install-wrapper.sh;
		}

pkgs/os-specific/bsd/freebsd/package-set.nix

+28 −17

Original line number	Diff line number	Diff line
		{ stdenv, lib, stdenvNoCC
		, fetchzip
		, sourceData, versionData, buildFreebsd, patchesRoot
		{
		stdenv,
		lib,
		stdenvNoCC,
		fetchzip,
		sourceData,
		versionData,
		buildFreebsd,
		patchesRoot,
		}:

		self:
		@@ -8,7 +14,8 @@ self:
		lib.packagesFromDirectoryRecursive {
		callPackage = self.callPackage;
		directory = ./pkgs;
		} // {
		}
		// {
		inherit sourceData patchesRoot versionData;

		# Keep the crawled portion of Nixpkgs finite.
		@@ -21,11 +28,15 @@ lib.packagesFromDirectoryRecursive {

		compatIfNeeded = lib.optional (!stdenvNoCC.hostPlatform.isFreeBSD) self.compat;
		freebsd-lib = import ./lib {
		version = lib.concatStringsSep "." (map toString (lib.filter (x: x != null) [
		version = lib.concatStringsSep "." (
		map toString (
		lib.filter (x: x != null) [
		self.versionData.major
		self.versionData.minor
		self.versionData.patch or null
		]));
		]
		)
		);
		};

		# The manual callPackages below should in principle be unnecessary, but are
		@@ -51,21 +62,21 @@ lib.packagesFromDirectoryRecursive {
		};

		libc = self.callPackage ./pkgs/libc/package.nix {
		inherit (buildFreebsd) makeMinimal install gencat rpcgen;
		inherit (buildFreebsd)
		makeMinimal
		install
		gencat
		rpcgen
		;
		inherit (self) csu include;
		};

		libnetbsd = self.callPackage ./pkgs/libnetbsd/package.nix {
		inherit (buildFreebsd) makeMinimal;
		};
		libnetbsd = self.callPackage ./pkgs/libnetbsd/package.nix { inherit (buildFreebsd) makeMinimal; };

		mkDerivation = self.callPackage ./pkgs/mkDerivation.nix {
		inherit stdenv;
		inherit (buildFreebsd) makeMinimal install tsort;
		};

		makeMinimal = self.callPackage ./pkgs/makeMinimal.nix {
		inherit (self) make;
		};

		makeMinimal = self.callPackage ./pkgs/makeMinimal.nix { inherit (self) make; };
		}