diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-26 18:27:13 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-26 18:27:13 +0000 |
commit | a3b529a4606779b8351cde31f9877496cc188f18 (patch) | |
tree | b56d7185dcc95dc9701ffc93a5592fb931003836 /pkgs/development | |
parent | 4709dce995be9f018065921b4cd47cfe76c18df1 (diff) | |
parent | c994c9d31e2ba478aa50a9d4b0d9cba6e25b27f5 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/zz/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/gensio/default.nix | 13 | ||||
-rw-r--r-- | pkgs/development/libraries/rocksdb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/shodan/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/python-modules/teslajsonpy/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/python-modules/transformers/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/analysis/rr/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/stagit/default.nix | 6 |
8 files changed, 26 insertions, 28 deletions
diff --git a/pkgs/development/compilers/zz/default.nix b/pkgs/development/compilers/zz/default.nix index 273873c880178..3f77c49f5561c 100644 --- a/pkgs/development/compilers/zz/default.nix +++ b/pkgs/development/compilers/zz/default.nix @@ -2,18 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "zz"; - version = "0.1"; + version = "unstable-2021-01-26"; + # commit chosen by using the latest build from http://bin.zetz.it/ src = fetchFromGitHub { owner = "aep"; repo = "zz"; - rev = version; - sha256 = "0kqrfm2r9wn0p2c3lcprsy03p9qhrwjs990va8qi59jp704l84ad"; + rev = "0b5c52674e9adf795fbfb051d4dceef3126e669f"; + sha256 = "0bb77ll1g5i6a04ybpgx6lqsb74xs4v4nyqm9j4j6x24407h8l89"; }; nativeBuildInputs = [ makeWrapper ]; - cargoSha256 = "0yllcqxyyhwr9h0z8q84l0ms8x6jrqhpg79ik4xng6h5yf4ab0pq"; + cargoSha256 = "1lf4k3n89w2797c1yrj1dp97y8a8d5hnixr1nwa2qcq1sxmm5rcg"; postInstall = '' wrapProgram $out/bin/zz --prefix PATH ":" "${lib.getBin z3}/bin" diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index a568078f9911e..3e4b68ec79c2e 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -1,6 +1,5 @@ { autoreconfHook , fetchFromGitHub -, fetchpatch , lib , nix-update-script , pkg-config @@ -9,23 +8,15 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.2.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "083khzvyvcgi9j99hbaswglivm9s6dly6spjvisvyacavaybgwgb"; + sha256 = "sha256-jWKm64RvVkeA/Zvy8VIAXMykuqv2FEzsduN2zcPm4ME="; }; - patches = [ - # Fix compilation without openipmi, can be dropped for the next release. - (fetchpatch { - url = "https://github.com/cminyard/gensio/commit/12f6203e6f7aa42172177d7b0870777b605af8d9.patch"; - sha256 = "19dr4iacccc4il3asdxkag6cj2yc4bxd8p451syfxdm6289rwxic"; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = pname; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index d6f685ff4deec..dea8fcc67597f 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.14.6"; + version = "6.15.4"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "0cp0jgzwkwamykgnmsg0zvzakq58f1ihs7lslnn4nh4p9gm75rq5"; + sha256 = "06lddr6md4ypmywvi6qrrkw97c8ddz0flj43hzx32ia3iq2mw4w5"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index f361659d9acb6..9637602cce1ff 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.24.0"; + version = "1.25.0"; src = fetchPypi { inherit pname version; - sha256 = "0b5ec40c954cd48c4e3234e81ad92afdc68438f82ad392fed35b7097eb77b6dd"; + sha256 = "sha256-fivdvBtgv2IAQtABD0t2KoC0MRHb6pwEHXLUMl4mDCM="; }; propagatedBuildInputs = [ @@ -27,6 +27,7 @@ buildPythonPackage rec { # The tests require a shodan api key, so skip them. doCheck = false; + pythonImportsCheck = [ "shodan" ]; meta = with lib; { description = "Python library and command-line utility for Shodan"; diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index c4520b1c19827..08ef9975b2286 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "0.10.4"; + version = "0.11.0"; src = fetchFromGitHub { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "18frynmy47i9c24mdy819y2dnjwmhnmkly5mbmhikpbmm6d0yjf1"; + sha256 = "sha256-yfaUa12doOvdFkbHHdOYcFcu86hYZtt2i0tya2ENjf4="; }; propagatedBuildInputs = [ @@ -27,7 +27,12 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; # Not all Home Assistant related check pass - disabledTests = [ "test_values_on_init" ]; + # https://github.com/zabuldon/teslajsonpy/issues/121 + # https://github.com/zabuldon/teslajsonpy/pull/124 + disabledTests = [ + "test_values_on_init" + "test_get_value_on_init" + ]; pythonImportsCheck = [ "teslajsonpy" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index efc33ad8a23f7..65c2af4449303 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { doCheck = false; postPatch = '' - sed -ri 's/tokenizers==[0-9.]+/tokenizers/g' setup.py + sed -ri 's/tokenizers==[^"]+/tokenizers/g' setup.py src/transformers/dependency_versions_table.py ''; pythonImportsCheck = [ "transformers" ]; diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index b63713f000737..c0121d2421775 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }: +{ lib, gcc9Stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }: -stdenv.mkDerivation rec { +gcc9Stdenv.mkDerivation rec { version = "5.4.0"; pname = "rr"; diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix index 1cabcfe044f32..f74698bb11eaa 100644 --- a/pkgs/development/tools/stagit/default.nix +++ b/pkgs/development/tools/stagit/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "stagit"; - version = "0.9.1"; + version = "0.9.4"; src = fetchgit { url = "git://git.codemadness.org/stagit"; rev = version; - sha256 = "0gh28spkry9wbmdj0hmvz3680fvbyzab9cifhj1p76f4fz27rnv9"; + sha256 = "1n0f2pf4gmqnkx4kfn2c79zx2vk4xkg03h7wvdigijkkbhs7a3pm"; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "git static site generator"; - homepage = "https://git.codemadness.org/stagit/"; + homepage = "https://git.codemadness.org/stagit/file/README.html"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ jb55 ]; |