Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-01-16 01:17:52 +00:00 committed by GitHub
commit 93380042ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 1267 additions and 878 deletions

View File

@ -0,0 +1,22 @@
{ stdenv, lib, fetchgit, autoreconfHook, readline }:
stdenv.mkDerivation {
pname = "ngadmin";
version = "unstable-2017-11-17";
src = fetchgit {
url = "https://git.netgeek.ovh/c/ngadmin.git";
rev = "95240c567b5c40129d733cbd76911ba7574e4998";
sha256 = "052ss82fs8cxk3dqdwlh3r8q9gsm36in2lxdgwj9sljdgwg75c34";
};
nativeBuildInputs = [ autoreconfHook readline ];
enableParallelBuild = true;
meta = with lib; {
description = "Netgear switch (NSDP) administration tool";
homepage = "https://www.netgeek.ovh/wiki/projets:ngadmin";
license = licenses.gpl2Only;
maintainers = [ maintainers.astro ];
};
}

View File

@ -521,6 +521,10 @@ self: super: {
then self.buildHaskellPackages.tasty-discover
else dontCheck super.tasty-discover);
# Known issue with nondeterministic test suite failure
# https://github.com/nomeata/tasty-expected-failure/issues/21
tasty-expected-failure = dontCheck super.tasty-expected-failure;
# Waiting on https://github.com/RaphaelJ/friday/pull/36
friday = doJailbreak super.friday;
@ -681,34 +685,6 @@ self: super: {
# The standard libraries are compiled separately.
idris = generateOptparseApplicativeCompletion "idris" (dontCheck super.idris);
# build servant docs from the repository
servant =
let
ver = super.servant.version;
docs = pkgs.stdenv.mkDerivation {
name = "servant-sphinx-documentation-${ver}";
src = "${pkgs.fetchFromGitHub {
owner = "haskell-servant";
repo = "servant";
rev = "v${ver}";
sha256 = "0xk3czk3jhqjxhy0g8r2248m8yxgvmqhgn955k92z0h7p02lfs89";
}}/doc";
# Needed after sphinx 1.7.9 -> 1.8.3
postPatch = ''
substituteInPlace conf.py --replace "'.md': CommonMarkParser," ""
'';
nativeBuildInputs = with pkgs.buildPackages.python3Packages; [ sphinx recommonmark sphinx_rtd_theme ];
makeFlags = [ "html" ];
installPhase = ''
mv _build/html $out
'';
};
in overrideCabal super.servant (old: {
postInstall = old.postInstall or "" + ''
ln -s ${docs} ''${!outputDoc}/share/doc/servant
'';
});
# https://github.com/pontarius/pontarius-xmpp/issues/105
pontarius-xmpp = dontCheck super.pontarius-xmpp;
@ -954,6 +930,10 @@ self: super: {
# Work around overspecified constraint on github ==0.18.
github-backup = doJailbreak super.github-backup;
# https://github.com/andrewthad/chronos/issues/62
# doctests are failing on newer GHC versions
chronos = dontCheck super.chronos;
# Test suite depends on cabal-install
doctest = dontCheck super.doctest;
@ -963,8 +943,12 @@ self: super: {
# Generate cli completions for dhall.
dhall = generateOptparseApplicativeCompletion "dhall" super.dhall;
dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] super.dhall-json;
# For reasons that are not quire clear 'dhall-json' won't compile without 'tasty 1.4' due to its tests
# https://github.com/commercialhaskell/stackage/issues/5795
# This issue can be mitigated with 'dontCheck' which skips the tests and their compilation.
dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (dontCheck super.dhall-json);
dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" super.dhall-nix;
dhall-yaml = generateOptparseApplicativeCompletions ["dhall-to-yaml-ng" "yaml-to-dhall"] super.dhall-yaml;
# https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558
netrc = doJailbreak super.netrc;
@ -1434,8 +1418,9 @@ self: super: {
# 1. test requires internet
# 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
ghcide = doDistribute (unmarkBroken (dontCheck
(super.ghcide.override { lsp-test = dontCheck self.lsp-test_0_11_0_7; })
));
(super.ghcide_0_7_0_0.override {
lsp-test = dontCheck self.lsp-test_0_11_0_7;
})));
refinery = doDistribute super.refinery_0_3_0_0;
data-tree-print = doJailbreak super.data-tree-print;
@ -1458,6 +1443,9 @@ self: super: {
# https://github.com/adnelson/semver-range/issues/15
semver-range = dontCheck super.semver-range;
# https://github.com/obsidiansystems/dependent-sum/issues/55
dependent-sum = doJailbreak super.dependent-sum;
dependent-sum-aeson-orphans = appendPatch super.dependent-sum-aeson-orphans (pkgs.fetchpatch {
# 2020-11-18: https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/9
# Bump version bounds for ghc 8.10
@ -1473,7 +1461,7 @@ self: super: {
# base upper bound is incompatible with ghc 8.10
neuron = doJailbreak super.neuron;
reflex = appendPatches super.reflex [
reflex = dontCheck (doJailbreak (appendPatches super.reflex [
# https://github.com/reflex-frp/reflex/pull/444
# Fixes for ghc 8.10
(pkgs.fetchpatch {
@ -1486,7 +1474,7 @@ self: super: {
url = https://patch-diff.githubusercontent.com/raw/reflex-frp/reflex/pull/448.patch;
sha256 = "0a8gcq9g8dyyafkvs54mi3fnisff20r0x0qzmhxcp9md61nkf7gq";
})
];
]));
# 2020-11-19: jailbreaking because of pretty-simple bound out of date
# https://github.com/kowainik/stan/issues/408
@ -1534,7 +1522,7 @@ self: super: {
# 2020-12-05: http-client is fixed on too old version
essence-of-live-coding-warp = super.essence-of-live-coding-warp.override {
http-client = self.http-client_0_7_3;
http-client = self.http-client_0_7_4;
};
# 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27)
@ -1572,4 +1560,14 @@ self: super: {
# https://github.com/jaspervdj/profiteur/issues/33
profiteur = doJailbreak super.profiteur;
# Test suite has overly strict bounds on tasty.
# https://github.com/input-output-hk/nothunks/issues/9
nothunks = doJailbreak super.nothunks;
# Allow building with recent versions of tasty.
lukko = doJailbreak super.lukko;
# Allow building with older versions of http-client.
http-client-restricted = doJailbreak super.http-client-restricted;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View File

@ -547,6 +547,12 @@ self: super: builtins.intersectAttrs super {
# Break infinite recursion cycle between devtools and mprelude.
devtools = super.devtools.override { mprelude = dontCheck super.mprelude; };
# Break dependency cycle between tasty-hedgehog and tasty-expected-failure
tasty-hedgehog = dontCheck super.tasty-hedgehog;
# Break dependency cycle between hedgehog, tasty-hedgehog and lifted-async
lifted-async = dontCheck super.lifted-async;
# loc and loc-test depend on each other for testing. Break that infinite cycle:
loc-test = super.loc-test.override { loc = dontCheck self.loc; };
@ -798,7 +804,4 @@ self: super: builtins.intersectAttrs super {
# tests depend on a specific version of solc
hevm = dontCheck (doJailbreak super.hevm);
# waiting for https://github.com/haskell/ThreadScope/pull/115
threadscope = doJailbreak super.threadscope;
}

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,10 @@
{ lib, buildPythonPackage, fetchPypi, pytest, pytestcov, setuptools_scm }:
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, pytest-cov
, setuptools_scm
}:
buildPythonPackage rec {
pname = "cbor2";
@ -10,12 +16,16 @@ buildPythonPackage rec {
};
nativeBuildInputs = [ setuptools_scm ];
checkInputs = [ pytest pytestcov ];
checkPhase = "pytest";
checkInputs = [
pytest-cov
pytestCheckHook
];
pythonImportsCheck = [ "cbor2" ];
meta = with lib; {
description = "Pure Python CBOR (de)serializer with extensive tag support";
description = "Python CBOR (de)serializer with extensive tag support";
homepage = "https://github.com/agronholm/cbor2";
license = licenses.mit;
maintainers = with maintainers; [ taneb ];

View File

@ -2,10 +2,10 @@
buildPythonPackage rec {
pname = "flake8-blind-except";
version = "0.1.1";
version = "0.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "16g58mkr3fcn2vlfhp3rlahj93qswc7jd5qrqp748mc26dk3b8xc";
sha256 = "02a860a1a19cb602c006a3fe0778035b0d14d3f57929b4b798bc7d6684f204e5";
};
meta = {
homepage = "https://github.com/elijahandrews/flake8-blind-except";

View File

@ -14,13 +14,13 @@
buildGoModule rec {
pname = "buildah";
version = "1.19.1";
version = "1.19.2";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
sha256 = "1wzj8ll9z4pnzr5bz1rjq7fc98kw596zcwaamv8lh2pzwcfgi9ki";
sha256 = "1gak5m4n4bfji1hcv8y5lj1m8a39rars8igqxdr89d2i45dkpbx0";
};
outputs = [ "out" "man" ];

View File

@ -2542,6 +2542,8 @@ in
nextdns = callPackage ../applications/networking/nextdns { };
ngadmin = callPackage ../applications/networking/ngadmin { };
nfdump = callPackage ../tools/networking/nfdump { };
nfstrace = callPackage ../tools/networking/nfstrace { };