Merge branch 'master' into staging (9ab58483) · Commits · nix / nixpkgs

lib/maintainers.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,7 @@
		benley = "Benjamin Staffin <benley@gmail.com>";
		bennofs = "Benno Fünfstück <benno.fuenfstueck@gmail.com>";
		benwbooth = "Ben Booth <benwbooth@gmail.com>";
		berce = "Bert Moens <bert.moens@gmail.com>";
		berdario = "Dario Bertini <berdario@gmail.com>";
		bergey = "Daniel Bergey <bergey@teallabs.org>";
		bhipple = "Benjamin Hipple <bhipple@protonmail.com>";

+7 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,12 @@ in
		description = "Content of the configuration file";
		};

		mathjax = mkOption {
		type = types.bool;
		default = false;
		description = "Enable support for math rendering using MathJax";
		};

		branch = mkOption {
		type = types.str;
		default = "master";
		@@ -84,6 +90,7 @@ in
		--host ${cfg.address} \
		--config ${builtins.toFile "gollum-config.rb" cfg.extraConfig} \
		--ref ${cfg.branch} \
		${optionalString cfg.mathjax "--mathjax"} \
		${cfg.stateDir}
		'';
		};

0 → 100644

+46 −0

Original line number	Diff line number	Diff line
		{stdenv, fetchpatch, fetchFromGitHub, python3Packages}:

		stdenv.mkDerivation rec {
		version = "1.1";
		name = "ddgr-${version}";

		src = fetchFromGitHub {
		owner = "jarun";
		repo = "ddgr";
		rev = "v${version}";
		sha256 = "1q66kwip5y0kfkfldm1x54plz85mjyvv1xpxjqrs30r2lr0najgf";
		};

		buildInputs = [
		(python3Packages.python.withPackages (ps: with ps; [
		requests
		]))
		];

		patches = [
		(fetchpatch {
		sha256 = "1rxr3biq0mk4m0m7dsxr70dhz4fg5siil5x5fy9nymcmhvcm1cdc";
		name = "Fix-zsh-completion.patch";
		url = "https://github.com/jarun/ddgr/commit/10c1a911a3d5cbf3e96357c932b0211d3165c4b8.patch";
		})
		];

		makeFlags = "PREFIX=$(out)";

		postInstall = ''
		mkdir -p "$out/share/bash-completion/completions/"
		cp "auto-completion/bash/ddgr-completion.bash" "$out/share/bash-completion/completions/"
		mkdir -p "$out/share/fish/vendor_completions.d/"
		cp "auto-completion/fish/ddgr.fish" "$out/share/fish/vendor_completions.d/"
		mkdir -p "$out/share/zsh/site-functions/"
		cp "auto-completion/zsh/_ddgr" "$out/share/zsh/site-functions/"
		'';

		meta = with stdenv.lib; {
		homepage = https://github.com/jarun/ddgr;
		description = "Search DuckDuckGo from the terminal";
		license = licenses.gpl3;
		maintainers = with maintainers; [ markus1189 ];
		platforms = platforms.unix;
		};
		}

+2 −2

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

		with python3Packages;
		buildPythonApplication rec {
		version = "0.5.0";
		version = "0.5.1";
		name = "kitty-${version}";
		format = "other";

		@@ -10,7 +10,7 @@ buildPythonApplication rec {
		owner = "kovidgoyal";
		repo = "kitty";
		rev = "v${version}";
		sha256 = "1w202rsgswagb3kiqbwg4xixcglip2hhz6wj1qx9x2whi4zl1l68";
		sha256 = "0zs5b1sxi2f1lgpjs1qvd15gz6m1wfpyqskyyr0vmm4ch3rgp5zz";
		};

		buildInputs = [ fontconfig glfw ncurses libunistring harfbuzz ];

+7 −3

Original line number	Diff line number	Diff line
		@@ -29,9 +29,11 @@
		# Set to `privacySupport` or `false`.

		, webrtcSupport ? !privacySupport
		, googleAPISupport ? !privacySupport
		, geolocationSupport ? !privacySupport
		, googleAPISupport ? geolocationSupport
		, crashreporterSupport ? false

		, safeBrowsingSupport ? false
		, drmSupport ? false

		## other
		@@ -141,7 +143,7 @@ stdenv.mkDerivation (rec {
		]

		# and wants these
		++ lib.optionals isTorBrowserLike [
		++ lib.optionals isTorBrowserLike ([
		"--with-tor-browser-version=${version}"
		"--enable-signmar"
		"--enable-verify-mar"
		@@ -151,7 +153,9 @@ stdenv.mkDerivation (rec {
		# possibilities on other platforms.
		# Lets save some space instead.
		"--with-system-nspr"
		]
		] ++ flag geolocationSupport "mozril-geoloc"
		++ flag safeBrowsingSupport "safe-browsing"
		)

		++ flag alsaSupport "alsa"
		++ flag pulseaudioSupport "pulseaudio"