diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2847b88ac057..ea6c70d8c6db 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9682,6 +9682,12 @@ githubId = 1237862; name = "Ollie Bunting"; }; + oluceps = { + email = "nixos@oluceps.uk"; + github = "oluceps"; + githubId = 35628088; + name = "oluceps"; + }; olynch = { email = "owen@olynch.me"; github = "olynch"; diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 4e56b393e2e5..52083dcaaa25 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -21,6 +21,7 @@ in ./fluxbox.nix ./fvwm2.nix ./fvwm3.nix + ./hackedbox.nix ./herbstluftwm.nix ./i3.nix ./jwm.nix diff --git a/nixos/modules/services/x11/window-managers/hackedbox.nix b/nixos/modules/services/x11/window-managers/hackedbox.nix new file mode 100644 index 000000000000..641cf1bdcbe2 --- /dev/null +++ b/nixos/modules/services/x11/window-managers/hackedbox.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.hackedbox; +in +{ + ###### interface + options = { + services.xserver.windowManager.hackedbox.enable = mkEnableOption "hackedbox"; + }; + + ###### implementation + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { + name = "hackedbox"; + start = '' + ${pkgs.hackedbox}/bin/hackedbox & + waitPID=$! + ''; + }; + environment.systemPackages = [ pkgs.hackedbox ]; + }; +} diff --git a/pkgs/applications/audio/radioboat/default.nix b/pkgs/applications/audio/radioboat/default.nix index f96339848dda..e12152715207 100644 --- a/pkgs/applications/audio/radioboat/default.nix +++ b/pkgs/applications/audio/radioboat/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "radioboat"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "slashformotion"; repo = "radioboat"; rev = "v${version}"; - sha256 = "sha256-ZAKTWmK3hCJxm/578cjtdgMA2ZRhCFtzfGdta0gmuFY="; + sha256 = "sha256-e6SZv5gb7NOpCU3blFsH7A6ETWL8QlxtpDmmk8DKn8I="; }; vendorSha256 = "sha256-X3KiqaiOQYQBfVckh50C+4oxIVN6gXyNuQtBwGvjdFQ="; diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix index 13f6c3f5ab30..e8ce0dbd0cef 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "megapixels"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitLab { owner = "postmarketOS"; repo = "megapixels"; rev = version; - hash = "sha256-zOtHxnXDzsLfaQPS0BhbuoUXglCbRULVJfk1txoS72Y="; + hash = "sha256-UH3NQdMlZTi4hc8HNSbCcQSm0rxI78RMCRYll1NCBO8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index 2b825705b006..a3de388a52ab 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -13,15 +13,19 @@ stdenv.mkDerivation rec { pname = "libosmocore"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmocore"; rev = version; - hash = "sha256-AjOyZiLlXhsetbyMBuUssoNxk22LzGOkZpeLt4vKli4="; + hash = "sha256-Dkud3ZA9m/UVbPugbQztUJXFpkQYTWjK2mamxfto9JA="; }; + postPatch = '' + echo "${version}" > .tarball-version + ''; + propagatedBuildInputs = [ talloc ]; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 55baf5c7a5c8..4c165cc7e10c 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "temporal"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - sha256 = "sha256-YaFB2OBC5dJjfomkge6w3sGyrESRxAFTDm+jPMLgskc="; + sha256 = "sha256-V80v8nRHAshPnyWdBb4ahCn5FfzT906oZlhalZ547Nk="; }; vendorSha256 = "sha256-MT/BmGTdyEzmXjuwlA6WhLIWlrQz3Wc4Tl5dMI1587Q="; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index e818f4a71faa..28dad82fe162 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -125,6 +125,21 @@ buildPythonApplication rec { fish ]; + # skip failing tests due to darwin sandbox + preCheck = if stdenv.isDarwin then '' + substituteInPlace kitty_tests/file_transmission.py \ + --replace test_file_get dont_test_file_get \ + --replace test_path_mapping_receive dont_test_path_mapping_receive + substituteInPlace kitty_tests/shell_integration.py \ + --replace test_fish_integration dont_test_fish_integration + substituteInPlace kitty_tests/open_actions.py \ + --replace test_parsing_of_open_actions dont_test_parsing_of_open_actions + substituteInPlace kitty_tests/ssh.py \ + --replace test_ssh_connection_data dont_test_ssh_connection_data + substituteInPlace kitty_tests/fonts.py \ + --replace 'class Rendering(BaseTest)' 'class Rendering' + '' else ""; + checkPhase = let buildBinPath = if stdenv.isDarwin @@ -132,6 +147,8 @@ buildPythonApplication rec { else "linux-package/bin"; in '' + runHook preCheck + # Fontconfig error: Cannot load default config file: No such file: (null) export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index af6d9fe702c4..a2da839347f3 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ]; pythonPath = with python3.pkgs; [ - imdbpy + cinemagoer pygobject3 requests setproctitle diff --git a/pkgs/applications/window-managers/hackedbox/default.nix b/pkgs/applications/window-managers/hackedbox/default.nix new file mode 100644 index 000000000000..0f608b83a70a --- /dev/null +++ b/pkgs/applications/window-managers/hackedbox/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, freetype +, fribidi +, imlib2 +, libX11 +, libXext +, libXft +, libXinerama +, libXpm +, libXrandr +, libXrender +, pkg-config +, xorgproto +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hackedbox"; + version = "0.8.5.1"; + + src = fetchFromGitHub { + owner = "museoa"; + repo = "hackedbox"; + rev = finalAttrs.version; + hash = "sha256-hxfbEj7UxQ19xhetmdi0iyK6ceLUfUvAAyyTbNivlLQ="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + freetype + fribidi + imlib2 + libX11 + libXext + libXft + libXinerama + libXpm + libXrandr + libXrender + xorgproto + ]; + + configureFlags = [ + "--x-includes=${libX11.dev}/include" + "--x-libraries=${libX11.out}/lib" + ]; + + meta = with lib; { + description = "A bastard hacked offspring of Blackbox"; + homepage = "http://github.com/museoa/hackedbox/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + inherit (libX11.meta) platforms; + }; +}) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 8de8769e90df..337bbb1f994c 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -206,9 +206,9 @@ in { major = "3"; minor = "11"; patch = "0"; - suffix = "b4"; + suffix = "b5"; }; - sha256 = "sha256-HZO2EWB5A+CAQXwalWf1+79RJMxchvSvu6HI/TTF9vs="; + sha256 = "sha256-OBC9IvfcNKmcKi60uFJkpN9PBe9ZxODMwuqC7pxJFpg="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index d65ead78624c..e2da1a30ff14 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,37 +1,94 @@ -{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper -, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre2, augeas, libxml2 -, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db -, gmp, readline, file, numactl, libapparmor, jansson -, getopt, perlPackages, ocamlPackages +{ lib +, stdenv +, fetchurl +, pkg-config +, autoreconfHook +, makeWrapper +, ncurses +, cpio +, gperf +, cdrkit +, flex +, bison +, qemu +, pcre2 +, augeas +, libxml2 +, acl +, libcap +, libcap_ng +, libconfig +, systemd +, fuse +, yajl +, libvirt +, hivex +, db +, gmp +, readline +, file +, numactl +, libapparmor +, jansson +, getopt +, perlPackages +, ocamlPackages , libtirpc , appliance ? null -, javaSupport ? false, jdk ? null }: +, javaSupport ? false +, jdk +}: assert appliance == null || lib.isDerivation appliance; -assert javaSupport -> jdk != null; stdenv.mkDerivation rec { pname = "libguestfs"; - version = "1.48.0"; + version = "1.48.4"; src = fetchurl { url = "https://libguestfs.org/download/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; - sha256 = "sha256-FoH93t/PSEym3uxUIwMwoy3vvTDCqx+BeI4lLLXQSCk="; + sha256 = "sha256-ncIrbFpF8ZwsupEaN7Oo2G9idEUhsQ61PD05B+UIAxI="; }; strictDeps = true; nativeBuildInputs = [ - autoreconfHook bison cdrkit cpio flex getopt gperf makeWrapper pkg-config qemu - ] ++ (with perlPackages; [ perl libintl-perl GetoptLong SysVirt ]) - ++ (with ocamlPackages; [ ocaml findlib ]); + autoreconfHook + bison + cdrkit + cpio + flex + getopt + gperf + makeWrapper + pkg-config + qemu + ] ++ (with perlPackages; [ perl libintl-perl GetoptLong ModuleBuild ]) + ++ (with ocamlPackages; [ ocaml findlib ]); buildInputs = [ - ncurses jansson - pcre2 augeas libxml2 acl libcap libcap_ng libconfig - systemd fuse yajl libvirt gmp readline file hivex db - numactl libapparmor perlPackages.ModuleBuild + ncurses + jansson + pcre2 + augeas + libxml2 + acl + libcap + libcap_ng + libconfig + systemd + fuse + yajl + libvirt + gmp + readline + file + hivex + db + numactl + libapparmor + perlPackages.ModuleBuild libtirpc ] ++ (with ocamlPackages; [ ocamlbuild ocaml_libvirt gettext-stub ounit ]) - ++ lib.optional javaSupport jdk; + ++ lib.optional javaSupport jdk; prePatch = '' # build-time scripts @@ -54,10 +111,14 @@ stdenv.mkDerivation rec { patches = [ ./libguestfs-syms.patch ]; + + createFindlibDestdir = true; + installFlags = [ "REALLY_INSTALL=yes" ]; enableParallelBuilding = true; postInstall = '' + mv "$out/lib/ocaml/guestfs" "$OCAMLFIND_DESTDIR/guestfs" for bin in $out/bin/*; do wrapProgram "$bin" \ --prefix PATH : "$out/bin:${hivex}/bin:${qemu}/bin" \ @@ -95,7 +156,7 @@ stdenv.mkDerivation rec { description = "Tools for accessing and modifying virtual machine disk images"; license = with licenses; [ gpl2Plus lgpl21Plus ]; homepage = "https://libguestfs.org/"; - maintainers = with maintainers; [offline]; + maintainers = with maintainers; [ offline ]; platforms = platforms.linux; # this is to avoid "output size exceeded" hydraPlatforms = if appliance != null then appliance.meta.hydraPlatforms else platforms.linux; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 65735896d659..1bed1362bac6 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -47,12 +47,12 @@ in lib.warnIf (enableQT != false) "geant4: enableQT is deprecated, please use enableQt" stdenv.mkDerivation rec { - version = "11.0.0"; + version = "11.0.2"; pname = "geant4"; src = fetchurl{ url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz"; - sha256 = "sha256-PMin350/8ceiGmLS6zoQvhX2uxWNOTI78yEzScnvdbk="; + hash = "sha256-/AONuDcxL3Tj+O/RC108qHqZnUg9TYlZxguKdJIh7GE="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix index 5d40ff183e77..a5827fe188c5 100644 --- a/pkgs/development/libraries/ptex/default.nix +++ b/pkgs/development/libraries/ptex/default.nix @@ -1,27 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, zlib, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub, zlib, cmake }: stdenv.mkDerivation rec { pname = "ptex"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "wdas"; repo = "ptex"; rev = "v${version}"; - sha256 = "sha256-TuwgZJHvQUqBEFeZYvzpi+tmXB97SkOairYnuUahtSA="; + sha256 = "sha256-PR1ld9rXmL6BK4llznAsD5PNvi3anFMz2i9NDsG95DQ="; }; outputs = [ "bin" "dev" "out" "lib" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib pkg-config ]; - - # Can be removed in the next release - # https://github.com/wdas/ptex/pull/42 - patchPhase = '' - echo v${version} >version - ''; + buildInputs = [ zlib ]; meta = with lib; { description = "Per-Face Texture Mapping for Production Rendering"; diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index f4414d4b93f8..1c25c099805b 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.31.2"; + version = "0.31.3"; format = "setuptools"; src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - sha256 = "sha256-CAah1Yu3gbHcqHbTM1nXAVFqGKatdUNYt881sjsCD2o="; + sha256 = "sha256-h0hGTT8ipZZ3l/B6I/O74hFpRzaxj5vUBMbM/xX0dq4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 67ac93a7dcd2..834df14102f0 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.24.31"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.24.42"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-3gZzRpQsbRcwtRN4M4ViBRm4spNfWw7i5m1WX/tXzhI="; + sha256 = "sha256-3z1u8CMEvXw3EQkJNsCS1dtzXdoQneysHiNsPvf9t68="; }; 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 fa5c26d115c7..d7e525897604 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.27.31"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.27.42"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-sMx5+1o3oOK2vv6G79AnuSEB2Bnx/cVs//OfLrI58jI="; + sha256 = "sha256-OKGApmZsWpsGmnXsPPN0/ypkw+kMnySpFoWLzesERW0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index e98ee9d4fe39..2e027eaa990c 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -1,15 +1,15 @@ { lib , buildPythonPackage , fetchFromGitHub -, simpleeval +, pytestCheckHook , pythonOlder -, coveralls +, simpleeval , wcmatch }: buildPythonPackage rec { pname = "casbin"; - version = "1.16.9"; + version = "1.17.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - sha256 = "sha256-1xxjFNkCb50ndmXuRjt7svPOvSyzZbw+J49Zpyy1FUc="; + hash = "sha256-fBMhrA4zL4XPjQ63AGc5jf585ZpHTBumPievDNfCw7o="; }; propagatedBuildInputs = [ @@ -27,19 +27,15 @@ buildPythonPackage rec { ]; checkInputs = [ - coveralls + pytestCheckHook ]; - checkPhase = '' - coverage run -m unittest discover -s tests -t tests - ''; - pythonImportsCheck = [ "casbin" ]; meta = with lib; { - description = "An authorization library that supports access control models like ACL, RBAC, ABAC in Python"; + description = "Authorization library that supports access control models like ACL, RBAC and ABAC"; homepage = "https://github.com/casbin/pycasbin"; license = licenses.asl20; maintainers = with maintainers; [ costrouc ]; diff --git a/pkgs/development/python-modules/cinemagoer/default.nix b/pkgs/development/python-modules/cinemagoer/default.nix new file mode 100644 index 000000000000..45d80c26b8b3 --- /dev/null +++ b/pkgs/development/python-modules/cinemagoer/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, lxml +, sqlalchemy +}: + +buildPythonPackage rec { + pname = "cinemagoer"; + version = "2022.2.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "8efe29dab44a7d275702f3160746015bd55c87b2eed85991dd57dda42594e6c6"; + }; + + propagatedBuildInputs = [ + lxml + sqlalchemy + ]; + + # Tests require networking, and https://github.com/cinemagoer/cinemagoer/issues/240 + doCheck = false; + + pythonImportsCheck = [ "imdb" ]; # Former "imdbpy", upstream is yet to rename here + + meta = with lib; { + description = "A Python package for retrieving and managing the data of the IMDb movie database about movies and people"; + downloadPage = "https://github.com/cinemagoer/cinemagoer/"; + homepage = "https://cinemagoer.github.io/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/pkgs/development/python-modules/colorzero/default.nix b/pkgs/development/python-modules/colorzero/default.nix new file mode 100644 index 000000000000..4e74d9592a9b --- /dev/null +++ b/pkgs/development/python-modules/colorzero/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pkginfo +, sphinxHook +, sphinx-rtd-theme +, pytestCheckHook +}: + + +buildPythonPackage rec { + pname = "colorzero"; + version = "2.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "waveform80"; + repo = pname; + rev = "refs/tags/release-${version}"; + hash = "sha256-0NoQsy86OHQNLZsTEuF5s2MlRUoacF28jNeHgFKAH14="; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov" "" + ''; + + outputs = [ + "out" + "doc" + ]; + + nativeBuildInputs = [ + pkginfo + sphinx-rtd-theme + sphinxHook + ]; + + pythonImportsCheck = [ + "colorzero" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Yet another Python color library"; + homepage = "https://github.com/waveform80/colorzero"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/gpiozero/default.nix b/pkgs/development/python-modules/gpiozero/default.nix new file mode 100644 index 000000000000..639c5f0f69b2 --- /dev/null +++ b/pkgs/development/python-modules/gpiozero/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, sphinx-rtd-theme +, sphinxHook +, colorzero +, mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "gpiozero"; + version = "1.6.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "gpiozero"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-dmFc3DNTlEajYQ5e8QK2WfehwYwAsWyG2cxKg5ykEaI="; + }; + + outputs = [ + "out" + "doc" + ]; + + nativeBuildInputs = [ + sphinx-rtd-theme + sphinxHook + ]; + + propagatedBuildInputs = [ + colorzero + ]; + + pythonImportsCheck = [ + "gpiozero" + "gpiozero.tools" + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + + meta = with lib; { + description = "A simple interface to GPIO devices with Raspberry Pi"; + homepage = "https://github.com/gpiozero/gpiozero"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index 920b487d836c..c2da89dc6c44 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "1.2.1"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = "refs/tags/v${version}"; - hash = "sha256-SvAvLxWk/IIlkv54cUVN6FXj9rrM0QPKHAk36+PuqP0="; + hash = "sha256-4kR3Hc5M4FDG/WFtIW20a9d0vwLzmqtrlhd+teMiejA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 3b82086bf1ce..aba0bc17306d 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.8.3"; + version = "2022.8.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-9pQjo4FiHAD3EwWFL/LCxauUU0AbbvFR6OIi7iBYPPU="; + sha256 = "sha256-660AGPKOcTwiEA3Zs81pg88DzsDwAEuF8tYMg3KXAZw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index cab1482ed917..249c9abff842 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2021.12.1"; + version = "2022.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "sha256-Qr9K4+egrXD6eUgUtke2n7HyhXLthrju9ykXSI7Wl4Q="; + sha256 = "sha256-lQ28j4vOtxSjkMZXTKG+vesAN9KWj5T4sZ3QbaWP9Gw="; }; # Tests require network connection diff --git a/pkgs/development/python-modules/imdbpy/default.nix b/pkgs/development/python-modules/imdbpy/default.nix deleted file mode 100644 index f966a3f8d3c2..000000000000 --- a/pkgs/development/python-modules/imdbpy/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, lxml -, sqlalchemy -}: - -buildPythonPackage rec { - pname = "imdbpy"; - version = "2022.7.9"; - - src = fetchPypi { - pname = "IMDbPY"; - inherit version; - sha256 = "sha256-gKXt+KhxE/8ipE0A/XbUIsQs/uzU6oIL4zdTuPJL9OY="; - }; - - propagatedBuildInputs = [ - lxml - sqlalchemy - ]; - - # Tests require networking, and https://github.com/alberanid/imdbpy/issues/240 - doCheck = false; - - pythonImportsCheck = [ "imdb" ]; - - meta = with lib; { - description = "Python package for retrieving and managing the data of the IMDb database"; - homepage = "https://imdbpy.github.io/"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ ivar ]; - }; -} diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index 2ff30608fd7f..36b1e9f42d14 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "4.1.19"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oNIh9mRdPXai6SDfyvfoOrgsbVWyRYhJva+bsqgGOoo="; + hash = "sha256-d8RG/PSWPHvQy7o9tPLPGrEp0r/Y3JWwWoT3cS4iR38="; }; # Module has no tests diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index 3b308c4d59e6..30e94d471157 100644 --- a/pkgs/development/python-modules/pyquil/default.nix +++ b/pkgs/development/python-modules/pyquil/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pyquil"; - version = "3.1.0"; + version = "3.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ejfzxCf2NucK/hfzswHu3h4DPPZQY8vkMAQ51XDRWKU="; + sha256 = "sha256-fxHFUy/3r01WOhZ4r9OMF7UD8YETIPYlB3heOgfugMM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index ada0ded7e79a..96601c6750ac 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -32,6 +32,11 @@ buildPythonPackage rec { hash = "sha256-WSsT+p23VctVt9A+WFKNHcgUHFijfT775eMF3RzaXDA="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "mailchecker >= 4.1.0, < 5.0.0" "mailchecker >= 4.1.0" + ''; + propagatedBuildInputs = [ mailchecker phonenumbers diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index 83a7c4174d16..163ef44f0d14 100644 --- a/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, gpiozero , mock , pyserial , pyserial-asyncio @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.9.0"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,11 +22,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy-zigate"; - rev = "v${version}"; - hash = "sha256-rFmcgfn87XS1fvbSdJG6pItXRMkeogp4faKMe7pCxkM="; + rev = "refs/tags/${version}"; + hash = "sha256-H1R+wNUo/J5ATINHrkC4mJ8KKnBxVZUvF6X7y54aiVQ="; }; propagatedBuildInputs = [ + gpiozero pyserial pyserial-asyncio pyusb diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 65532ed23c4b..43cf5d59f81f 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.48.0"; + version = "0.49.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - sha256 = "sha256-usO5d2JLZ7tochQXmxEfRgxaW1KJew3RVbfWnew+bP4="; + sha256 = "sha256-mCqRqi7AUsrvfSOHyfK+WVj/4D7/4RDOYFWveS+tS/A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index a1a593f522b5..fd2231dbe413 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -23,7 +23,7 @@ let in rec { - electron = electron_19; + electron = electron_20; electron_9 = mkElectron "9.4.4" { x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450"; @@ -131,4 +131,13 @@ rec { aarch64-darwin = "f9042bce83fe8446e22f6885285dd5fc2dca048d0b89cbf7f326a46102ffc440"; headers = "09dbx4qh0rgp5mdm6srz6fgx12zq6b9jqq1k6l3gzyvwigi3wny1"; }; + + electron_20 = mkElectron "20.0.1" { + armv7l-linux = "6e1f216d0680fd1116ab378846ef9204bcd27916fa0f9bb510623a01c32bef9b"; + aarch64-linux = "60ebe86847b47d98ec16d259ee58a9dbd5fa7d84df6e23888ac1a340c9b9b467"; + x86_64-linux = "db6b9a6dd1d609fbf46cc7e2fd0f3ff317e59da85d037bce018cfc6810580c32"; + x86_64-darwin = "2ceea21ba4f79e1e9bea6d01e31a6339288a3d98adf23ac52a728bb22e55794c"; + aarch64-darwin = "42f251973d4ae90941f82898d4a2e21d7e4c899e920bc671aba03eedb871ee10"; + headers = "1xvi3w8x1knc103cxk4mkqb8xw4bp6if8lra527a8x2xan4syiq1"; + }; } diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index a8a5327d9ae7..fb4081336b9d 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.0.4"; + version = "9.1.2"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-eLHj8a64q+wxJaNfGS2phtuI2o4xmTWtXRVvjO80NyU="; + sha256 = "sha256-NqjUkEVjRz5xzom6lDb5eW5ARDFMCtJM/Bbhsx4y0io="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 00079c82c39c..63a2fd581269 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KSIbMKaLcVUM2k+WQ5V+kU/TUQQFWpsCBVs8TQW+3g4="; + sha256 = "sha256-d1rSmDPiVHpYbDPWQKkDhcJJklKlM1+vGdzvjICTT14="; }; buildInputs = [ zlib openssl ]; diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index ba33d689b646..37abb4aed03a 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.61.tar.xz", + "name": "factorio_alpha_x64-1.1.65.tar.xz", "needsAuth": true, - "sha256": "1rgb3i6l9v5vv3qw0ngfxryamql2fhhqymv4dr86rxjy863rpx65", + "sha256": "0rzifli06s3k3gyzxpzzisxkvnvcidw4njkibrld2n5pwhjg8qbb", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.61/alpha/linux64", - "version": "1.1.61" + "url": "https://factorio.com/get-download/1.1.65/alpha/linux64", + "version": "1.1.65" }, "stable": { "name": "factorio_alpha_x64-1.1.61.tar.xz", @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.61.tar.xz", + "name": "factorio_headless_x64-1.1.65.tar.xz", "needsAuth": false, - "sha256": "0ndnc0f22bqjg1v6ah7i4nzghvk7cn73sgm22lf715di6f6srr38", + "sha256": "1h5ziip9jbqr03ci2fvf3zqwmy0l7m25br3rm5xv0af9wig9wvh1", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.61/headless/linux64", - "version": "1.1.61" + "url": "https://factorio.com/get-download/1.1.65/headless/linux64", + "version": "1.1.65" }, "stable": { "name": "factorio_headless_x64-1.1.61.tar.xz", diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1472027b0cb3..addfa0bdc80e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.8.1"; + version = "2022.8.2"; components = { "abode" = ps: with ps; [ abodepy @@ -1048,7 +1048,9 @@ "graphite" = ps: with ps; [ ]; "gree" = ps: with ps; [ + aiohttp-cors greeclimate + ifaddr ]; "greeneye_monitor" = ps: with ps; [ greeneye-monitor @@ -2235,7 +2237,8 @@ "remote" = ps: with ps; [ ]; "remote_rpi_gpio" = ps: with ps; [ - ]; # missing inputs: gpiozero pigpio + gpiozero + ]; # missing inputs: pigpio "renault" = ps: with ps; [ renault-api ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 8cbc601b5a9a..884e6f9401d3 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -112,9 +112,6 @@ let hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); - pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: { - doCheck = false; # requires pytest-aiohttp>=1.0.0 - }); pynws = super.pynws.overridePythonAttrs (oldAttrs: { doCheck = false; # requires pytest-aiohttp>=1.0.0 }); @@ -186,6 +183,20 @@ let }); }) + (self: super: { + pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec { + version = "102"; + src = fetchFromGitHub { + owner = "Kane610"; + repo = "deconz"; + rev = "refs/tags/v${version}"; + hash = "sha256-Dbhp/+xyyWhFcYp2VRnivn5d1JMR5hBctdArIzLKIjM="; + }; + doCheck = false; # requires pytest-aiohttp>=1.0.0 + }); + }) + + (self: super: { python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; @@ -296,7 +307,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.8.1"; + hassVersion = "2022.8.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -314,7 +325,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-0QhWusJ7vSiudigJTo4KiXqO0OWgIlvqkSpiK5FFI+g="; + hash = "sha256-82UPZmaSJVO0kmlGuY08vS3y5ai0NtSQ7ntkiOcNc2A="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 5d0170ec735c..b478ab4886bf 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -89,6 +89,7 @@ in buildPythonApplication rec { INCLUDE_DIRS = "${pam}/include"; nativeBuildInputs = [ + gobject-introspection pkg-config wrapGAppsHook pandoc @@ -119,7 +120,6 @@ in buildPythonApplication rec { ffmpeg gdk-pixbuf glib - gobject-introspection gtk3 librsvg libvpx diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index c997acd60ef2..df3953b030fd 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -35,11 +35,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.25.31"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.25.42"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-z5FA8Xmv8Abqh/ckYB5Bcgwrnd0FlHJQJi562tLZ3hE="; + hash = "sha256-5DH3Ik0DHmHfZ+XfFjmC2CL5WRoA9ENgzDeYfCgwtTI="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix index b1d22d5ee3cb..f7a8f7ca92f4 100644 --- a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix +++ b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "realvnc-vnc-viewer"; - version = "6.22.207"; + version = "6.22.515"; src = { "x86_64-linux" = fetchurl { url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm"; - sha256 = "0jybfqj1svkb297ahyp07xf4b8qyb5h1l2kp50a50ivb6flqd3jr"; + sha256 = "1l9kfmb1695pv2v9hm8z5yr7y5yhadbbs61s4yf9ksvvfypzwrpn"; }; "i686-linux" = fetchurl { url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x86.rpm"; - sha256 = "06jmkd474nql6p3hnqwnwj5ac29m2021flnvf44mfhrhaa5wnpz6"; + sha256 = "15fi1siwbsxmy7qi6f8r8ym346a8mx3kqcp9mvwvx39wm3ija6dh"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "VNC remote desktop client software by RealVNC"; homepage = "https://www.realvnc.com/en/connect/download/viewer/"; + mainProgram = "vncviewer"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = { fullName = "VNC Connect End User License Agreement"; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 072327de013c..64ddc3e3f463 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.12.2"; + version = "8.13.0"; outputs = [ "bin" "out" "man" "dev" ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "sha256-ffDJJWe/SzG+lppXEiyfXXL5KLdZgnMjv1SYnuYnh4c="; + sha256 = "sha256-N2jq68Vs/D+lZcIJVdjBLVaz2gK/TwqKeNfHUWdS3NA="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix new file mode 100644 index 000000000000..8b206c7b301b --- /dev/null +++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, qmake +, vulkan-loader +, wrapQtAppsHook +, withX11 ? true +, qtx11extras +}: + +stdenv.mkDerivation rec { + pname = "vulkan-caps-viewer"; + version = "3.24"; + + src = fetchFromGitHub { + owner = "SaschaWillems"; + repo = "VulkanCapsViewer"; + rev = "${version}"; + hash = "sha256-BSydAPZ74rGzW4UA/aqL2K/86NTK/eZqc3MZUbdq7iU="; + # Note: this derivation strictly requires vulkan-header to be the same it was developed against. + # To help they put in a git-submodule. + # It works with older vulkan-loaders. + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; + + buildInputs = [ + vulkan-loader + ] ++ lib.lists.optionals withX11 [ qtx11extras ]; + + patchPhase = '' + substituteInPlace vulkanCapsViewer.pro \ + --replace '/usr/' "/" + ''; + + qmakeFlags = [ + "DEFINES+=wayland" + "CONFIG+=release" + ] ++ lib.lists.optionals withX11 [ "DEFINES+=X11" ]; + + installFlags = [ "INSTALL_ROOT=$(out)" ]; + + meta = with lib; { + description = "Vulkan hardware capability viewer"; + longDescription = '' + Client application to display hardware implementation details for GPUs supporting the Vulkan API by Khronos. + The hardware reports can be submitted to a public online database that allows comparing different devices, browsing available features, extensions, formats, etc. + ''; + homepage = "https://vulkan.gpuinfo.org/"; + platforms = platforms.unix; + license = licenses.gpl2Only; + maintainers = with maintainers; [ pedrohlc ]; + }; +} diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 609df70be4d7..850b4fe920bd 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.32.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "sha256-3iizp1Dn6fxcNUgbK4RkD38Z7KrLUkZDDq3wnIPMjPY="; + sha256 = "sha256-gtRMoUEQEVoQXtA2PnVMLqrENUh5Jv8QiolqmeX5naQ="; }; vendorSha256 = "sha256-3ry93xV3KKtFoFGt2yxzMd4jx3QG2+8TBrEEywj7HPQ="; diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/tools/networking/hysteria/default.nix new file mode 100644 index 000000000000..6807b509adc7 --- /dev/null +++ b/pkgs/tools/networking/hysteria/default.nix @@ -0,0 +1,29 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: +buildGoModule rec { + pname = "hysteria"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "HyNetwork"; + repo = "hysteria"; + rev = "v${version}"; + sha256 = "sha256-V+umf7+qRANSNsMrU1Vij3ni6ayq/d41xSy3o+7sEHQ="; + }; + + vendorSha256 = "sha256-oxCZ4+E3kffHr8ca9BKCSYcSWQ8jwpzrFs0fvCvZyJE="; + proxyVendor = true; + + # Network required + doCheck = false; + + meta = with lib; { + description = "A feature-packed proxy & relay utility optimized for lossy, unstable connections"; + homepage = "https://github.com/HyNetwork/hysteria"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ oluceps ]; + }; +} diff --git a/pkgs/tools/security/expliot/default.nix b/pkgs/tools/security/expliot/default.nix index eb5fd03416f1..4c0318ffa3be 100644 --- a/pkgs/tools/security/expliot/default.nix +++ b/pkgs/tools/security/expliot/default.nix @@ -12,6 +12,7 @@ let inherit version; sha256 = "0qiax309my534drk81lihq9ghngr96qnm40kbmgc9ay4fncqq6kh"; }; + doCheck = false; }); }; }; diff --git a/pkgs/tools/security/faraday-agent-dispatcher/default.nix b/pkgs/tools/security/faraday-agent-dispatcher/default.nix index af3c3f8347ea..1442bba07fb6 100644 --- a/pkgs/tools/security/faraday-agent-dispatcher/default.nix +++ b/pkgs/tools/security/faraday-agent-dispatcher/default.nix @@ -49,6 +49,7 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ "test_execute_agent" + "SSL" ]; disabledTestPaths = [ diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 0b8bb97ec68c..fcdf35345819 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.82"; + version = "22.0"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "sha256-kFoOqMaejvlv8RnAcUPi03qrhV/Jcy8jQ4AQA1/eBsY="; + sha256 = "sha256-hjKF/fyV7/uQF6iJNOsRpX4Iw7aDURkdb7hbwfIDBPo="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix index 3b876c530609..129f02e80172 100644 --- a/pkgs/tools/wayland/wl-mirror/default.nix +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -14,6 +14,7 @@ , pipectl , slurp , rofi +, scdoc }: let @@ -27,17 +28,17 @@ in stdenv.mkDerivation rec { pname = "wl-mirror"; - version = "0.11.2"; + version = "0.12.1"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; rev = "v${version}"; - hash = "sha256-D5uUKaepcSW9v2x6uBeLGXAyuLorlt4Lb6lZD/prfp8="; + hash = "sha256-XuwHHJfUKYugx0CKxkloJnpm6s5rHetinsZCSlLJ0Zg="; }; strictDeps = true; - nativeBuildInputs = [ cmake pkg-config wayland-scanner makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config wayland-scanner scdoc makeWrapper ]; buildInputs = [ libGL wayland wayland-protocols wlr-protocols bash ]; postPatch = '' @@ -49,6 +50,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DINSTALL_EXAMPLE_SCRIPTS=${if installExampleScripts then "ON" else "OFF"}" + "-DINSTALL_DOCUMENTATION=ON" ]; postInstall = lib.optionalString installExampleScripts '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89cfbadd1990..740c605db4a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15364,7 +15364,8 @@ with pkgs; electron_16 electron_17 electron_18 - electron_19; + electron_19 + electron_20; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -21634,6 +21635,8 @@ with pkgs; vtk = vtk_8; vtkWithQt5 = vtk_8_withQt5; + vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { }; + vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { }; vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { inherit (darwin) moltenvk; }; @@ -27318,6 +27321,8 @@ with pkgs; fluxbox = callPackage ../applications/window-managers/fluxbox { }; + hackedbox = callPackage ../applications/window-managers/hackedbox { }; + fomp = callPackage ../applications/audio/fomp { }; formatter = callPackage ../applications/misc/formatter { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ba7623e80b7a..fd546e026b56 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -90,6 +90,7 @@ mapAliases ({ hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29 IMAPClient = imapclient; # added 2021-10-28 + imdbpy = throw "imdbpy has been renamed to cinemagoer"; # added 2022-08-08 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 jupyter_client = jupyter-client; # added 2021-10-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 497940bfaa33..e70f9ea81b7a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1702,6 +1702,8 @@ in { ci-py = callPackage ../development/python-modules/ci-py { }; + cinemagoer = callPackage ../development/python-modules/cinemagoer { }; + circuit-webhook = callPackage ../development/python-modules/circuit-webhook { }; circuitbreaker = callPackage ../development/python-modules/circuitbreaker { }; @@ -1894,6 +1896,8 @@ in { colorthief = callPackage ../development/python-modules/colorthief { }; + colorzero = callPackage ../development/python-modules/colorzero { }; + colour = callPackage ../development/python-modules/colour { }; cometblue-lite = callPackage ../development/python-modules/cometblue-lite { }; @@ -3772,6 +3776,8 @@ in { gpapi = callPackage ../development/python-modules/gpapi { }; + gpiozero = callPackage ../development/python-modules/gpiozero { }; + gplaycli = callPackage ../development/python-modules/gplaycli { }; gpgme = toPythonModule (pkgs.gpgme.override { @@ -4288,8 +4294,6 @@ in { imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn { }; - imdbpy = callPackage ../development/python-modules/imdbpy { }; - img2pdf = callPackage ../development/python-modules/img2pdf { }; imgaug = callPackage ../development/python-modules/imgaug { };