diff options
-rw-r--r-- | pkgs/applications/video/showmethekey/default.nix | 12 | ||||
-rw-r--r-- | pkgs/by-name/me/meli/package.nix (renamed from pkgs/applications/networking/mailreaders/meli/default.nix) | 11 | ||||
-rw-r--r-- | pkgs/development/python-modules/pywaze/default.nix | 39 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 35 insertions, 39 deletions
diff --git a/pkgs/applications/video/showmethekey/default.nix b/pkgs/applications/video/showmethekey/default.nix index cd61cfc9d0d44..ef30ed13784c0 100644 --- a/pkgs/applications/video/showmethekey/default.nix +++ b/pkgs/applications/video/showmethekey/default.nix @@ -12,15 +12,16 @@ , libxkbcommon , pkg-config }: + stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "AlynxZhou"; - repo = pname; - rev = "v${version}"; - hash = "sha256-eeObomb4Gv/vpvViHsi3+O0JR/rYamrlZNZaXKL6KJw="; + repo = "showmethekey"; + rev = "refs/tags/v${version}"; + hash = "sha256-pVFkO/+a7GAOXbYBfU0zcO/uD26PX+y02bEZa3f1ZP8="; }; nativeBuildInputs = [ @@ -40,8 +41,9 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://showmethekey.alynx.one/"; description = "Show keys you typed on screen"; + homepage = "https://showmethekey.alynx.one/"; + changelog = "https://github.com/AlynxZhou/showmethekey/releases/tag/v${version}"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ ocfox ]; diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/by-name/me/meli/package.nix index 3dc373a09024f..a4ff654ad892c 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/by-name/me/meli/package.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchgit +, fetchzip , rustPlatform # native build inputs @@ -24,9 +24,12 @@ rustPlatform.buildRustPackage rec { pname = "meli"; version = "0.8.4"; - src = fetchgit { - url = "https://git.meli-email.org/meli/meli.git"; - rev = "v${version}"; + src = fetchzip { + urls = [ + "https://git.meli-email.org/meli/meli/archive/v${version}.tar.gz" + "https://codeberg.org/meli/meli/archive/v${version}.tar.gz" + "https://github.com/meli/meli/archive/refs/tags/v${version}.tar.gz" + ]; hash = "sha256-wmIlYgXB17/i9Q+6C7pbcEjVlEuvhmqrSH+cDmaBKLs="; }; diff --git a/pkgs/development/python-modules/pywaze/default.nix b/pkgs/development/python-modules/pywaze/default.nix index 70734fd59da32..c47817f21bbef 100644 --- a/pkgs/development/python-modules/pywaze/default.nix +++ b/pkgs/development/python-modules/pywaze/default.nix @@ -1,18 +1,19 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, hatchling -, httpx -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, respx +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + httpx, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + respx, }: buildPythonPackage rec { pname = "pywaze"; - version = "1.0.0"; - format = "pyproject"; + version = "1.0.1"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -20,21 +21,17 @@ buildPythonPackage rec { owner = "eifinger"; repo = "pywaze"; rev = "refs/tags/v${version}"; - hash = "sha256-n5W8TdZZJmT7SECXE8k6WK2lmCcucA6eLm+LZpojERo="; + hash = "sha256-sWI9kUR0SSqE97an/YfvhQqmrK+OEWXRzG4MBYyp8Jg="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "--cov --cov-report term-missing --cov=src/pywaze " "" + --replace-fail "--cov --cov-report term-missing --cov=src/pywaze " "" ''; - nativeBuildInputs = [ - hatchling - ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ - httpx - ]; + dependencies = [ httpx ]; nativeCheckInputs = [ pytest-asyncio @@ -42,9 +39,7 @@ buildPythonPackage rec { respx ]; - pythonImportsCheck = [ - "pywaze" - ]; + pythonImportsCheck = [ "pywaze" ]; meta = with lib; { description = "Module for calculating WAZE routes and travel times"; diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 8d87ee3598ec6..b7840b554beee 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,16 +6,14 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.6.28"; - suffix = "xanmod2"; - hash = "sha256-U5L7i/g808GuUZhLjHE+v0VOQVdTPe+Tnx/rLQoGxx4="; + version = "6.6.29"; + hash = "sha256-Be2VaW0DQDS0FJUwXM627QaNgrn1B3Hbyq+PiKb7b+k="; variant = "lts"; }; mainVariant = { - version = "6.8.7"; - suffix = "xanmod2"; - hash = "sha256-/RhtRASEedYI4Zf9pUiiyDD3SgOL46cutTXo68gjBg8="; + version = "6.8.8"; + hash = "sha256-6fT9vRjHw775m4ySUAUWU9R0dz/cWYYdZsPCwZjGiXM="; variant = "main"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca62e00e4f355..ee250c1d0ce72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32827,8 +32827,6 @@ with pkgs; meld = callPackage ../applications/version-management/meld { }; - meli = callPackage ../applications/networking/mailreaders/meli { }; - melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { }; melody = callPackage ../tools/misc/melody { }; |