diff options
Diffstat (limited to 'pkgs')
21 files changed, 199 insertions, 42 deletions
diff --git a/pkgs/applications/editors/emacs-modes/updater-emacs.nix b/pkgs/applications/editors/emacs-modes/updater-emacs.nix index bd965c8f1285..4c321065445c 100644 --- a/pkgs/applications/editors/emacs-modes/updater-emacs.nix +++ b/pkgs/applications/editors/emacs-modes/updater-emacs.nix @@ -1,7 +1,7 @@ let pkgs = import ../../../.. {}; - emacsEnv = pkgs.emacs.withPackages (epkgs: let + emacsEnv = pkgs.emacs.pkgs.withPackages (epkgs: let promise = epkgs.trivialBuild { pname = "promise"; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 35130ab3393f..36883faab147 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -31,12 +31,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.14.1"; + version = "2.0.1"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "15l7jphy1qjsh6y6kd5mgkxsl6ymm9564g1yypa946jbyrgi8k2m"; + sha256 = "0hmj19bp5dihzpphxz77377yfmygj498am0h23kxg5m3y5hqv65a"; }; # Needs tox @@ -55,13 +55,16 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3Packages; ([ pyyaml backendPackage jinja2 pygments - pypeg2 cssutils pyopengl attrs setuptools # scripts and userscripts libs tldextract beautifulsoup4 pyreadability pykeepass stem - ]; + # extensive ad blocking + adblock + ] + ++ lib.optional (pythonOlder "3.9") importlib-resources + ); patches = [ ./fix-restart.patch ]; diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/data/documentation/scheme-manpages/default.nix index 2915430d9f24..e9fa1b7e4f4f 100644 --- a/pkgs/data/documentation/scheme-manpages/default.nix +++ b/pkgs/data/documentation/scheme-manpages/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "scheme-manpages-unstable"; - version = "2020-08-14"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "schemedoc"; repo = "manpages"; - rev = "2e99a0aea9c0327e3c2dcfb9b7a2f8f528b4fe43"; - sha256 = "0ykj4i8mx50mgyz9q63glfnc0mw1lf89hwsflpnbizjda5b4s0fp"; + rev = "817798ccca81424e797fda0e218d53a95f50ded7"; + sha256 = "1amc0dmliz2a37pivlkx88jbc08ypfiwv3z477znx8khhc538glk"; }; dontBuild = true; diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/development/libraries/ayatana-ido/default.nix index 60417426f76c..03b89411168a 100644 --- a/pkgs/development/libraries/ayatana-ido/default.nix +++ b/pkgs/development/libraries/ayatana-ido/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ayatana-ido"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = pname; rev = version; - sha256 = "1mcw6gmacrzx4cyg4223dpwcmj3qf8l30mxsg43292lajzwsm2hz"; + sha256 = "sha256-nJ4F2faK0XZPj9GzUk3Ueap5h6rALFXISHqFQ30RuoU="; }; nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc vala gobject-introspection ]; diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix new file mode 100644 index 000000000000..dd74a21bf9b8 --- /dev/null +++ b/pkgs/development/python-modules/aiocoap/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "aiocoap"; + version = "0.4b3"; + + src = fetchFromGitHub { + owner = "chrysn"; + repo = pname; + rev = version; + sha256 = "1zjg475xgvi19rqg7jmfgy5nfabq50aph0231p9jba211ps7cmxw"; + }; + + checkPhase = '' + ${python.interpreter} -m aiocoap.cli.defaults + ${python.interpreter} -m unittest discover -v + ''; + + pythonImportsCheck = [ "aiocoap" ]; + + meta = with lib; { + description = "Python CoAP library"; + homepage = "https://aiocoap.readthedocs.io/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 81c8e9578148..41d0ed5f81de 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.16.61"; # N.B: if you change this, change botocore too + version = "1.16.62"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "sha256-OPUD8FAqukJR3/TRkFfDGnud0PVDM99VIfiTHuTGXiY="; + sha256 = "sha256-u5H+z5guG7+2i7a9LJoMzjyErG+X3TONHvnkd4BnkJE="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 8727b672a72f..1b0f2a347d0b 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.19.61"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.19.62"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-MkXJ6ZYUO8/epz0QUUXKcz/NfVr+dEqHYGEvxEnD+BA="; + sha256 = "sha256-KbS5vltA85KgM5JsCMAEwBvWRxOE728S6qSe44cKAQw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix new file mode 100644 index 000000000000..f4be0e5140b5 --- /dev/null +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, async-timeout +, crcmod +, defusedxml +, pyserial +, pytz +, python-dateutil +, semver +, jsonpickle +, mypy +, pytest-aiohttp +, pytest-asyncio +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "plugwise"; + version = "0.8.5"; + + src = fetchFromGitHub { + owner = pname; + repo = "python-plugwise"; + rev = version; + sha256 = "1gviyy31l1j8z0if2id3m13r43kw4mcgd8921813yfhmf174piq4"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + crcmod + defusedxml + pyserial + pytz + python-dateutil + semver + ]; + + checkInputs = [ + jsonpickle + mypy + pytest-aiohttp + pytest-asyncio + pytest-cov + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "plugwise" ]; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "Python module for Plugwise Smiles, Stretch and USB stick"; + longDescription = '' + XKNX is an asynchronous Python library for reading and writing KNX/IP + packets. It provides support for KNX/IP routing and tunneling devices. + ''; + homepage = "https://github.com/plugwise/python-plugwise"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix new file mode 100644 index 000000000000..3380ef99f180 --- /dev/null +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-aiohttp +, pytest-asyncio +, pytest-cov +, pytest-mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "regenmaschine"; + version = "3.1.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "0m6i7vspp8ssdk2k32kznql1j8gkp300kzb7pk67hzvpijdy3mca"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ + aresponses + asynctest + pytest-aiohttp + pytest-asyncio + pytest-cov + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "regenmaschine" ]; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "Python library for interacting with RainMachine smart sprinkler controllers"; + homepage = "https://github.com/bachya/regenmaschine"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index adfc6a2580a3..d9eef5e3c4ec 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix, nixfmt -, writeScript, nixosTests, jq, cacert, curl }: +{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix +, nixfmt, writeScript, nixosTests, jq, cacert, curl }: stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.263.2"; + version = "2.263.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "13l7y1307iv54z2zsjy0slzv2hpqv9i35qb15xa8s6sl7lcm9l49"; + sha256 = "0lyzmv378yjz4p4dlpm1nwdq4p781nycvspdik82xbxg4s6gamd3"; }; buildCommand = '' diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index 7b9aa5cf6101..c468ad0f4e18 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.7.1"; + version = "0.7.2"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "1a348ys4lbgsr23px81kw985i5bp8z75wgzl9l2jv9sdzirpb8k4"; + sha256 = "1rgwj3kf31n4rz0b7jw67wsgyapdycfic7plm5gm4n9rlslp5ax5"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "1f78wlid8jx26pqybmafzcl1656nnp87hdiib0v1p5k73mk4ymvy"; + sha256 = "0jnawnkf4m7cqcq9iahnxa53l61a5riax400n96vxrqf3fa752c6"; }; installPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1nj54igm57h9d8hhqdgkay2nnblcdxhpnha68jqvjazd8a0bq3la"; + cargoSha256 = "0svmhq64aqw1vidq8jmw7w4xhhnyp04vcs9yzhjyz25c4cn9grsf"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index dbbbe4da5572..7d0d6c6f68e3 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "mednaffe"; - version = "0.8.8"; + version = "0.9.0"; src = fetchFromGitHub { owner = "AmatCoder"; repo = "mednaffe"; rev = version; - sha256 = "15qk3a3l1phr8bap2ayh3c0vyvw2jwhny1iz1ajq2adyjpm9fhr7"; + sha256 = "sha256-BS/GNnRYj9klc4RRj7LwNikgApNttv4IyWPL694j+gM="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 5210e3ed7a8c..1ed116cdfde4 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.11-rc3"; + version = "5.11-rc5"; extraMeta.branch = "5.11"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "15dfgvicp7s9xqaa3w8lmfffzyjsqrq1fa2gs1a8awzs5rxgsn61"; + sha256 = "029nps41nrym5qz9lq832cys4rai04ig5xp9ddvrpazzh0lfnr4q"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index b001ce966a92..ad9deeb7a8c7 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -4,7 +4,7 @@ } : let - version = "33.0"; + version = "33.1"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "04q4z95nxxxjc674qnbwn19bv18nl3x7xwp6aql17h1cw3gdmhw4"; + sha256 = "1p97r8ngfx1d9aq8p3f027323m7kgmk30kfrikf3jlkpr30rksbv"; }; nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ]; @@ -46,7 +46,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "RDMA Core Userspace Libraries and Daemons"; homepage = "https://github.com/linux-rdma/rdma-core"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ markuskowa ]; }; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 051f7032bd5e..fc01fee85b83 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -621,7 +621,7 @@ "plaato" = ps: with ps; [ aiohttp-cors ]; "plant" = ps: with ps; [ sqlalchemy ]; "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ]; - "plugwise" = ps: with ps; [ ]; # missing inputs: plugwise + "plugwise" = ps: with ps; [ plugwise ]; "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad "pocketcasts" = ps: with ps; [ ]; # missing inputs: pycketcasts "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint @@ -659,7 +659,7 @@ "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird "raincloud" = ps: with ps; [ ]; # missing inputs: raincloudy "rainforest_eagle" = ps: with ps; [ ]; # missing inputs: eagle200_reader uEagle - "rainmachine" = ps: with ps; [ ]; # missing inputs: regenmaschine + "rainmachine" = ps: with ps; [ regenmaschine ]; "random" = ps: with ps; [ ]; "raspihats" = ps: with ps; [ smbus-cffi ]; # missing inputs: raspihats "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 590aa6f2b6b9..f3f7a4a69114 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.1.0"; + version = "3.1.1"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "008280ijd6m9h35y9lcpql0fk0h9f3zkc1pfkdm0rkbnd12y41ns"; + sha256 = "0z9a39243fv37mansbbjq5mmxpnhr7xzn8pv92fr7dkdb3psz5hf"; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 5b437e06afc2..322830aaa2c6 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.221"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.222"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-G8HonN02eFcfMRhj9+cporugVsF7nDeHEopuHnbS1Is="; + sha256 = "sha256-nVBQ2Lj5+zyvj3g0W3Rxh+CZwG7sbqKehvg6vAhHexs="; }; postPatch = '' diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix index c669a3a3be2d..6de95b34e627 100644 --- a/pkgs/tools/networking/acme-client/default.nix +++ b/pkgs/tools/networking/acme-client/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation rec { pname = "acme-client"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { url = "https://data.wolfsden.cz/sources/acme-client-${version}.tar.xz"; - sha256 = "0gmdvmyw8a61w08hrxllypf7rpnqg0fxipbk3zmvsxj7m5i6iysj"; + sha256 = "sha256-AYI7WfRTb5R0/hDX5Iqkq5nrLZ4gQecAGObSajSA+vw="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index b59222200c12..6754d0806b6b 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bpytop"; - version = "1.0.59"; + version = "1.0.61"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RlrUUIbZRNTvxU8LVW0/ZcARlKDVvSMlkN0+6BgAink="; + sha256 = "sha256-E6blMhDkZa3Wbdbsw7f8jdHwHFINOQ48XC5pQdkVPtQ="; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index 1ef871c9d30f..7f24be893bf1 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.2.02-2"; + version = "3.3.00-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "sha256-WHfW0empveOxC3jvYq46jlvVZDb8JLne5JHPtFE6nTs="; + sha256 = "sha256-P1AYo4Ao9lDxJXyZd64wBxNgQIvEcT00ThjtcB2v52I="; }; buildInputs = [ perl makeWrapper ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1dbe9c81cbfb..e2bf63d4764d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -204,6 +204,8 @@ in { aioamqp = callPackage ../development/python-modules/aioamqp { }; + aiocoap = callPackage ../development/python-modules/aiocoap { }; + aioconsole = callPackage ../development/python-modules/aioconsole { }; aiocontextvars = callPackage ../development/python-modules/aiocontextvars { }; @@ -4911,6 +4913,8 @@ in { pluginbase = callPackage ../development/python-modules/pluginbase { }; + plugwise = callPackage ../development/python-modules/plugwise { }; + plumbum = callPackage ../development/python-modules/plumbum { }; ply = callPackage ../development/python-modules/ply { }; @@ -6652,6 +6656,8 @@ in { reflink = callPackage ../development/python-modules/reflink { }; + regenmaschine = callPackage ../development/python-modules/regenmaschine { }; + regex = callPackage ../development/python-modules/regex { }; regional = callPackage ../development/python-modules/regional { }; |