Merge pull request #132391 from SuperSandro2000/cleanup (633a5a6a) · Commits · nix / nixpkgs

pkgs/applications/graphics/renderdoc/default.nix

+5 −6

Original line number	Diff line number	Diff line
		@@ -11,12 +11,11 @@ let
		rev = "renderdoc-modified-7";
		sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6";
		};
		pythonPackages = python3Packages;
		cmakeBool = b: if b then "ON" else "OFF";
		in
		mkDerivation rec {
		version = "1.15";
		pname = "renderdoc";
		version = "1.15";

		src = fetchFromGitHub {
		owner = "baldurk";
		@@ -27,9 +26,9 @@ mkDerivation rec {

		buildInputs = [
		qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3
		] # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2])
		] # ++ (with python3Packages; [pyside2 pyside2-tools shiboken2])
		# TODO: figure out how to make cmake recognise pyside2
		++ (lib.optional waylandSupport wayland);
		++ lib.optional waylandSupport wayland;

		nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ];

pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix

+1 −4

Original line number	Diff line number	Diff line
		@@ -2,13 +2,10 @@
		, fetchurl
		, appimageTools
		, makeWrapper
		, electron_13
		, electron
		, xorg
		}:

		let
		electron = electron_13;
		in
		stdenv.mkDerivation rec {
		pname = "jitsi-meet-electron";
		version = "2.8.9";

pkgs/applications/networking/mailreaders/notmuch/default.nix

+15 −18

Original line number	Diff line number	Diff line
		@@ -9,16 +9,9 @@
		, withEmacs ? true
		}:

		with lib;

		stdenv.mkDerivation rec {
		version = "0.32.2";
		pname = "notmuch";

		passthru = {
		pythonSourceRoot = "${src.name}/bindings/python";
		inherit version;
		};
		version = "0.32.2";

		src = fetchurl {
		url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz";
		@@ -30,7 +23,7 @@ stdenv.mkDerivation rec {
		doxygen # (optional) api docs
		pythonPackages.sphinx # (optional) documentation -> doc/INSTALL
		texinfo # (optional) documentation -> doc/INSTALL
		] ++ optional withEmacs emacs;
		] ++ lib.optional withEmacs emacs;

		buildInputs = [
		gnupg # undefined dependencies
		@@ -41,12 +34,11 @@ stdenv.mkDerivation rec {
		];

		postPatch = ''
		patchShebangs configure
		patchShebangs test/
		patchShebangs configure test/

		substituteInPlace lib/Makefile.local \
		--replace '-install_name $(libdir)' "-install_name $out/lib"
		'' + optionalString withEmacs ''
		'' + lib.optionalString withEmacs ''
		substituteInPlace emacs/notmuch-emacs-mua \
		--replace 'EMACS:-emacs' 'EMACS:-${emacs}/bin/emacs' \
		--replace 'EMACSCLIENT:-emacsclient' 'EMACSCLIENT:-${emacs}/bin/emacsclient'
		@@ -56,9 +48,9 @@ stdenv.mkDerivation rec {
		"--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions"
		"--bashcompletiondir=${placeholder "out"}/share/bash-completion/completions"
		"--infodir=${placeholder "info"}/share/info"
		] ++ optional (!withEmacs) "--without-emacs"
		++ optional (withEmacs) "--emacslispdir=${placeholder "emacs"}/share/emacs/site-lisp"
		++ optional (isNull ruby) "--without-ruby";
		] ++ lib.optional (!withEmacs) "--without-emacs"
		++ lib.optional withEmacs "--emacslispdir=${placeholder "emacs"}/share/emacs/site-lisp"
		++ lib.optional (isNull ruby) "--without-ruby";

		# Notmuch doesn't use autoconf and consequently doesn't tag --bindir and
		# friends
		@@ -66,7 +58,6 @@ stdenv.mkDerivation rec {
		enableParallelBuilding = true;
		makeFlags = [ "V=1" ];


		outputs = [ "out" "man" "info" ] ++ lib.optional withEmacs "emacs";

		preCheck = let
		@@ -78,7 +69,8 @@ stdenv.mkDerivation rec {
		mkdir -p test/test-databases
		ln -s ${test-database} test/test-databases/database-v1.tar.xz
		'';
		doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0.3");

		doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3");
		checkTarget = "test";
		checkInputs = [
		which dtach openssl bash
		@@ -93,7 +85,12 @@ stdenv.mkDerivation rec {

		dontGzipMan = true; # already compressed

		meta = {
		passthru = {
		pythonSourceRoot = "${src.name}/bindings/python";
		inherit version;
		};

		meta = with lib; {
		description = "Mail indexer";
		homepage = "https://notmuchmail.org/";
		license = licenses.gpl3Plus;

pkgs/development/compilers/ecl/default.nix

+8 −15

Original line number	Diff line number	Diff line
		@@ -45,16 +45,10 @@ stdenv.mkDerivation {

		configureFlags = [
		(if threadSupport then "--enable-threads" else "--disable-threads")
		"--with-gmp-prefix=${gmp.dev}"
		"--with-libffi-prefix=${libffi.dev}"
		]
		++
		(lib.optional useBoehmgc
		"--with-libgc-prefix=${boehmgc.dev}")
		++
		(lib.optional (! noUnicode)
		"--enable-unicode")
		;
		"--with-gmp-prefix=${lib.getDev gmp}"
		"--with-libffi-prefix=${lib.getDev libffi}"
		] ++ lib.optional useBoehmgc "--with-libgc-prefix=${lib.getDev boehmgc}"
		++ lib.optional (!noUnicode) "--enable-unicode";

		hardeningDisable = [ "format" ];

		@@ -67,13 +61,12 @@ stdenv.mkDerivation {
		wrapProgram "$out/bin/ecl" --prefix PATH ':' "${gcc}/bin" ${ldArgs}
		'';

		meta = {
		inherit (s) version;
		meta = with lib; {
		description = "Lisp implementation aiming to be small, fast and easy to embed";
		homepage = "https://common-lisp.net/project/ecl/";
		license = lib.licenses.mit ;
		maintainers = [lib.maintainers.raskin];
		platforms = lib.platforms.unix;
		license = licenses.mit ;
		maintainers = [ maintainers.raskin ];
		platforms = platforms.unix;
		changelog = "https://gitlab.com/embeddable-common-lisp/ecl/-/raw/${s.version}/CHANGELOG";
		};
		}

pkgs/development/coq-modules/QuickChick/default.nix

+8 −8

Original line number	Diff line number	Diff line
		{ lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io, version ? null }:
		with lib;
		let recent = versions.isGe "8.7" coq.coq-version; in

		let recent = lib.versions.isGe "8.7" coq.coq-version; in
		mkCoqDerivation {
		pname = "QuickChick";
		owner = "QuickChick";
		inherit version;
		defaultVersion = with versions; switch [ coq.coq-version ssreflect.version ] [
		defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [
		{ cases = [ "8.13" pred.true ]; out = "1.5.0"; }
		{ cases = [ "8.12" pred.true ]; out = "1.4.0"; }
		{ cases = [ "8.11" pred.true ]; out = "1.3.2"; }
		@@ -30,19 +30,19 @@ mkCoqDerivation {
		release."20170512".sha256 = "033ch10i5wmqyw8j6wnr0dlbnibgfpr1vr0c07q3yj6h23xkmqpg";
		releaseRev = v: "v${v}";

		preConfigure = optionalString recent
		preConfigure = lib.optionalString recent
		"substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";

		mlPlugin = true;
		extraBuildInputs = optional recent coq.ocamlPackages.num;
		extraBuildInputs = lib.optional recent coq.ocamlPackages.num;
		propagatedBuildInputs = [ ssreflect ]
		++ optionals recent [ coq-ext-lib simple-io ]
		++ optional recent coq.ocamlPackages.ocamlbuild;
		++ lib.optionals recent [ coq-ext-lib simple-io ]
		++ lib.optional recent coq.ocamlPackages.ocamlbuild;
		extraInstallFlags = [ "-f Makefile.coq" ];

		enableParallelBuilding = false;

		meta = {
		meta = with lib; {
		description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck";
		maintainers = with maintainers; [ jwiegley ];
		};

Admin message