diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/applications/misc/limesctl/default.nix new file mode 100644 index 000000000000..24a16eeb8b1f --- /dev/null +++ b/pkgs/applications/misc/limesctl/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "limesctl"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "sapcc"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-fhmGVgJ/4xnf6pe8aXxx1KEmLInxm54my+qgSU4Vc/k="; + }; + + vendorSha256 = "sha256-9MlymY5gM9/K2+7/yTa3WaSIfDJ4gRf33vSCwdIpNqw="; + + subPackages = [ "." ]; + + meta = with lib; { + description = "CLI for Limes"; + homepage = "https://github.com/sapcc/limesctl"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index c789e04957aa..9f9143c698e0 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "95.0.4638.17", - "sha256": "1v5r8m3wlwh6prcj7bd4zprsr4g43869lhxv43m207c5nlnqiriz", - "sha256bin64": "0h88gd8y4i2jmvhiwadbq6hzqygddym8jy1fhzp8qnwfhc30qm4m", + "version": "95.0.4638.32", + "sha256": "1w904axixagn6gqcb90849q3qy0k3c6lgl0c97cb6m78l9xrrnbr", + "sha256bin64": "1z7xx608sh8agdl98r7xk7s43d3qnfpd1jvgbl7l8fqd85ns11i0", "deps": { "gn": { "version": "2021-08-11", @@ -31,15 +31,15 @@ } }, "dev": { - "version": "96.0.4651.0", - "sha256": "0da1mhz3cy0k2igdh208i28k8fxca0yjfypvmj7624p7igrp4an6", - "sha256bin64": "1gslpdnpjp7w40lsl748rmbkbs31v22f2x45gahrijkvfrkgdqp9", + "version": "96.0.4655.0", + "sha256": "00gax7xqi1n4jiqwpff43c43mpqb5jakckwdfbgwhrp6h35xxdv1", + "sha256bin64": "1xyyz6p4qllzyd6wbdbhs6kp062dz40i03wrlsggb919bgp7ivnw", "deps": { "gn": { - "version": "2021-08-11", + "version": "2021-09-13", "url": "https://gn.googlesource.com/gn", - "rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263", - "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" + "rev": "de86ec4176235871a7cb335756987e41246dae4a", + "sha256": "0mlnsqcj06azz5cpwlafi5gg6pvf2s6x9qq02zl1sm2h288y152g" } } }, diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index 3e45dd62d683..a9e87861365c 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -1,10 +1,11 @@ { lib -, fetchFromGitHub +, fetchFromGitLab , mkDerivation , breeze-icons , breeze-qt5 , cmake , extra-cmake-modules +, ffmpeg-full , kcodecs , kconfig , kcoreaddons @@ -26,18 +27,20 @@ mkDerivation rec { pname = "haruna"; - version = "0.6.3"; + version = "0.7.2"; - src = fetchFromGitHub { - owner = "g-fb"; + src = fetchFromGitLab { + owner = "multimedia"; repo = "haruna"; - rev = version; - sha256 = "sha256-gJCLc8qJolv4Yufm/OBCTTEpyoodtySAqKH+zMHCoLU="; + rev = "v${version}"; + sha256 = "sha256-0s4v3YJhSssp2S9mppMXq0AtWXPIaqOYWPmJgKjXjDE="; + domain = "invent.kde.org"; }; buildInputs = [ breeze-icons breeze-qt5 + ffmpeg-full kcodecs kconfig kcoreaddons diff --git a/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/pkgs/development/python-modules/WazeRouteCalculator/default.nix deleted file mode 100644 index 6da500413f0e..000000000000 --- a/pkgs/development/python-modules/WazeRouteCalculator/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, requests }: - -buildPythonPackage rec { - pname = "WazeRouteCalculator"; - version = "0.12"; - - src = fetchPypi { - inherit pname version; - sha256 = "889fe753a530b258bd23def65616666d32c48d93ad8ed211dadf2ed9afcec65b"; - }; - - propagatedBuildInputs = [ requests ]; - - # there are no tests - doCheck = false; - - meta = with lib; { - description = "Calculate actual route time and distance with Waze API"; - homepage = "https://github.com/kovacsbalu/WazeRouteCalculator"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index a859f509f347..4a8085e0d72b 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "ephem"; - version = "4.0.0.2"; + version = "4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0D3nPr9qkWgdWX61tdQ7z28MZ+KSu6L5qXRzS08VdX4="; + sha256 = "c076794a511a34b5b91871c1cf6374dbc323ec69fca3f50eb718f20b171259d6"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 0c435357f95c..7ac02fa05ac9 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.11.3"; + version = "0.11.3.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b7bff8f9d7090656aee3c54c252c9e356785ee566c67de4af800ddbfa888bc77"; + sha256 = "4855afe0ebf428efbcf848477828b889f8515be7f4f15ae26682919369d92774"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mbddns/default.nix b/pkgs/development/python-modules/mbddns/default.nix new file mode 100644 index 000000000000..05137b56b004 --- /dev/null +++ b/pkgs/development/python-modules/mbddns/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mbddns"; + version = "0.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "thinkl33t"; + repo = "mb-ddns"; + rev = version; + sha256 = "13xzkprqk1v0zlzx4a0n9zzpnlb1g2h6pc62ms66fj72lsmjynj7"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "mbddns" ]; + + meta = with lib; { + description = "Mythic Beasts Dynamic DNS updater"; + homepage = "https://github.com/thinkl33t/mb-ddns"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index e0a67d4f6505..0a8252234569 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "5.4.0"; + version = "5.5.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "vemel"; repo = "mypy_boto3_builder"; rev = version; - sha256 = "sha256-PS2MMpI/ezjHnI6vUoHTt0uuuB/w94OrOYBLNCpSxIE="; + sha256 = "sha256-cFe8d6w28VFTNyj/ABWHkFQDfnM4aTrNZ+WUw5g8H5I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pycontrol4/default.nix b/pkgs/development/python-modules/pycontrol4/default.nix index 93f7dcdc0a23..009bb446028a 100644 --- a/pkgs/development/python-modules/pycontrol4/default.nix +++ b/pkgs/development/python-modules/pycontrol4/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pycontrol4"; - version = "0.1.0"; + version = "0.3.0"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "lawtancool"; repo = "pyControl4"; rev = "v${version}"; - sha256 = "0idw9kv6yxrbp0r33vb1jlzgil20m2rjjfrxhcwxmbjjqv93zn6d"; + sha256 = "sha256-z7MDz9fGwZY4JcqabeYFGZ9nsRU2qa5LYnNQx/ae/4Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynobo/default.nix b/pkgs/development/python-modules/pynobo/default.nix index 52cada827817..e70010901ef5 100644 --- a/pkgs/development/python-modules/pynobo/default.nix +++ b/pkgs/development/python-modules/pynobo/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "pynobo"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "echoromeo"; repo = pname; rev = "v${version}"; - sha256 = "0f98qm9vp7f0hqaxhihv7y5swciyp60222la44f4936g0rvs005x"; + sha256 = "sha256-tcDSI5GODV53o4m35B4CXscVCnwt7gqRu7qohEnvyz8="; }; # Project has no tests diff --git a/pkgs/development/python-modules/somecomfort/default.nix b/pkgs/development/python-modules/somecomfort/default.nix index c5f1ad73fcda..621da7ae8db0 100644 --- a/pkgs/development/python-modules/somecomfort/default.nix +++ b/pkgs/development/python-modules/somecomfort/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "somecomfort"; - version = "0.5.2"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "681f44449e8c0a923305aa05aa5262f4d2304a6ecea496caa8d5a51b724a0fef"; + sha256 = "sha256-CbV8NOpCXzVz0dBKhUclUCPrD4530zv5HIYxsbNO+OA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wazeroutecalculator/default.nix b/pkgs/development/python-modules/wazeroutecalculator/default.nix new file mode 100644 index 000000000000..dd8409624648 --- /dev/null +++ b/pkgs/development/python-modules/wazeroutecalculator/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "wazeroutecalculator"; + version = "0.13"; + + src = fetchPypi { + pname = "WazeRouteCalculator"; + inherit version; + sha256 = "sha256-Ex9yglaJkk0+Uo3Y+xpimb5boXz+4QdbJS2O75U6dUg="; + }; + + propagatedBuildInputs = [ + requests + ]; + + # there are no tests + doCheck = false; + + pythonImportsCheck = [ "WazeRouteCalculator" ]; + + meta = with lib; { + description = "Calculate actual route time and distance with Waze API"; + homepage = "https://github.com/kovacsbalu/WazeRouteCalculator"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/tools/database/gobang/default.nix b/pkgs/development/tools/database/gobang/default.nix new file mode 100644 index 000000000000..dc861337c252 --- /dev/null +++ b/pkgs/development/tools/database/gobang/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "gobang"; + version = "0.1.0-alpha.5"; + + src = fetchFromGitHub { + owner = "tako8ki"; + repo = pname; + rev = "v${version}"; + sha256 = "02glb3hlprpdc72ji0248a7g0vr36yxr0gfbbms2m25v251dyaa6"; + }; + + cargoSha256 = "sha256-Tiefet5gLpiuYY6Scg5fjnaPiZfVl5Gy2oZFdhgNRxY="; + + meta = with lib; { + description = "A cross-platform TUI database management tool written in Rust"; + homepage = "https://github.com/tako8ki/gobang"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index c9e77c914168..f945fc7fd037 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -551,7 +551,7 @@ "myq" = ps: with ps; [ pymyq ]; "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt pymysensors ]; "mystrom" = ps: with ps; [ aiohttp-cors python-mystrom ]; - "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns + "mythicbeastsdns" = ps: with ps; [ mbddns ]; "nad" = ps: with ps; [ nad-receiver ]; "nam" = ps: with ps; [ nettigo-air-monitor ]; "namecheapdns" = ps: with ps; [ defusedxml ]; @@ -961,7 +961,7 @@ "waterfurnace" = ps: with ps; [ waterfurnace ]; "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf "watson_tts" = ps: with ps; [ ibm-watson ]; - "waze_travel_time" = ps: with ps; [ WazeRouteCalculator ]; + "waze_travel_time" = ps: with ps; [ wazeroutecalculator ]; "weather" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors ]; "webostv" = ps: with ps; [ aiopylgtv ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 0239fb12e054..37d4c9b54970 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -522,6 +522,7 @@ in with py.pkgs; buildPythonApplication rec { "my" "myq" "mysensors" + "mythicbeastsdns" "nam" "namecheapdns" "neato" diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index baa1461df82e..4814f956411d 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.545"; + version = "0.18.582"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-aHb7bhqagf60YkzL5II/mGPeUibH655QH8Qx3+EqWjY="; + sha256 = "sha256-WwTeUvBD790CP+mph2xKm/m7csYQgmXgJa4TLn5nsVI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index fe61e5fc8b84..a550ba9ae827 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,7 +2,7 @@ let pname = "miniflux"; - version = "2.0.31"; + version = "2.0.33"; in buildGoModule { inherit pname version; @@ -11,10 +11,10 @@ in buildGoModule { owner = pname; repo = pname; rev = version; - sha256 = "sha256-01v5gwUv0SfX/9AJgo4HiBcmoCfQbnKIGcS26IebU2Q="; + sha256 = "0vcfpy71gdvd0z20v6d36l3yvmnm4nmfplivw9yjzv8kbnf9mabc"; }; - vendorSha256 = "sha256-69iTdrjgBmJHeVa8Tq47clQR5Xhy4rWcp2OwS4nIw/c="; + vendorSha256 = "1j4jskcply9mxz9bggw1c6368k22rga6f3f6mgs1pklz5v7r7n2j"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/networking/dnstake/default.nix b/pkgs/tools/networking/dnstake/default.nix new file mode 100644 index 000000000000..d32cf0fedbbb --- /dev/null +++ b/pkgs/tools/networking/dnstake/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "dnstake"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "pwnesia"; + repo = pname; + rev = "v${version}"; + sha256 = "0mjwnb0zyqnwk26f32v9vqxc9k6zcks9nn1595mf2hck5xwn86yk"; + }; + + vendorSha256 = "1xhzalx1x8js449w1qs2qdwbnz2s8mmypz9maj7jzl5mqfyhlwlp"; + + meta = with lib; { + description = "Tool to check missing hosted DNS zones"; + homepage = "https://github.com/pwnesia/dnstake"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b54c354bde76..d5164fb54d3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11780,6 +11780,8 @@ with pkgs; go-junit-report = callPackage ../development/tools/go-junit-report { }; + gobang = callPackage ../development/tools/database/gobang { }; + gogetdoc = callPackage ../development/tools/gogetdoc { }; gox = callPackage ../development/tools/gox { }; @@ -24781,6 +24783,8 @@ with pkgs; withPortAudio = stdenv.isDarwin; }; + limesctl = callPackage ../applications/misc/limesctl { }; + linssid = libsForQt5.callPackage ../applications/networking/linssid { }; deadd-notification-center = callPackage ../applications/misc/deadd-notification-center/default.nix { }; @@ -32774,6 +32778,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; + dnstake = callPackage ../tools/networking/dnstake {}; + dnstracer = callPackage ../tools/networking/dnstracer { inherit (darwin) libresolv; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0c375a664999..039b921ee982 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -79,6 +79,7 @@ mapAliases ({ sphinxcontrib_plantuml = sphinxcontrib-plantuml; topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05 + WazeRouteCalculator = wazeroutecalculator; # 2021-09-29 websocket_client = websocket-client; zc_buildout221 = zc_buildout; # added 2021-07-21 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c832adf5a92f..d3dd336c76b4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4532,6 +4532,8 @@ in { inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5; }; + mbddns = callPackage ../development/python-modules/mbddns { }; + mccabe = callPackage ../development/python-modules/mccabe { }; mcstatus = callPackage ../development/python-modules/mcstatus { }; @@ -9546,7 +9548,7 @@ in { wavedrom = callPackage ../development/python-modules/wavedrom { }; - WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { }; + wazeroutecalculator = callPackage ../development/python-modules/wazeroutecalculator { }; wcmatch = callPackage ../development/python-modules/wcmatch { };