From f46bfb972d1313b1c201569e373fe225fb803ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 26 Jan 2021 15:57:21 +0100 Subject: [PATCH 1/6] emacs.pkgs.trivialBuild: add missing stdenv argument Fix fallout of #110687 (generic.nix requires stdenv). --- pkgs/build-support/emacs/generic.nix | 2 +- pkgs/build-support/emacs/trivial.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix index 588699517ba..d84fa24923d 100644 --- a/pkgs/build-support/emacs/generic.nix +++ b/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; diff --git a/pkgs/build-support/emacs/trivial.nix b/pkgs/build-support/emacs/trivial.nix index 9a36b44a270..f1aa078df27 100644 --- a/pkgs/build-support/emacs/trivial.nix +++ b/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 From 60dea25dae798db0922e42e15dccc08fc3203499 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 26 Jan 2021 23:09:35 +0000 Subject: [PATCH 2/6] crypto++: Fix static build and also do multiple outputs --- pkgs/development/libraries/crypto++/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index b2232907db7..0402af92b3b 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/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) '' From 6d489a3eb4556735fab0fa4ce84be86e2594ef83 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 25 Jan 2021 15:45:52 +0800 Subject: [PATCH 3/6] xkcdpass: py2 -> py3, add manpage and run tests --- .../python-modules/xkcdpass/default.nix | 19 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index 280ce5a790a..e372a843cf8 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/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 - # https://github.com/redacted/XKCD-password-generator/issues/32 - doCheck = false; + nativeBuildInputs = [ installShellFiles ]; + + 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 ]; }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fd88228462..7cfc754d311 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3805,7 +3805,7 @@ in wsl-open = callPackage ../tools/misc/wsl-open { }; - xkcdpass = with pythonPackages; toPythonApplication xkcdpass; + xkcdpass = with python3Packages; toPythonApplication xkcdpass; xob = callPackage ../tools/X11/xob { }; From 89850d10e08e49de9c72871fadf1457b4fe9e423 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Tue, 26 Jan 2021 17:11:27 -0800 Subject: [PATCH 4/6] ghcjs: fix eval This was causing release-cross to fail hydra eval, so it hasn't been building for the last few days. So note that although ghcjs still does not build, this fixes eval so the jobset can proceed. Verified with `hydra-eval-jobs pkgs/top-level/release-cross.nix -I nixpkgs=.` --- pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix | 14 +++++++------- pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix index 88630f996a9..e8c4a027520 100644 --- a/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix +++ b/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"; diff --git a/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix b/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix index 54a60b50372..4fff32759d3 100644 --- a/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix +++ b/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"; From 26c4dcf8fa55e8ace68906e41956494c524e3e22 Mon Sep 17 00:00:00 2001 From: Scriptkiddi Date: Tue, 26 Jan 2021 20:31:29 +0100 Subject: [PATCH 5/6] nixos/babeld: add type extraConfig --- nixos/modules/services/networking/babeld.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/babeld.nix b/nixos/modules/services/networking/babeld.nix index 90395dbd3c5..272c58ecd7f 100644 --- a/nixos/modules/services/networking/babeld.nix +++ b/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 babeld8 for details. From 9afe3525f39693397ef016b00b04d333ef270351 Mon Sep 17 00:00:00 2001 From: Badi Abdul-Wahid Date: Tue, 26 Jan 2021 19:45:49 -0600 Subject: [PATCH 6/6] rust-analyzer: 2021-01-18 -> 2021-01-25 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 8ff596d475c..63757d1aefd 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/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="; - cargoSha256 = "sha256-rRoo0TrXa03okJ8wktzVSAn8tRO1d9kcDprotZ1hZ6w="; + sha256 = "1r42cnx5kplql810zc5bcpl0zzm9l8gls64h32nvd7fgad4ixapz"; + cargoSha256 = "0ns26lddiaa1lanamcf8zawh287k4qg8n4brjpqi9s1bxbmd1kc2"; }; rust-analyzer = callPackage ./wrapper.nix {} {