Update dependencies

2024-02-29 10:22:04 +01:00 · 2024-02-29 10:22:04 +01:00 · 12f2c5cb39
commit 12f2c5cb39
parent 0a3c0d4a4d
2 changed files with 18 additions and 160 deletions
--- a/flake.lock
+++ b/flake.lock
@ -45,11 +45,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1709131178,
-        "narHash": "sha256-DIQYss/w3qgZC5GEdLpGpBqROZc/AiHxFjD6tEGhzuk=",
+        "lastModified": 1709196028,
+        "narHash": "sha256-AejTGj57OvrMXT18zvB5fg2JCrfPapr2fQbX6QmTheI=",
        "owner": "accentor",
        "repo": "api",
-        "rev": "c21f54025a9e2e09224b91a459613a95a4c00006",
+        "rev": "b0ade581673a6911b793f58bf20617c0171b9e60",
        "type": "github"
      },
      "original": {
@ -72,11 +72,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1709131199,
-        "narHash": "sha256-vU7uA0rc626xD/2v1FVZ4Yne6QjTpmb837kn6LFMG4Q=",
+        "lastModified": 1709195992,
+        "narHash": "sha256-dPtmQ/kzYK7la/wUySq81//ifQP7cvGos78yyPV+1qs=",
        "owner": "accentor",
        "repo": "web",
-        "rev": "857e41b509b4aa8c0cf16dd2557e7371c4d89d3b",
+        "rev": "b46994b990870cb388001252d8cc9917e14eb674",
        "type": "github"
      },
      "original": {
@ -213,11 +213,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1709171133,
-        "narHash": "sha256-Q47jPqMW47AOX8HNLBnF0/oSUhKMLbOX57HFF0y9sm0=",
+        "lastModified": 1709197479,
+        "narHash": "sha256-2+Mu5f6sru7wfAXTo21EfYlTGEo4j8ddl4LrsBiv/6A=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "a9db0bffddf142648d9fc5be615dbc246d589296",
+        "rev": "88cb60b6c44861e422302371c0761a89377cf2c7",
        "type": "github"
      },
      "original": {
@ -476,11 +476,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1708984720,
-        "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=",
+        "lastModified": 1709150264,
+        "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538",
+        "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08",
        "type": "github"
      },
      "original": {
@ -554,11 +554,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1709182221,
-        "narHash": "sha256-NX2VXh/9yx2eB+co5si/482KO7EoMXgqDd2tIT3lsgU=",
+        "lastModified": 1709195539,
+        "narHash": "sha256-o0qA2uGQWsMp2KUOc3uwNlN6Ip2nVTrIDqyaLQ08GNk=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "fde0f4f35ebf2ed4d0308d84087f875f913e97a6",
+        "rev": "40f4664dfa27f5b5c938a01660d63a1bdecde35f",
        "type": "github"
      },
      "original": {
@ -771,11 +771,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1709127321,
-        "narHash": "sha256-9tGU/81y209JjgDKboZ3WJqCU07Z5AO9LcDwJPdnPRE=",
+        "lastModified": 1709195700,
+        "narHash": "sha256-gqtMnExEHu6SV+yP5f84eQTDuQrow8Z83BV2fBJdb4w=",
        "owner": "chvp",
        "repo": "tetris",
-        "rev": "3bf8971adb750ac13f7ebc07c8cccc8e23176275",
+        "rev": "df39ed8e7a1091484f26575534b378bc3d7e1385",
        "type": "github"
      },
      "original": {
--- a/patches/291173.patch
+++ b/patches/291173.patch
@ -1,142 +0,0 @@
-diff --git a/pkgs/by-name/cl/cld2/package.nix b/pkgs/by-name/cl/cld2/package.nix
-new file mode 100644
-index 00000000000000..bf28b160f2bab7
--- /dev/null
-+++ b/pkgs/by-name/cl/cld2/package.nix
-@@ -0,0 +1,50 @@
-+{ lib
-+, stdenv
-+, fetchFromGitHub
-+, cmake
-+, fetchpatch
-+}:
-+
-+stdenv.mkDerivation {
-+  pname = "cld2";
-+  version = "unstable-2015-08-21";
-+
-+  src = fetchFromGitHub {
-+    owner = "CLD2Owners";
-+    repo = "cld2";
-+    rev = "b56fa78a2fe44ac2851bae5bf4f4693a0644da7b";
-+    hash = "sha256-YhXs45IbriKWKULguZM4DgfV/Fzr73VHxA1pFTXCyv8=";
-+  };
-+
-+  patches = [
-+    (fetchpatch {
-+      name = "add-cmakelists.txt";
-+      url = "https://github.com/CLD2Owners/cld2/pull/65/commits/9cfac02c2ac7802ab7079560b38a474473c45f51.patch";
-+      hash = "sha256-uOjmUk8kMFl+wED44ErXoLRyblhgDwFx9K1Wj65Omh8=";
-+    })
-+  ];
-+
-+  nativeBuildInputs = [ cmake ];
-+
-+  meta = with lib; {
-+    homepage = "https://github.com/CLD2Owners/cld2";
-+    description = "Compact Language Detector 2";
-+    longDescription = ''
-+      CLD2 probabilistically detects over 80 languages in Unicode UTF-8 text,
-+      either plain text or HTML/XML. Legacy encodings must be converted to valid
-+      UTF-8 by the caller. For mixed-language input, CLD2 returns the top three
-+      languages found and their approximate percentages of the total text bytes
-+      (e.g. 80% English and 20% French out of 1000 bytes of text means about 800
-+      bytes of English and 200 bytes of French). Optionally, it also returns a
-+      vector of text spans with the language of each identified. This may be
-+      useful for applying different spelling-correction dictionaries or
-+      different machine translation requests to each span. The design target is
-+      web pages of at least 200 characters (about two sentences); CLD2 is not
-+      designed to do well on very short text, lists of proper names, part
-+      numbers, etc.
-+    '';
-+    license = licenses.asl20;
-+    maintainers = with maintainers; [ chvp ];
-+    platforms = platforms.all;
-+  };
-+}
-diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
-index 6f3f556e259287..46519c730446b9 100644
--- a/pkgs/tools/networking/mu/default.nix
-+++ b/pkgs/tools/networking/mu/default.nix
-@@ -1,21 +1,23 @@
- { lib
- , stdenv
- , fetchFromGitHub
-+, glibcLocales
- , meson
- , ninja
- , pkg-config
-+, python3
-+, cld2
- , coreutils
- , emacs
- , glib
- , gmime3
- , texinfo
- , xapian
-, fetchpatch
- }:
- 
- stdenv.mkDerivation rec {
-   pname = "mu";
-  version = "1.10.8";
-+  version = "1.12.0";
- 
-   outputs = [ "out" "mu4e" ];
- 
-@@ -23,23 +25,17 @@ stdenv.mkDerivation rec {
-     owner = "djcb";
-     repo = "mu";
-     rev = "v${version}";
-    hash = "sha256-cDfW0yXA+0fZY5lv4XCHWu+5B0svpMeVMf8ttX/z4Og=";
-+    hash = "sha256-z0sHDZlhsSeIf+ZRCni3j/DbfYrmn6bvYmKpt4PA2i8=";
-   };
- 
-  patches = [
-    (fetchpatch {
-      name = "add-mu4e-pkg.el";
-      url = "https://github.com/djcb/mu/commit/00f7053d51105eea0c72151f1a8cf0b6d8478e4e.patch";
-      hash = "sha256-21c7djmYTcqyyygqByo9vu/GsH8WMYcq8NOAvJsS5AQ=";
-    })
-  ];
-
-   postPatch = ''
-    # Fix mu4e-builddir (set it to $out)
-    substituteInPlace mu4e/mu4e-config.el.in \
-      --replace "@abs_top_builddir@" "$out"
-    substituteInPlace lib/utils/mu-test-utils.cc \
-      --replace "/bin/rm" "${coreutils}/bin/rm"
-+    substituteInPlace lib/utils/mu-utils-file.cc \
-+      --replace-fail "/bin/rm" "${coreutils}/bin/rm"
-+    substituteInPlace lib/tests/bench-indexer.cc \
-+      --replace-fail "/bin/rm" "${coreutils}/bin/rm"
-+    substituteInPlace lib/mu-maildir.cc \
-+      --replace-fail "/bin/mv" "${coreutils}/bin/mv"
-+    patchShebangs build-aux/date.py
-   '';
- 
-   postInstall = ''
-@@ -61,7 +57,7 @@ stdenv.mkDerivation rec {
-     fi
-   '';
- 
-  buildInputs = [ emacs glib gmime3 texinfo xapian ];
-+  buildInputs = [ cld2 emacs glib gmime3 texinfo xapian ];
- 
-   mesonFlags = [
-     "-Dguile=disabled"
-@@ -69,10 +65,13 @@ stdenv.mkDerivation rec {
-     "-Dlispdir=${placeholder "mu4e"}/share/emacs/site-lisp"
-   ];
- 
-  nativeBuildInputs = [ pkg-config meson ninja ];
-+  nativeBuildInputs = [ pkg-config meson ninja python3 glibcLocales ];
- 
-   doCheck = true;
- 
-+  # Tests need a UTF-8 aware locale configured
-+  env.LANG = "C.UTF-8";
-+
-   meta = with lib; {
-     description = "A collection of utilities for indexing and searching Maildirs";
-     license = licenses.gpl3Plus;