From a38f442552f5de71e338fbc9ba269dab336bcb1a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 22:44:49 +0000 Subject: [PATCH 1/2] mtxclient: 0.3.0 -> 0.3.1 --- pkgs/development/libraries/mtxclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 22b66442305..842d144005d 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "0vf5xmn6yfi5lvskfgrdmnalvclzrapcrml92bj9qaa8vq8mfsf2"; + sha256 = "1dg4dq20g0ah62j5s3gpsxqq4ny7lxkxdxa9q6g54hdwkrb9ms7x"; }; cmakeFlags = [ From 02a712166b1d723725de43725d2a9a8e89b00a0f Mon Sep 17 00:00:00 2001 From: Philipp Date: Thu, 25 Jun 2020 15:01:54 +0200 Subject: [PATCH 2/2] nheko: 0.7.1 -> 0.7.2 Signed-off-by: Philipp --- .../instant-messengers/nheko/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index f3b304564cb..2f5316c9fe2 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -24,13 +24,13 @@ mkDerivation rec { pname = "nheko"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "12sxibbrn79sxkf9jrm7jrlj7l5vz15claxrrll7pkv9mv44wady"; + sha256 = "1cbhgaf9klgxdirrxj571fqwspm0byl75c1xc40l727a6qswvp7s"; }; nativeBuildInputs = [ @@ -38,20 +38,6 @@ mkDerivation rec { cmake 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 = [ nlohmann_json