about summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2024-01-22 20:38:04 +0100
committeraszlig <aszlig@nix.build>2024-01-22 20:38:04 +0100
commit19bc1ea43fc17f2a184bf839583d51552e999193 (patch)
tree8342e8cd376dc8cfd6427f061693f38d9a040225
parent438e73ece59363667edaffb38a3e61836cbb3654 (diff)
psi: Update to latest master
This is mainly because of the following build failure that seems to have
been fixed upstream:

  widgets/emojiregistry.cpp: In member function 'EmojiRegistry::Category EmojiRegistry::startCategory(QStringRef) const':
  widgets/emojiregistry.cpp:40:10: error: 'uint32_t' is not a member of 'std'; did you mean 'wint_t'?
     40 |     std::uint32_t ucs;
        |          ^~~~~~~~
        |          wint_t
  widgets/emojiregistry.cpp:44:9: error: 'ucs' was not declared in this scope
     44 |         ucs = QChar::surrogateToUcs4(in[0], in[1]);
        |         ^~~
  widgets/emojiregistry.cpp:46:9: error: 'ucs' was not declared in this scope
     46 |         ucs = in[0].unicode();
        |         ^~~
  widgets/emojiregistry.cpp:51:9: error: 'ucs' was not declared in this scope
     51 |     if (ucs == 0x200d)
        |         ^~~
  widgets/emojiregistry.cpp:53:9: error: 'ucs' was not declared in this scope
     53 |     if (ucs == 0xfe0f)
        |         ^~~
  widgets/emojiregistry.cpp:55:9: error: 'ucs' was not declared in this scope
     55 |     if (ucs <= 0x39 && in.length() > 2 && (ucs >= 0x30 || ucs == 0x2a || ucs == 0x23) && in[1].unicode() == 0xfe0f
        |         ^~~
  widgets/emojiregistry.cpp:61:38: error: 'ucs' was not declared in this scope
     61 |     auto lb    = ranges_.lower_bound(ucs);
        |                                      ^~~

Of course, the second reason is that the current version seems to be way
too stable and I want to have a fresh round of new bugs.

Signed-off-by: aszlig <aszlig@nix.build>
-rw-r--r--pkgs/aszlig/psi/default.nix16
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/aszlig/psi/default.nix b/pkgs/aszlig/psi/default.nix
index b3be0926..54730838 100644
--- a/pkgs/aszlig/psi/default.nix
+++ b/pkgs/aszlig/psi/default.nix
@@ -12,19 +12,19 @@ let
   qdarkstyle = fetchFromGitHub {
     owner = "ColinDuquesnoy";
     repo = "QDarkStyleSheet";
-    rev = "6ff5fdfd7b1e2a538b6f22bd85dd05a817d24c45";
-    hash = "sha256-NyoIBKjSAtTPNAou+o2yy1jTo51/FEejKo8nbSjlNbE";
+    rev = "6f3962e63749893f951be73ebfec93e83fffebf2";
+    hash = "sha256-fPyavFjsyffFKgQzJYFHLUMcz44zv87P/WeBGHzlNew";
   };
 
   usrsctp = stdenv.mkDerivation {
     pname = "usrsctp";
-    version = "git20230524";
+    version = "git20240111";
 
     src = fetchFromGitHub {
       owner = "sctplab";
       repo = "usrsctp";
-      rev = "ac559d2a95277e5e0827e9ee5a1d3b1b50e0822a";
-      hash = "sha256-CIdLGBVCVjz3LFAZXc0IcYsQUOG2NpgEHsWNpzs97gI";
+      rev = "265f20562e4d3fa977c6d9e09d0631b8125ac949";
+      hash = "sha256-4EH67xFeLSad7klQNPKV0Nyq0KAV8LcqK9Wx9QsuboA";
     };
 
     nativeBuildInputs = [ cmake ];
@@ -32,13 +32,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "psi-${version}";
-  version = "2.0git20230530aszlig";
+  version = "2.0git20231104aszlig";
 
   src = fetchFromGitHub {
     owner = "psi-im";
     repo = "psi";
-    rev = "718c3dfef7f374e2de601b89a22421a139e17fa6";
-    hash = "sha256-514+4A+ij0rYBeGiIxHtkUFL/Tf6CQh2kRXVLYUdnTc";
+    rev = "83a8dfb87ad0b882be49fd43de75c805464a8c2b";
+    hash = "sha256-ya5qMh5kIMvPUOcfY+B3952Q8SBg+QstGI9/8GsoYRk";
     fetchSubmodules = true;
   };