diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
| commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
| tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/servers/heisenbridge | |
| parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
| parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
| download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/servers/heisenbridge')
| -rw-r--r-- | nixpkgs/pkgs/servers/heisenbridge/default.nix | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/servers/heisenbridge/default.nix b/nixpkgs/pkgs/servers/heisenbridge/default.nix index 8d1e0c340a70..c2e75335f1fc 100644 --- a/nixpkgs/pkgs/servers/heisenbridge/default.nix +++ b/nixpkgs/pkgs/servers/heisenbridge/default.nix @@ -1,43 +1,28 @@ -{ lib, fetchFromGitHub, fetchpatch, python3 }: +{ lib, fetchFromGitHub, python3 }: -let - python = python3.override { - packageOverrides = self: super: { - mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec { - version = "0.16.10"; - src = fetchFromGitHub { - owner = "mautrix"; - repo = "python"; - rev = "v${version}"; - hash = "sha256-YQsQ7M+mHcRdGUZp+mo46AlBmKSdmlgRdGieEG0Hu9k="; - }; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "heisenbridge"; - version = "1.14.2"; + version = "1.14.4"; src = fetchFromGitHub { owner = "hifi"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-qp0LVcmWf5lZ52h0V58S6FoIM8RLOd6Y3FRb85j7KRg="; + sha256 = "sha256-4poHHwJ9WcOTTwOtPfANMqusaLltaoLryxNMQE1Parc="; }; postPatch = '' echo "${version}" > heisenbridge/version.txt ''; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ irc ruamel-yaml mautrix python-socks ]; - nativeCheckInputs = with python.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; |