diff options
Diffstat (limited to 'pkgs')
24 files changed, 86 insertions, 56 deletions
diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index 17dfd08f90b21..bce224f21b2fc 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -34,7 +34,6 @@ mkDerivation rec { install -dpm755 $out/share/doc/${pname}-${version} $out/share/licenses/${pname}-${version} $out/share/icons $out/share/pixmaps $out/share/applications install -Dpm644 CHANGES README help.html $out/share/doc/${pname}-${version}/ install -Dpm644 gpl-2.0.txt $out/share/licenses/${pname}-${version}/ - install -Dpm644 images/icon.png $out/share/icons/diffpdf.png install -Dpm644 images/icon.png $out/share/pixmaps/diffpdf.png cat > $out/share/applications/diffpdf.desktop <<EOF diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index fb7d2e2d6a5a8..e018422050459 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "0.8.7"; + version = "0.9.0"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "1sjk0cghldygx1jgx4bqv83qky7shk64n6xkkfxl92f12wyvsq9j"; + sha256 = "1nkaspz96yglq1fr8a3xr39qmbs98pk7qpqav3cfd82qwbq7vs06"; }; vendorSha256 = null; @@ -36,13 +36,14 @@ buildGoModule rec { "plugins/meta/portmap" "plugins/meta/sbr" "plugins/meta/tuning" + "plugins/meta/vrf" ]; passthru.tests = { inherit (nixosTests) cri-o podman; }; meta = with lib; { description = "Some standard networking plugins, maintained by the CNI team"; - homepage = "https://github.com/containernetworking/plugins"; + homepage = "https://www.cni.dev/plugins/"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ] ++ teams.podman.members; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 3477c0de12671..d18ec94ba8c56 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -136,15 +136,6 @@ let "recurseForDerivations" ]; in rec { - terraform_0_11 = pluggable (generic { - version = "0.11.14"; - sha256 = "1bzz5wy13gh8j47mxxp6ij6yh20xmxd9n5lidaln3mf1bil19dmc"; - patches = [ ./provider-path.patch ]; - passthru = { inherit plugins; }; - }); - - terraform_0_11-full = terraform_0_11.full; - terraform_0_12 = pluggable (generic { version = "0.12.29"; sha256 = "18i7vkvnvfybwzhww8d84cyh93xfbwswcnwfrgvcny1qwm8rsaj8"; @@ -181,7 +172,7 @@ in rec { mainTf = writeText "main.tf" '' resource "random_id" "test" {} ''; - terraform = terraform_0_11.withPlugins (p: [ p.random ]); + terraform = terraform_0_12.withPlugins (p: [ p.random ]); test = runCommand "terraform-plugin-test" { buildInputs = [ terraform ]; } '' set -e diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index 608064353ca77..a1e9d1e305158 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "petsc"; - version = "3.14.1"; + version = "3.14.2"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "1y3fhg0l69qp9qn6vjyqdhqhhbvsa7jp8g7zcm0pwzm7gkcldqnx"; + sha256 = "04vy3qyakikslc58qyv8c9qrwlivix3w6znc993i37cvfg99dch9"; }; nativeBuildInputs = [ blas gfortran gfortran.cc.lib lapack python ]; diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index bb111bfbbd695..ca902abea0862 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "0.10.0"; + version = "0.12.0"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "13r8alja25yd5gk5124y1v6frwphmz6wl5z5gz1fafb5nv2zgqw9"; + sha256 = "0rik4167b5d8x035vmbw52qm6ghyb38z4ri7wfb43dnab6df0r9b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index a28acadbd74f8..f447fa7e07281 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.21.4"; + version = "1.21.5"; src = fetchPypi { inherit pname version; - sha256 = "fb3580272cc66ba0fd59914b7ac395d2da6b9b32b11dc7557aa80a0ae7cccf3c"; + sha256 = "73149f6a71aa1310f3d000110a915164a72f1d2dc7cd4d37d18a952b0e0c78ac"; }; checkInputs = [ watchdog pytest hypothesis mock ]; diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix index 216e636385013..bbca0df8d8e90 100644 --- a/pkgs/development/python-modules/dbus-next/default.nix +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "dbus-next"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "altdesktop"; repo = "python-dbus-next"; rev = "v${version}"; - sha256 = "0c14mmysx014n1m4pi4ymi6pzxf8dkjr6fm2cmp96x05z9v90vlr"; + sha256 = "0x78ghkci4las13gwbrm8fzg671lx1q2cn8h0f64ki8yag1myia1"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index 9a13ebac647b8..f2b7222c3d064 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { "--benchmark-disable" "--deselect=tests/test_inputs.py::URLTest::test_check" "--deselect=tests/test_inputs.py::EmailTest::test_valid_value_check" + "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index a94391890b442..b46d1566532b2 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2020.10.10"; + version = "2020.12.05"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "546fdfad14c645ebb56e20a83ce34259b91a6db5c50cf14df741771b28ac2e19"; + sha256 = "c4310ea12d1ac39984a96c40a12fab92aefc3d77a615f89ef542b10497ae56fa"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/mac_alias/default.nix b/pkgs/development/python-modules/mac_alias/default.nix index cb9a103379084..ac750b13e390c 100644 --- a/pkgs/development/python-modules/mac_alias/default.nix +++ b/pkgs/development/python-modules/mac_alias/default.nix @@ -2,12 +2,12 @@ }: buildPythonPackage rec { - version = "2.1.1"; + version = "2.2.0"; pname = "mac_alias"; src = fetchPypi { inherit pname version; - sha256 = "55468c84a87c8b3929a3dc98f753194f7fe93fd8621abbfea1a4019448058a14"; + sha256 = "0eb84a63f98bf54c2f9fbdc4de956a63e64eb8a4a124143a1c1f5a78326442f0"; }; # pypi package does not include tests; diff --git a/pkgs/development/python-modules/prettytable/1.nix b/pkgs/development/python-modules/prettytable/1.nix new file mode 100644 index 0000000000000..ccaa02e2f494d --- /dev/null +++ b/pkgs/development/python-modules/prettytable/1.nix @@ -0,0 +1,37 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, glibcLocales +, setuptools_scm +, wcwidth +}: + +buildPythonPackage rec { + pname = "prettytable"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wcpp1nkicrswb353yn6xd2x535cpif62nw5rgz33c1wj0wzbdvb"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + buildInputs = [ glibcLocales ]; + + propagatedBuildInputs = [ wcwidth ]; + + preCheck = '' + export LANG="en_US.UTF-8" + ''; + + # no test no longer available in pypi package + doCheck = false; + pythonImportsCheck = [ "prettytable" ]; + + meta = with stdenv.lib; { + description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format"; + homepage = "http://code.google.com/p/prettytable/"; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix index 665aca5f8e2d1..150198a65aa20 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "py-air-control-exporter"; - version = "0.1.5"; + version = "0.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "46eff1c801a299cf2ad37e6bd0c579449779cb6a47f1007264bfcabf12739f8b"; + sha256 = "2c1bce2423b7452388e35756bef098c123b3cd4a38e8b1302f7297a08e0a9eaa"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index 399d889db2b85..9e21854a7c42d 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.5.9.1"; + version = "0.5.9.2"; src = fetchPypi { inherit pname version; - sha256 = "eda8af04ba4da4fd63fdc35a62e0e41dfc06aa1a511728dfbdd7707e3b382855"; + sha256 = "73e740eaa45c097a09e543450f88d5ed06c0ece4b6936dad7e71077f67797b74"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix index 8a5c3ae348a36..1382dc7efffaf 100644 --- a/pkgs/development/python-modules/pysmb/default.nix +++ b/pkgs/development/python-modules/pysmb/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pysmb"; - version = "1.2.5"; + version = "1.2.6"; src = fetchPypi { inherit pname version; format = "setuptools"; extension = "zip"; - sha256 = "7aedd5e003992c6c78b41a0da4bf165359a46ea25ab2a9a1594d13f471ad7287"; + sha256 = "f16e5e796b9dcc1d17ee76f87d53dd471f205fa19b4045eeda5bc7558a57d579"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index c6a7493695dac..940618545e878 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.8.17"; + version = "3.8.18"; src = fetchPypi { inherit pname version; - sha256 = "10834032ff314ea9c8a6a9f4f1f846422fe8825657dfd2d9db3ae2fa5a838fdb"; + sha256 = "89f9ec5f1abe7e829f7f1cb9a7aa3f3eb768482272beb2c8987e933d9c068110"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/ueberzug/default.nix b/pkgs/development/python-modules/ueberzug/default.nix index d433b1a6b4796..cb46666f21e00 100644 --- a/pkgs/development/python-modules/ueberzug/default.nix +++ b/pkgs/development/python-modules/ueberzug/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "ueberzug"; - version = "18.1.7"; + version = "18.1.8"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ef0d6ac5815446ede654a38da550d2c44abd0fc05c901b2232935a65bcbca875"; + sha256 = "3718db8f824ef5f6a69dc25b3f08e0a45388dd46843c61721476bad2b64345ee"; }; buildInputs = [ libX11 libXext ]; diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 7a942a213720d..9b8e65e23d036 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "zha-ng"; repo = "zigpy-znp"; rev = "v${version}"; - sha256 = "a98RYPvcYE1NPERmPo1jPwMf86N+0297u4pOKuaB6u4="; + sha256 = "18dav2n5fqdigf8dl7gcqa9z8l6p2ig6l5q78gqg2wj7wjpncwyj"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 32c1fca634b64..1011bcb5cc0cc 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "0gdv2l10v19mjskv0f0aphxbzvdx6py0w6n9yg4wn6g7j7c61szd"; + sha256 = "0wbxlh2lwgdhhw902lqy6p2vh8adfq4yaa507js8an3byy26ls3d"; }; - vendorSha256 = "0s5ingyl0m939k1qxc1qiyhiabi3ml0qz33s3rbd4hmcg907yjga"; + vendorSha256 = "0yk9xsb0s4kymfb3p14irks6b30b53r0mz7irgcmx9jxz8vyffqg"; doCheck = false; @@ -20,7 +20,7 @@ buildGoModule rec { meta = with lib; { description = "Terraform linter focused on possible errors, best practices, and so on"; homepage = "https://github.com/terraform-linters/tflint"; - changelog = "https://github.com/terraform-linters/tflint/releases/tag/v${version}"; + changelog = "https://github.com/terraform-linters/tflint/blob/v${version}/CHANGELOG.md"; license = licenses.mpl20; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 4c6d47ecb1891..c1b3a7aa15601 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.4.5"; + version = "1.4.6"; bloop-coursier-channel = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json"; - sha256 = "0a3ayvq62nbfrcs2xgrfqg27h0wf9x28pxabmwd8y0ncafsnifjy"; + sha256 = "1fx80yrf03llhxcd8az5vzralz01wdfk7000q8l04rj1ax3daqia"; }; bloop-bash = fetchurl { @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = if stdenv.isLinux && stdenv.isx86_64 then "0wh02djny3a9882423lh4kf67z981d1ky85gfphsw52fbdhbzmn9" - else if stdenv.isDarwin && stdenv.isx86_64 then "0db30zbqpa9q285hspaba124dfnnr1gmlrxwwvn9szxz1d55n417" + outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1hg02a3ildgqv8864zg08hvk4y0kmsxsg7ncbsl933rclhk2lybd" + else if stdenv.isDarwin && stdenv.isx86_64 then "1i9kh4h5w3gr4w6rf5m7xpfqwps91mfddl1zk25v7f6vsraayam0" else throw "unsupported platform"; }; diff --git a/pkgs/os-specific/linux/psftools/default.nix b/pkgs/os-specific/linux/psftools/default.nix index a71e7ef0dcc9c..5a19fbec24d52 100644 --- a/pkgs/os-specific/linux/psftools/default.nix +++ b/pkgs/os-specific/linux/psftools/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "psftools"; - version = "1.0.13"; + version = "1.0.14"; src = fetchurl { url = "https://www.seasip.info/Unix/PSF/${pname}-${version}.tar.gz"; - sha256 = "0rgg1lhryqi6sgm4afhw0z6pjivdw4hyhpxanj8rabyabn4fcqcw"; + sha256 = "17nia5n5rabbh42gz51c8y53rjwddria4j3wvzk8dd0llj7k1y6w"; }; outputs = ["out" "man" "dev" "lib"]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { and PSF2 (any width) formats are supported; the default output format is PSF2. ''; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.gpl2Plus; maintainers = with maintainers; [ kaction ]; }; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index b5eba51a5d8f0..742e62230d289 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.21"; + version = "1.2020.22"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "0hf2s3k6v57d51k72jjciakdmlgdrdg4aa7z5hchy74gchsp3x17"; + sha256 = "10s2a5z903k1nhq6zdvj4wfms5ma4ldhq9330nnnkdzhbxdp14yx"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 7cbba9bfbf6bc..aa0a3926b1413 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "openntpd"; - version = "6.2p3"; + version = "6.8p1"; src = fetchurl { url = "mirror://openbsd/OpenNTPD/${pname}-${version}.tar.gz"; - sha256 = "0fn12i4kzsi0zkr4qp3dp9bycmirnfapajqvdfx02zhr4hanj0kv"; + sha256 = "0ijsylc7a4jlpxsqa0jq1w1c7333id8pcakzl7a5749ria1xp0l5"; }; prePatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6674a56127910..816a4657a252b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28280,8 +28280,6 @@ in termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; inherit (callPackage ../applications/networking/cluster/terraform { }) - terraform_0_11 - terraform_0_11-full terraform_0_12 terraform_0_13 terraform_0_14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d5a8dc7bb2618..625045c1df12e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4780,7 +4780,10 @@ in { pretend = callPackage ../development/python-modules/pretend { }; - prettytable = callPackage ../development/python-modules/prettytable { }; + prettytable = if isPy3k then + callPackage ../development/python-modules/prettytable { } + else + callPackage ../development/python-modules/prettytable/1.nix { }; priority = callPackage ../development/python-modules/priority { }; |