about summary refs log tree commit diff
path: root/pkgs/applications/networking/instant-messengers/twinkle
diff options
context:
space:
mode:
authorMaciej Krüger <mkg20001@gmail.com>2021-11-21 07:19:17 +0100
committerMaciej Krüger <mkg20001@gmail.com>2021-11-30 18:39:58 +0100
commit195f13535760590432fabc737a428b96edaea883 (patch)
treee0966c2e1e44045744f45fc3c28b5e1ee29eb512 /pkgs/applications/networking/instant-messengers/twinkle
parente14fadd95ceb4d0b04e54a5e28cf0329a9e13c3a (diff)
twinkle: 1.10.2 -> unstable-2021-02-06
Includes many useful fixes,
asked upstream about new release

https://github.com/LubosD/twinkle/issues/239

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/twinkle')
-rw-r--r--pkgs/applications/networking/instant-messengers/twinkle/default.nix22
1 files changed, 4 insertions, 18 deletions
diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
index 01c83ba7b1cce..3dd912da90d79 100644
--- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix
+++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
@@ -15,20 +15,19 @@
 , alsa-lib
 , speex
 , ilbc
-, fetchurl
 , mkDerivation
 , bcg729
 }:
 
 mkDerivation rec {
   pname = "twinkle";
-  version = "1.10.2";
+  version = "unstable-2021-02-06";
 
   src = fetchFromGitHub {
-    repo = pname;
     owner = "LubosD";
-    rev = "v${version}";
-    sha256 = "0s0gi03xwvzp02ah4q6j33r9jx9nbayr6dxlg2ck9pwbay1nq1hx";
+    repo = "twinkle";
+    rev = "2301b66a3f54b266675415d261985488d86e9e4c";
+    sha256 = "xSwcaj1Hm62iL7C/AxqjVR07VEae8gDgYdr2EWmCoOM=";
   };
 
   buildInputs = [
@@ -46,19 +45,6 @@ mkDerivation rec {
     ilbc
   ];
 
-  patches = [
-    # patch for bcg729 1.0.2+
-    (fetchurl { # https://github.com/LubosD/twinkle/pull/152
-      url = "https://github.com/LubosD/twinkle/compare/05082ae12051821b1d969e6672d9e4e5afe1bc07...7a6c533cda387652b5b4cb2a867be1a18585890c.patch";
-      sha256 = "39fc6cef3e88cfca8db44612b2d082fb618027b0f99509138d3c0d2777a494c2";
-    })
-    # patch manual link to not link to old url, which now points to NSFW page
-    (fetchurl { # https://github.com/LubosD/twinkle/commit/05082ae12051821b1d969e6672d9e4e5afe1bc07
-      url = "https://github.com/LubosD/twinkle/commit/05082ae12051821b1d969e6672d9e4e5afe1bc07.diff";
-      sha256 = "1iamragr9wp2vczsnp6n261fpr1ai2nc2abp0228jlar9zafksw0";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     bison