diff options
9 files changed, 118 insertions, 29 deletions
diff --git a/pkgs/applications/backup/unifi-protect-backup/default.nix b/pkgs/applications/backup/unifi-protect-backup/default.nix index 16169e98b1ff..d1610516f6f6 100644 --- a/pkgs/applications/backup/unifi-protect-backup/default.nix +++ b/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -1,4 +1,7 @@ -{ fetchFromGitHub, python3, lib }: +{ lib +, fetchFromGitHub +, python3 +}: python3.pkgs.buildPythonApplication rec { pname = "unifi-protect-backup"; @@ -13,15 +16,20 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-Z8qK7LprMyXl5irx9Xrs/RgqvNcFVBqLBSljovr6oiE="; }; - preBuild = '' - sed -i 's_click = "8.0.1"_click = "^8"_' pyproject.toml - sed -i 's_pyunifiprotect = .*_pyunifiprotect = "*"_' pyproject.toml - sed -i 's_aiorun = .*_aiorun = "*"_' pyproject.toml - sed -i '/pylint/d' pyproject.toml - ''; + pythonRelaxDeps = [ + "aiorun" + "aiosqlite" + "click" + "pyunifiprotect" + ]; + + pythonRemoveDeps = [ + "pylint" + ]; nativeBuildInputs = with python3.pkgs; [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ @@ -39,7 +47,8 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Python tool to backup unifi event clips in realtime"; homepage = "https://github.com/ep1cman/unifi-protect-backup"; - maintainers = with maintainers; [ ajs124 ]; + changelog = "https://github.com/ep1cman/unifi-protect-backup/blob/v${version}/CHANGELOG.md"; license = licenses.mit; + maintainers = with maintainers; [ ajs124 ]; }; } diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index ce64ec0d65ef..f1abf5834837 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "remmina"; - version = "1.4.28"; + version = "1.4.29"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "sha256-w0z7teful/sdp7/f4X8eqF9Ny3bhP542V0tutQi/yXI="; + sha256 = "sha256-8B19rqbOYY+lS3Q/vh3Eu696KW03SOvlP9dgXPYYDiU="; }; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; diff --git a/pkgs/desktops/budgie/budgie-screensaver/default.nix b/pkgs/desktops/budgie/budgie-screensaver/default.nix new file mode 100644 index 000000000000..cee9cecfa47d --- /dev/null +++ b/pkgs/desktops/budgie/budgie-screensaver/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, dbus-glib +, glib +, gnome-desktop +, gtk3 +, intltool +, libgnomekbd +, libX11 +, linux-pam +, meson +, ninja +, pkg-config +, systemd +, wrapGAppsHook +, xorg +}: + +stdenv.mkDerivation rec { + pname = "budgie-screensaver"; + version = "5.1.0"; + + src = fetchFromGitHub { + owner = "BuddiesOfBudgie"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-N8x9hdbaMDisTbQPJedNO4UMLnCn+Q2hhm4udJZgQlc="; + }; + + nativeBuildInputs = [ + intltool + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + dbus-glib + glib + gnome-desktop + gtk3 + libgnomekbd + libX11 + linux-pam + systemd + xorg.libXxf86vm + ]; + + NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE"; + + meta = with lib; { + description = "A fork of old GNOME Screensaver for purposes of providing an authentication prompt on wake"; + homepage = "https://github.com/BuddiesOfBudgie/budgie-screensaver"; + mainProgram = "budgie-screensaver"; + platforms = platforms.linux; + maintainers = [ maintainers.federicoschonborn ]; + license = licenses.gpl2Only; + }; +} diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix new file mode 100644 index 000000000000..491db246187b --- /dev/null +++ b/pkgs/desktops/budgie/default.nix @@ -0,0 +1,5 @@ +{ lib, pkgs }: + +lib.makeScope pkgs.newScope (self: with self; { + budgie-screensaver = callPackage ./budgie-screensaver { }; +}) diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix index 022e34e23c1b..eb85dccf50d2 100644 --- a/pkgs/development/python-modules/aiosqlite/default.nix +++ b/pkgs/development/python-modules/aiosqlite/default.nix @@ -1,37 +1,49 @@ { lib , aiounittest , buildPythonPackage -, fetchPypi -, isPy27 +, fetchFromGitHub +, flit-core , pytestCheckHook -, typing-extensions +, pythonOlder }: buildPythonPackage rec { pname = "aiosqlite"; - version = "0.17.0"; - disabled = isPy27; + version = "0.18.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-8OaswkvEhkFJJnrIL7Rt+zvkRV+Z/iHfgmCcxua67lE="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "omnilib"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-yPGSKqjOz1EY5/V0oKz2EiZ90q2O4TINoXdxHuB7Gqk="; }; + nativeBuildInputs = [ + flit-core + ]; + checkInputs = [ aiounittest pytestCheckHook - typing-extensions ]; - # tests are not pick-up automatically by the hook - pytestFlagsArray = [ "aiosqlite/tests/*.py" ]; + # Tests are not pick-up automatically by the hook + pytestFlagsArray = [ + "aiosqlite/tests/*.py" + ]; - pythonImportsCheck = [ "aiosqlite" ]; + pythonImportsCheck = [ + "aiosqlite" + ]; meta = with lib; { description = "Asyncio bridge to the standard sqlite3 module"; homepage = "https://github.com/jreese/aiosqlite"; + changelog = "https://github.com/omnilib/aiosqlite/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index a21a09458b55..ffc27705d3e3 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.10.0"; + version = "3.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5j8daEVqDEQKHU/XbZ9U6qp0Aaye0KUzJMyj9fiJtRs="; + hash = "sha256-wu53nKA4nmXHuJ+dr9r/A9xDYec1bkW4S8gfgiLBctw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 1a6e8b1d43a4..8d0a2d55f82d 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.1.0"; + version = "2023.1.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-NS5X/camPjQxQ6paJxu1qpw+Dv2b/dJrA5OkzUufCR0="; + sha256 = "sha256-UxW80Lp8hATZFxFCxxD0p8BtqYhTl3UhwcM/+abN43c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index d9253d5ce02b..92ca2f52939a 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.12.2"; + version = "7.12.3"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-G9Y37QC6Co4tUemtmOf5Dawt0VWopWT5/Np0J7sF10k="; + hash = "sha256-cAbDw/u0kLUEdmd/NBNDy/bt5Wno9QpmqpqicqZ/Q6g="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62a15752fea4..2fbd50e7efe5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35423,6 +35423,8 @@ with pkgs; arcanPackages = recurseIntoAttrs (callPackage ../desktops/arcan { }); + budgie = recurseIntoAttrs (callPackage ../desktops/budgie { }); + cdesktopenv = callPackage ../desktops/cdesktopenv { }; cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); |