diff options
10 files changed, 46 insertions, 15 deletions
diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix index 5f2b5e646b0b..05f6e7762a07 100644 --- a/pkgs/build-support/coq/default.nix +++ b/pkgs/build-support/coq/default.nix @@ -57,7 +57,8 @@ let ] "") + optionalString (v == null) "-broken"; append-version = p: n: p + display-pkg n "" coqPackages.${n}.version + "-"; prefix-name = foldl append-version "" namePrefix; - var-coqlib-install = (optionalString (versions.isGe "8.7" coq.coq-version) "COQMF_") + "COQLIB"; + var-coqlib-install = + (optionalString (versions.isGe "8.7" coq.coq-version || coq.coq-version == "dev") "COQMF_") + "COQLIB"; useDune2 = args.useDune2 or (useDune2ifVersion fetched.version); in diff --git a/pkgs/build-support/mkshell/default.nix b/pkgs/build-support/mkshell/default.nix index f85a11394cb5..27ee7e322624 100644 --- a/pkgs/build-support/mkshell/default.nix +++ b/pkgs/build-support/mkshell/default.nix @@ -16,7 +16,7 @@ let mergeInputs = name: (attrs.${name} or []) ++ - (lib.subtractLists inputsFrom (lib.catAttrs name inputsFrom)); + (lib.subtractLists inputsFrom (lib.flatten (lib.catAttrs name inputsFrom))); rest = builtins.removeAttrs attrs [ "packages" diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 4e1dbf8c465a..d2132533c84c 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.4.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "bd1fe84efd2e45042d95c7e5713e0a0365ec8138df062c07fab761233202ab6f"; + sha256 = "7d7218ffdd17d64184e1de69ef016f1f070bb0c888785510c4731948b078067d"; }; postPatch = '' diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 67ee4cb22d4c..077fc45526c7 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.0.1"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "cac55be7802e3424b8f022d8a572a8349327e7ce8494eee5e0f4df02458b1813"; + sha256 = "36d682161fdcbfa29681212c210fabecbf6849a505a0cbc54b7f70a10a5278a2"; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index 518840d415a9..cb87f352154c 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -31,7 +31,11 @@ buildPythonPackage rec { url = "https://github.com/jmschrei/pomegranate/commit/42d14bebc44ffd4a778b2a6430aa845591b7c3b7.patch"; sha256 = "0f9cx0fj9xkr3hch7jyrn76zjypilh5bqw734caaw6g2m49lvbff"; }) - ]; + ] ++ [ + # Likely an upstream test bug and not a real problem: + # https://github.com/jmschrei/pomegranate/issues/939 + ./disable-failed-on-nextworkx-2.6.patch + ] ; propagatedBuildInputs = [ numpy scipy cython networkx joblib pyyaml ]; diff --git a/pkgs/development/python-modules/pomegranate/disable-failed-on-nextworkx-2.6.patch b/pkgs/development/python-modules/pomegranate/disable-failed-on-nextworkx-2.6.patch new file mode 100644 index 000000000000..484ca4f9cbc8 --- /dev/null +++ b/pkgs/development/python-modules/pomegranate/disable-failed-on-nextworkx-2.6.patch @@ -0,0 +1,26 @@ +Test started failing after upgrading networkx 2.5.1 -> 2.6.2: + https://github.com/jmschrei/pomegranate/issues/939 + +Failures look benigh. +--- a/tests/test_bayesian_network.py ++++ b/tests/test_bayesian_network.py +@@ -1057,7 +1057,8 @@ def test_exact_structure_learning_exclude_edges(): + assert_not_equal(model.structure[-2], (d-1,)) + assert_equal(model.structure[-2], (1,)) + +-def test_exact_dp_structure_learning_exclude_edges(): ++# disabled for https://github.com/jmschrei/pomegranate/issues/939 ++def disabled_exact_dp_structure_learning_exclude_edges(): + for X in datasets: + X = X.copy() + X[:,1] = X[:,-1] +@@ -1139,7 +1140,8 @@ def test_constrained_parents_structure_learning_exclude_edges(): + assert_equal(model.structure[7], (2,)) + assert_equal(model.structure[4], (0,)) + +-def test_constrained_slap_structure_learning_exclude_edges(): ++# disabled for https://github.com/jmschrei/pomegranate/issues/939 ++def disabled_constrained_slap_structure_learning_exclude_edges(): + for X in datasets: + X = X.copy() + X[:,1] = X[:,-1] diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index cb35276ed962..27698478f122 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3482,12 +3482,12 @@ final: prev: pname = "neorg"; version = "2021-09-05"; src = fetchFromGitHub { - owner = "vhyrro"; + owner = "nvim-neorg"; repo = "neorg"; rev = "47a0a3d91ddde94488ccd03d38b5beeb296d3148"; sha256 = "0n8scyjy3wx2l3anl3dyipx7rlayrjb5dlri2r81dr1s77vkch83"; }; - meta.homepage = "https://github.com/vhyrro/neorg/"; + meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; neoscroll-nvim = buildVimPluginFrom2Nix { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index a2c2dd5b1267..e3398cdc0d8c 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -511,6 +511,7 @@ nvim-lua/lsp-status.nvim nvim-lua/lsp_extensions.nvim nvim-lua/plenary.nvim nvim-lua/popup.nvim +nvim-neorg/neorg@main nvim-telescope/telescope-dap.nvim nvim-telescope/telescope-frecency.nvim nvim-telescope/telescope-fzf-native.nvim@main @@ -789,7 +790,6 @@ urbit/hoon.vim Valloric/MatchTagAlways Valodim/deoplete-notmuch vhda/verilog_systemverilog.vim -vhyrro/neorg@main vigoux/LanguageTool.nvim vim-airline/vim-airline vim-airline/vim-airline-themes diff --git a/pkgs/tools/backup/mylvmbackup/default.nix b/pkgs/tools/backup/mylvmbackup/default.nix index ba25c56c28fe..6c87fca05672 100644 --- a/pkgs/tools/backup/mylvmbackup/default.nix +++ b/pkgs/tools/backup/mylvmbackup/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "0.16"; src = fetchurl { - url = "${meta.homepage}/${pname}-${version}.tar.gz"; + url = "https://www.lenzg.net/mylvmbackup/${pname}-${version}.tar.gz"; sha256 = "sha256-vb7M3EPIrxIz6jUwm241fzaEz2czqdCObrFgSOSgJRU="; }; diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 3a32f855c0c5..bfe430957484 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -2,22 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.6"; + version = "0.8"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "WFvxdRCbTBW1RGn2SvAo2iXn82OO/Z06cZQkIu4eiew="; + sha256 = "0103py4v4v7xqv85yiczhd9w9h1aa54svhhdibvbl6x4b35y2mk5"; }; - cargoSha256 = "2hRUfIxNVs4uSrEESas3wvvVsZHVocP8aiO7K0NZ+mY="; + cargoSha256 = "1k0d7yadicfzfc2m1aqs4c4a2k3srb54fpwarc3kwn26v3vfjai1"; meta = with lib; { description = "A syntax-aware diff"; homepage = "https://github.com/Wilfred/difftastic"; + changelog = "https://github.com/Wilfred/difftastic/raw/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ethancedwards8 ]; - platforms = platforms.unix; }; } |