Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

1 files changed, 33 insertions, 10 deletions

diff --git a/nixpkgs/pkgs/development/libraries/libngspice/default.nix b/nixpkgs/pkgs/development/libraries/libngspice/default.nix
index 461bcbe025ed..c6e787eda618 100644
--- a/nixpkgs/pkgs/development/libraries/libngspice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libngspice/default.nix
@@ -1,26 +1,49 @@
-{lib, stdenv, fetchurl, bison, flex, fftw}:
+{ lib
+, stdenv
+, fetchurl
+, flex
+, bison
+, fftw
+, withNgshared ? true
+, libXaw
+, libXext
+}:
 
-# Note that this does not provide the ngspice command-line utility. For that see
-# the ngspice derivation.
 stdenv.mkDerivation rec {
-  pname = "libngspice";
-  version = "37";
+  pname = "${lib.optionalString withNgshared "lib"}ngspice";
+  version = "40";
 
   src = fetchurl {
     url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz";
-    sha256 = "1gpcic6b6xk3g4956jcsqljf33kj5g43cahmydq6m8rn39sadvlv";
+    hash = "sha256-4wPKe8D1lOLWqoT2h4VCPmvwyNrQCbsgvk1XQliOiQ0=";
   };
 
-  nativeBuildInputs = [ flex bison ];
-  buildInputs = [ fftw ];
+  nativeBuildInputs = [
+    flex
+    bison
+  ];
 
-  configureFlags = [ "--with-ngshared" "--enable-xspice" "--enable-cider" ];
+  buildInputs = [
+    fftw
+  ] ++ lib.optionals (!withNgshared) [
+    libXaw
+    libXext
+  ];
+
+  configureFlags = lib.optionals withNgshared [
+    "--with-ngshared"
+  ] ++ [
+    "--enable-xspice"
+    "--enable-cider"
+  ];
+
+  enableParallelBuilding = true;
 
   meta = with lib; {
     description = "The Next Generation Spice (Electronic Circuit Simulator)";
     homepage = "http://ngspice.sourceforge.net";
     license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ]; # See https://sourceforge.net/p/ngspice/ngspice/ci/master/tree/COPYING
-    maintainers = with maintainers; [ bgamari ];
+    maintainers = with maintainers; [ bgamari rongcuid ];
     platforms = platforms.unix;
   };
 }