Merge pull request #214855 from figsoda/zed (659d0ec9) · Commits · nix / nixpkgs

pkgs/development/tools/zed/default.nix

+21 −3

Original line number	Diff line number	Diff line
		{ lib
		, buildGoModule
		, fetchFromGitHub
		, testers
		, zed
		}:

		buildGoModule rec {
		@@ -18,11 +20,27 @@ buildGoModule rec {

		subPackages = [ "cmd/zed" "cmd/zq" ];

		ldflags = [
		"-s"
		"-w"
		"-X=github.com/brimdata/zed/cli.Version=${version}"
		];

		passthru.tests = {
		zed-version = testers.testVersion {
		package = zed;
		};
		zq-version = testers.testVersion {
		package = zed;
		command = "zq --version";
		};
		};

		meta = with lib; {
		description = "A novel data lake based on super-structured data";
		homepage = "https://github.com/brimdata/zed";
		license = licenses.bsd3;
		maintainers = with maintainers; [ dit7ya ];
		homepage = "https://zed.brimdata.io";
		changelog = "https://github.com/brimdata/zed/blob/v${version}/CHANGELOG.md";
		license = licenses.bsd3;
		maintainers = with maintainers; [ dit7ya knl ];
		};
		}

deleted100644 → 0

+0 −34

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, fetchFromGitHub
		, buildGoModule
		, testers
		, zq
		}:

		buildGoModule rec {
		pname = "zq";
		version = "1.4.0";

		src = fetchFromGitHub {
		owner = "brimdata";
		repo = "zed";
		rev = "v${version}";
		hash = "sha256-ias2HKwZo5Q/0M4YZI4wLgzMVWmannruXlhp8IsOuyU=";
		};

		vendorHash = "sha256-h5NYx6xhIh4i/tS5cGHXBomnVZCUn8jJuzL6k1+IdKk=";

		subPackages = [ "cmd/zq" ];

		ldflags = [ "-s" "-X" "github.com/brimdata/zed/cli.Version=${version}" ];

		passthru.tests = testers.testVersion { package = zq; };

		meta = with lib; {
		description = "A command-line tool for processing data in diverse input formats, providing search, analytics, and extensive transformations using the Zed language";
		homepage = "https://zed.brimdata.io";
		license = licenses.bsd3;
		maintainers = with maintainers; [ knl ];
		};
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -1697,6 +1697,7 @@ mapAliases ({
		zdfmediathk = throw "'zdfmediathk' has been renamed to/replaced by 'mediathekview'"; # Converted to throw 2022-02-22
		zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions"; # Added 2021-03-28
		zimwriterfs = throw "zimwriterfs is now part of zim-tools"; # Added 2022-06-10.
		zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq"; }; }); # Added 2023-02-06

		# TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03
		# branch-off

+0 −2

Original line number	Diff line number	Diff line
		@@ -1629,8 +1629,6 @@ with pkgs;

		breitbandmessung = callPackage ../applications/networking/breitbandmessung { };

		zq = callPackage ../development/tools/zq { };

		### APPLICATIONS/VERSION-MANAGEMENT

		deepgit = callPackage ../applications/version-management/deepgit {};