Merge staging-next into staging

nixos/modules/services/networking/babeld.nix

@@ -69,6 +69,7 @@ in
 
       extraConfig = mkOption {
         default = "";
+        type = types.lines;
         description = ''
           Options that will be copied to babeld.conf.
           See <citerefentry><refentrytitle>babeld</refentrytitle><manvolnum>8</manvolnum></citerefentry> for details.

pkgs/build-support/emacs/generic.nix

@@ -1,6 +1,6 @@
 # generic builder for Emacs packages
 
-{ lib, stdenv, emacs, texinfo }:
+{ lib, stdenv, emacs, texinfo, ... }:
 
 with lib;
 

pkgs/build-support/emacs/trivial.nix

@@ -1,12 +1,12 @@
 # trivial builder for Emacs packages
 
-{ lib, texinfo, ... }@envargs:
+{ callPackage, lib, ... }@envargs:
 
 with lib;
 
 args:
 
-import ./generic.nix envargs ({
+callPackage ./generic.nix envargs ({
   buildPhase = ''
     runHook preBuild
 

pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix

@@ -10,7 +10,7 @@
     , ghcjs-th, haddock-api-ghcjs, hashable, haskell-src-exts
     , haskell-src-meta, http-types, HUnit, lens, lifted-base, mtl
     , network, optparse-applicative, parallel, parsec, process, random
-    , regex-posix, safe, shelly, split, stdenv, stringsearch, syb
+    , regex-posix, safe, shelly, split, lib, stringsearch, syb
     , system-fileio, system-filepath, tar, template-haskell
     , template-haskell-ghcjs, terminfo, test-framework
     , test-framework-hunit, text, time, transformers
@@ -61,7 +61,7 @@
   ghc-api-ghcjs = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
     , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap
-    , ghci-ghcjs, happy, hpc, process, stdenv, template-haskell-ghcjs
+    , ghci-ghcjs, happy, hpc, process, lib, template-haskell-ghcjs
     , terminfo, time, transformers, unix
     }:
     mkDerivation {
@@ -81,7 +81,7 @@
 
   ghci-ghcjs = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-    , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap, stdenv
+    , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap, lib
     , template-haskell-ghcjs, transformers, unix
     }:
     mkDerivation {
@@ -98,7 +98,7 @@
 
   ghcjs-th = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, ghc-prim
-    , ghci-ghcjs, stdenv, template-haskell-ghcjs
+    , ghci-ghcjs, lib, template-haskell-ghcjs
     }:
     mkDerivation {
       pname = "ghcjs-th";
@@ -115,7 +115,7 @@
   haddock-api-ghcjs = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers, deepseq
     , directory, filepath, ghc-api-ghcjs, ghc-boot, ghc-paths
-    , haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, stdenv
+    , haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, lib
     , transformers, xhtml
     }:
     mkDerivation {
@@ -142,7 +142,7 @@
   haddock-library-ghcjs = callPackage
     ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
     , directory, filepath, haddock-library, hspec, hspec-discover
-    , optparse-applicative, parsec, QuickCheck, stdenv, text
+    , optparse-applicative, parsec, QuickCheck, lib, text
     , transformers, tree-diff
     }:
     mkDerivation {
@@ -164,7 +164,7 @@
     }) {};
 
   template-haskell-ghcjs = callPackage
-    ({ mkDerivation, base, ghc-boot-th, pretty, stdenv }:
+    ({ mkDerivation, base, ghc-boot-th, pretty, lib }:
     mkDerivation {
       pname = "template-haskell-ghcjs";
       version = "2.14.0.0";

pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix

@@ -4,6 +4,7 @@
 , quickcheck-unicode, random, scientific, test-framework
 , test-framework-hunit, test-framework-quickcheck2, text, time
 , transformers, unordered-containers, vector
+, lib
 }:
 mkDerivation {
   pname = "ghcjs-base";

pkgs/development/libraries/crypto++/default.nix

@@ -1,4 +1,7 @@
-{ lib, stdenv, fetchFromGitHub, }:
+{ lib, stdenv, fetchFromGitHub, nasm, which
+, enableStatic ? stdenv.hostPlatform.isStatic
+, enableShared ? !enableStatic
+}:
 
 stdenv.mkDerivation rec {
   pname = "crypto++";
@@ -12,6 +15,8 @@ stdenv.mkDerivation rec {
     sha256 = "1gwn8yh1mh41hkh6sgnhb9c3ygrdazd7645msl20i0zdvcp7f5w3";
   };
 
+  outputs = [ "out" "dev" ];
+
   postPatch = ''
     substituteInPlace GNUmakefile \
         --replace "AR = libtool" "AR = ar" \
@@ -19,12 +24,17 @@ stdenv.mkDerivation rec {
   '';
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
-  buildFlags = [ "shared" "libcryptopp.pc" ];
+  buildFlags =
+       lib.optional enableStatic "static"
+    ++ lib.optional enableShared "shared"
+    ++ [ "libcryptopp.pc" ];
   enableParallelBuilding = true;
 
   doCheck = true;
 
-  preInstall = "rm libcryptopp.a"; # built for checks but we don't install static lib into the nix store
+  # built for checks but we don't install static lib into the nix store
+  preInstall = lib.optionalString (!enableStatic) "rm libcryptopp.a";
+
   installTargets = [ "install-lib" ];
   installFlags = [ "LDCONF=true" ];
   postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''

pkgs/development/python-modules/xkcdpass/default.nix

@@ -1,6 +1,8 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, pytestCheckHook
+, installShellFiles
 }:
 
 buildPythonPackage rec {
@@ -12,14 +14,21 @@ buildPythonPackage rec {
     sha256 = "0ghsjs5bxl996pap910q9s21nywb26mfpjd92rbfywbnj8f2k2cy";
   };
 
-  # No tests included
+  nativeBuildInputs = [ installShellFiles ];
-  # https://github.com/redacted/XKCD-password-generator/issues/32
+
-  doCheck = false;
+  checkInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "xkcdpass" ];
+
+  postInstall = ''
+    installManPage *.?
+    install -Dm444 -t $out/share/doc/${pname} README*
+  '';
 
   meta = with lib; {
-    homepage = "https://pypi.python.org/pypi/xkcdpass/";
     description = "Generate secure multiword passwords/passphrases, inspired by XKCD";
+    homepage = "https://pypi.python.org/pypi/xkcdpass/";
     license = licenses.bsd3;
+    maintainers = with maintainers; [ peterhoeg ];
   };
-
 }

pkgs/development/tools/rust/rust-analyzer/default.nix

@@ -2,10 +2,10 @@
 
 {
   rust-analyzer-unwrapped = callPackage ./generic.nix rec {
-    rev = "2021-01-18";
+    rev = "2021-01-25";
     version = "unstable-${rev}";
-    sha256 = "sha256-eFiZdFBJZuBfwH8tqZTayNaWiq8fWUzlzBRRvdPbmW8=";
+    sha256 = "1r42cnx5kplql810zc5bcpl0zzm9l8gls64h32nvd7fgad4ixapz";
-    cargoSha256 = "sha256-rRoo0TrXa03okJ8wktzVSAn8tRO1d9kcDprotZ1hZ6w=";
+    cargoSha256 = "0ns26lddiaa1lanamcf8zawh287k4qg8n4brjpqi9s1bxbmd1kc2";
   };
 
   rust-analyzer = callPackage ./wrapper.nix {} {

pkgs/top-level/all-packages.nix

@@ -3806,7 +3806,7 @@ in
 
   wsl-open = callPackage ../tools/misc/wsl-open { };
 
-  xkcdpass = with pythonPackages; toPythonApplication xkcdpass;
+  xkcdpass = with python3Packages; toPythonApplication xkcdpass;
 
   xob = callPackage ../tools/X11/xob { };