public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91490 from pstn/nheko-0.7.2

Browse Source 
Nheko 0.7.2
This commit is contained in:
Maximilian Bosch 2020-06-28 00:43:56 +02:00 committed by GitHub
commit 7f742e405a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/networking/instant-messengers/nheko/default.nix
View File

@ -24,13 +24,13 @@
mkDerivation rec { mkDerivation rec {
pname = "nheko"; pname = "nheko";
version = "0.7.1"; version = "0.7.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Nheko-Reborn"; owner = "Nheko-Reborn";
repo = "nheko"; repo = "nheko";
rev = "v${version}"; rev = "v${version}";
sha256 = "12sxibbrn79sxkf9jrm7jrlj7l5vz15claxrrll7pkv9mv44wady"; sha256 = "1cbhgaf9klgxdirrxj571fqwspm0byl75c1xc40l727a6qswvp7s";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -38,20 +38,6 @@ mkDerivation rec {
cmake cmake
pkgconfig pkgconfig
]; ];
cmakeFlags = [
# Can be removed once either https://github.com/NixOS/nixpkgs/pull/85254 or
# https://github.com/NixOS/nixpkgs/pull/73940 are merged
"-DBoost_NO_BOOST_CMAKE=TRUE"
];
# commit missing from latest release and recommended by upstream:
# https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619263903
patches = [
(fetchpatch {
name = "room-ids-escape-patch";
url = "https://github.com/Nheko-Reborn/nheko/commit/d94ac86816f9f325cba11f71344a3ca99591130d.patch";
sha256 = "1p0kj4a60l3jf0rfakc88adld7ccg3vfjhzia5rf2i03h35cxw8c";
})
];
buildInputs = [ buildInputs = [
nlohmann_json nlohmann_json

4
pkgs/development/libraries/mtxclient/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mtxclient"; pname = "mtxclient";
version = "0.3.0"; version = "0.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Nheko-Reborn"; owner = "Nheko-Reborn";
repo = "mtxclient"; repo = "mtxclient";
rev = "v${version}"; rev = "v${version}";
sha256 = "0vf5xmn6yfi5lvskfgrdmnalvclzrapcrml92bj9qaa8vq8mfsf2"; sha256 = "1dg4dq20g0ah62j5s3gpsxqq4ny7lxkxdxa9q6g54hdwkrb9ms7x";
}; };
cmakeFlags = [ cmakeFlags = [