Merge branch 'NixOS:master' into master

prinzdezibel · Dec 10, 2024 · a448965 · a448965
2 parents 61abf83 + f79961a
commit a448965
Show file tree

Hide file tree

Showing 35 changed files with 547 additions and 97 deletions.
diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix
@@ -20,14 +20,14 @@
 let
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "24.11.2";
+  version = "24.12.1";
 in
 stdenv.mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
-    hash = "sha256-U1yxPAYFGSNbTjpFKXcAtlsHt9u4bgSf91WtOjziT8k=";
+    hash = "sha256-OiaZmd50kOTJSJesBYFdjjKzNUc/m7XrU5S27z0mtAI=";
   };
 
   nativeBuildInputs = [

diff --git a/pkgs/by-name/al/alacritty-theme/package.nix b/pkgs/by-name/al/alacritty-theme/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation (self: {
   pname = "alacritty-theme";
-  version = "0-unstable-2024-10-24";
+  version = "0-unstable-2024-12-02";
 
   src = fetchFromGitHub {
     owner = "alacritty";
     repo = "alacritty-theme";
-    rev = "c424c57c8a2b6a62b6602d61ebfbc7e50f2c81d8";
-    hash = "sha256-KdjysVDs4oGU9gQwkW36aHmK30KiCdVNiREJOAETxNw=";
+    rev = "95a7d695605863ede5b7430eb80d9e80f5f504bc";
+    hash = "sha256-D37MQtNS20ESny5UhW1u6ELo9czP4l+q0S8neH7Wdbc=";
   };
 
   dontConfigure = true;

diff --git a/pkgs/by-name/ba/badger/package.nix b/pkgs/by-name/ba/badger/package.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "badger";
-  version = "4.4.0";
+  version = "4.5.0";
 
   src = fetchFromGitHub {
     owner = "dgraph-io";
     repo = "badger";
     rev = "v${version}";
-    hash = "sha256-2d+OnSEERWx2JNYawbnuorBl6uIIoi2oO5n7uCsUzFo=";
+    hash = "sha256-J9ayW+Q6ODCDlGQ1bFt5Gd2chVsVfEetny5GPklOK5E=";
   };
 
-  vendorHash = "sha256-iaTR7V8l66BEadAiCftUZy7Gr+fdLRNnvBbtwdU/m/k=";
+  vendorHash = "sha256-0hQcaXsFUh3vYOMr2eqfMPfgy7LjiU1icOzWAgQFmTE=";
 
   subPackages = [ "badger" ];
 

diff --git a/pkgs/by-name/c3/c3-lsp/package.nix b/pkgs/by-name/c3/c3-lsp/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "c3-lsp";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "pherrymason";
     repo = "c3-lsp";
     rev = "v${version}";
-    hash = "sha256-HD3NE2L1ge0pf8vtrKkYh4GIZg6lSPTZGFQ+LPbDup4=";
+    hash = "sha256-1EuDXQGzqNM19SRokM9GGzA2ZcD0XaCbywErVSjINIM=";
   };
 
   sourceRoot = "${src.name}/server";
 
-  vendorHash = "sha256-y+Qs3zuvTq/KRc1ziH0R7E10et+MaQW9xOsFmSdI7PM=";
+  vendorHash = "sha256-7g0Z392ksrvV+D9nMw325BykwLd9mvXRS1Zv6RNSs0w=";
 
   postInstall = ''
     mv $out/bin/lsp $out/bin/c3-lsp

diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   pname = "codeql";
-  version = "2.19.3";
+  version = "2.19.4";
 
   dontConfigure = true;
   dontBuild = true;
   dontStrip = true;
 
   src = fetchzip {
     url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    hash = "sha256-MLX4xyK0nFMyiXCL3+q0kOjP3S7uK1tVF9lnhyxbTSE=";
+    hash = "sha256-eRRZwtrTOWsebDm5uAj/ABFrlbov39e6Xeb+K7WAIG8=";
   };
 
   nativeBuildInputs = [

diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "databricks-cli";
-  version = "0.234.0";
+  version = "0.236.0";
 
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-I1S31a1JvXFXWw4EkS40efKEE9wsQlMdjVxEJDRTzA8=";
+    hash = "sha256-ldxRPZQgbr9FHqekjYdr+puLLq4AtXZ75sVeCmrPq9k=";
   };
 
-  vendorHash = "sha256-Zih5NftJMbtLYG0Sej1BaErJ8NnU25mwhl3pfqSOSxc=";
+  vendorHash = "sha256-S2j4cnTH9uB97v6SRnphWXBr9yWTTcoWn0OF4iiDt2g=";
 
   excludedPackages = [ "bundle/internal" ];
 

diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "fabric-ai";
-  version = "1.4.99";
+  version = "1.4.119";
 
   src = fetchFromGitHub {
     owner = "danielmiessler";
     repo = "fabric";
     rev = "v${version}";
-    hash = "sha256-nf1tBnnRgLDg63a6SmTJPwMKCREr/hfCyYtAyyOCUQU=";
+    hash = "sha256-+KmhOMboSZU5LInNbknz3f3lIUGygApeefr1aaA44V0=";
   };
 
-  vendorHash = "sha256-cdopwdIynWJQJO2K6wLZNBT/0JbCRH2tD2UgnNeQTDY=";
+  vendorHash = "sha256-adBp4ehQIME0x7YmCLEFqZHAMrTXry7pYXFagBHXxGE=";
 
   ldflags = [
     "-s"

diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix
@@ -13,13 +13,13 @@
 }:
 let
   pname = "flclash";
-  version = "0.8.69";
+  version = "0.8.70";
   src =
     (fetchFromGitHub {
       owner = "chen08209";
       repo = "FlClash";
       tag = "v${version}";
-      hash = "sha256-T9sqHzqnOvZG95EJegqT6TqOOrAuqzjNvVQWLyeQwng=";
+      hash = "sha256-6gDkRqbAGqwF+HCThWAHK0Jh/dxaYlnaYaAiXN48z5E=";
       fetchSubmodules = true;
     }).overrideAttrs
       (_: {

diff --git a/pkgs/by-name/fl/flclash/pubspec.lock.json b/pkgs/by-name/fl/flclash/pubspec.lock.json
@@ -1250,7 +1250,7 @@
       "version": "0.28.0"
     },
     "screen_retriever": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "screen_retriever",
         "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c",

diff --git a/pkgs/by-name/he/healthchecks/package.nix b/pkgs/by-name/he/healthchecks/package.nix
@@ -14,14 +14,14 @@ let
 in
 py.pkgs.buildPythonApplication rec {
   pname = "healthchecks";
-  version = "3.7";
+  version = "3.8";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "healthchecks";
     repo = pname;
-    rev = "refs/tags/v${version}";
-    sha256 = "sha256-pPO1ktPeiXKNryUe74Zeqd7q92yDs3kplEkwEfuvNh8=";
+    tag = "v${version}";
+    sha256 = "sha256-RVmIaobts6GT1I4pc5/kZblbo6CwwQ33m3xBruSXZss=";
   };
 
   propagatedBuildInputs = with py.pkgs; [

diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "mihomo";
-  version = "1.18.10";
+  version = "1.19.0";
 
   src = fetchFromGitHub {
     owner = "MetaCubeX";
     repo = "mihomo";
     rev = "v${version}";
-    hash = "sha256-VbqIlaocee+IxL3DDXr17ZmvDsRqJEuST/1HcU0bJds=";
+    hash = "sha256-SUXxNHsbqbRtky456irkFotjMlbXPuBhNrHHZABGbPM=";
   };
 
-  vendorHash = "sha256-6pbrBcDTE46YTWn0CTv9Nip7iUqS8xDbHGZ7VzqDnTc=";
+  vendorHash = "sha256-whH9nEUddXd+xkgoCatkmfddTxK3BFZdi/TyTiabnDc=";
 
   excludedPackages = [ "./test" ];
 

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
@@ -41,13 +41,13 @@ assert builtins.elem acceleration [
 let
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     rev = "v${version}";
-    hash = "sha256-WbRs7CdPKIEqxJUZjPT4ZzuWBl+OfGu2dzwjNVrSgVw=";
+    hash = "sha256-llsK/rMK1jf2uneqgon9gqtZcbC9PuCDxoYfC7Ta6PY=";
     fetchSubmodules = true;
   };
 

diff --git a/pkgs/by-name/pl/platformsh/versions.json b/pkgs/by-name/pl/platformsh/versions.json
@@ -1,19 +1,19 @@
 {
-  "version": "5.0.22",
+  "version": "5.0.23",
   "darwin-amd64": {
-    "hash": "sha256-2pMflIUyFWUUe7wXMawIlSqf1S/w7is75yzli26p+LM=",
-    "url": "https://github.com/platformsh/cli/releases/download/5.0.22/platform_5.0.22_darwin_all.tar.gz"
+    "hash": "sha256-u82W5pwJQi0RqhRkQgY9SDahi4HvintFwXG6q+FlBR0=",
+    "url": "https://github.com/platformsh/cli/releases/download/5.0.23/platform_5.0.23_darwin_all.tar.gz"
   },
   "darwin-arm64": {
-    "hash": "sha256-2pMflIUyFWUUe7wXMawIlSqf1S/w7is75yzli26p+LM=",
-    "url": "https://github.com/platformsh/cli/releases/download/5.0.22/platform_5.0.22_darwin_all.tar.gz"
+    "hash": "sha256-u82W5pwJQi0RqhRkQgY9SDahi4HvintFwXG6q+FlBR0=",
+    "url": "https://github.com/platformsh/cli/releases/download/5.0.23/platform_5.0.23_darwin_all.tar.gz"
   },
   "linux-amd64": {
-    "hash": "sha256-j/aInQwN3K3pfXzIkDE6pA/6nc7TSndWZkFFdqlsJW4=",
-    "url": "https://github.com/platformsh/cli/releases/download/5.0.22/platform_5.0.22_linux_amd64.tar.gz"
+    "hash": "sha256-Yve4EeMe9j90MqeelqT6S6NwTc1PL5JlzX4aTjR5XUU=",
+    "url": "https://github.com/platformsh/cli/releases/download/5.0.23/platform_5.0.23_linux_amd64.tar.gz"
   },
   "linux-arm64": {
-    "hash": "sha256-xZ3i7KG/NdoHD6kB3Mtq1jC2BufhcxWXhodD8FQvIpI=",
-    "url": "https://github.com/platformsh/cli/releases/download/5.0.22/platform_5.0.22_linux_arm64.tar.gz"
+    "hash": "sha256-ejeWn98wCSum6SqdW6RlQ7YvF7dzDRw/vftm82uZAio=",
+    "url": "https://github.com/platformsh/cli/releases/download/5.0.23/platform_5.0.23_linux_arm64.tar.gz"
   }
 }
diff --git a/pkgs/by-name/up/upsun/versions.json b/pkgs/by-name/up/upsun/versions.json
@@ -1,19 +1,19 @@
 {
-  "version": "5.0.22",
+  "version": "5.0.23",
   "darwin-amd64": {
-    "hash": "sha256-miO8KOxlr+x5wFOAfkMsgE9R3mz7nMjMAFxWd8/O1bE=",
-    "url": "https://github.com/platformsh/cli/releases/download/5.0.22/upsun_5.0.22_darwin_all.tar.gz"
+    "hash": "sha256-6bnna+8cDuZ593FTbEG6IGAxpuH/hVCjCDZJgkB3qRw=",
+    "url": "https://github.com/platformsh/cli/releases/download/5.0.23/upsun_5.0.23_darwin_all.tar.gz"
   },
   "darwin-arm64": {
-    "hash": "sha256-miO8KOxlr+x5wFOAfkMsgE9R3mz7nMjMAFxWd8/O1bE=",
-    "url": "https://github.com/platformsh/cli/releases/download/5.0.22/upsun_5.0.22_darwin_all.tar.gz"
+    "hash": "sha256-6bnna+8cDuZ593FTbEG6IGAxpuH/hVCjCDZJgkB3qRw=",
+    "url": "https://github.com/platformsh/cli/releases/download/5.0.23/upsun_5.0.23_darwin_all.tar.gz"
   },
   "linux-amd64": {
-    "hash": "sha256-R/G2w7spHifYr5voFPDvFyl3eooNxW8nwo0WlpfqIN8=",
-    "url": "https://github.com/platformsh/cli/releases/download/5.0.22/upsun_5.0.22_linux_amd64.tar.gz"
+    "hash": "sha256-yxn9r98mUEBCfnd0gkmEKbhPfnHiRxNEsDi3kTJBo6k=",
+    "url": "https://github.com/platformsh/cli/releases/download/5.0.23/upsun_5.0.23_linux_amd64.tar.gz"
   },
   "linux-arm64": {
-    "hash": "sha256-1qcM2J0nBCgqredDbgNgU9Si/aP677Fq0scS5W3+beE=",
-    "url": "https://github.com/platformsh/cli/releases/download/5.0.22/upsun_5.0.22_linux_arm64.tar.gz"
+    "hash": "sha256-hr4XXEt/mK4HsV1Wp5oqieQs3gQcAy7AFNACaKA6wmA=",
+    "url": "https://github.com/platformsh/cli/releases/download/5.0.23/upsun_5.0.23_linux_arm64.tar.gz"
   }
 }
diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix
@@ -5,19 +5,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasm-tools";
-  version = "1.221.0";
+  version = "1.221.2";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-tb2WHY0UMGPURQ1l8gPQK52TothUhmM8pSbtGumQz9Q=";
+    hash = "sha256-agntGQkwXNMJSm7AgjhYDeWyCxCh/0edNxJgvbeUyfU=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
-  cargoHash = "sha256-KvI+KexELxqeT1luyCHjOSVxNRv+p1nDW4/nlVoxsZ4=";
+  cargoHash = "sha256-il9Zdj50XBMCxiOyQwyToOtaP34hcklOwlDuVGEmyVY=";
   cargoBuildFlags = [ "--package" "wasm-tools" ];
   cargoTestFlags = [ "--all" ] ++
     # Due to https://github.com/bytecodealliance/wasm-tools/issues/1820

diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix
@@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brow
 
 stdenvNoCC.mkDerivation rec {
   inherit pname;
-  version = "2024-04-19";
+  version = "2024-11-15";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    hash = "sha256-vtEmnoARlz1F+E+T3ceFDgLXjlCi8UzHLr4AwTA39fA=";
+    hash = "sha256-+eylAssnZK0H1ifBahnj+E+uCkukeGMXg00YT0Dg7dc=";
   };
 
   nativeBuildInputs = [

diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix
@@ -8,7 +8,6 @@
   dde-file-manager,
   dde-tray-loader,
   deepin-desktop-schemas,
-  deepin-movie-reborn,
   deepin-system-monitor,
   gsettings-desktop-schemas,
   extraGSettingsOverrides ? "",
@@ -23,7 +22,6 @@ let
     dde-file-manager
     dde-tray-loader
     deepin-desktop-schemas
-    deepin-movie-reborn
     deepin-system-monitor
     gsettings-desktop-schemas # dde-appearance need org.gnome.desktop.background
   ] ++ extraGSettingsOverridePackages;

diff --git a/pkgs/development/python-modules/django-filer/default.nix b/pkgs/development/python-modules/django-filer/default.nix
@@ -16,16 +16,16 @@
 
 buildPythonPackage rec {
   pname = "django-filer";
-  version = "3.3.0";
+  version = "3.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "django-cms";
     repo = "django-filer";
-    rev = "refs/tags/${version}";
-    hash = "sha256-qtvPd0TlFNoxNgzXiRWOOmViouDq0vtVBFGWK4XrIFE=";
+    tag = version;
+    hash = "sha256-9Gy6yXYRCARXAqJ9+ZoDbNAEQGzhLLtJzbAevF+j/2Q=";
   };
 
   build-system = [ setuptools ];

diff --git a/pkgs/development/python-modules/django-mfa3/default.nix b/pkgs/development/python-modules/django-mfa3/default.nix
@@ -8,6 +8,7 @@
   fido2,
   qrcode,
   python,
+  fetchpatch,
 }:
 
 buildPythonPackage rec {
@@ -22,6 +23,16 @@ buildPythonPackage rec {
     hash = "sha256-O8po7VevqyHlP2isnNnLbpgfs1p4sFezxIZKMTgnwuY=";
   };
 
+  patches = [
+    # Fix for tests.tests.FIDO2Test.test_origin_https
+    # https://github.com/xi/django-mfa3/issues/24
+    (fetchpatch {
+      url = "https://github.com/xi/django-mfa3/commit/49003746783e32cd60e55c4593bef5d7e709c4bd.patch";
+      hash = "sha256-D3fPURAB+RC16fSd2COpCIcmjZW/1h92GOOhRczSVec=";
+      name = "test_origin_https_fix.patch";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -36,9 +47,7 @@ buildPythonPackage rec {
   pythonRelaxDeps = [ "qrcode" ];
 
   checkPhase = ''
-    # Disable failing test test_origin_https
-    # https://github.com/xi/django-mfa3/issues/24
-    ${python.interpreter} -m django test --settings tests.settings -k "not test_origin_https"
+    ${python.interpreter} -m django test --settings tests.settings
   '';
 
   meta = {