Merge master into staging-next

NixOS · Jan 18, 2025 · 0a5e75b · 0a5e75b
2 parents 073155f + 6e0876c
commit 0a5e75b
Show file tree

Hide file tree

Showing 24 changed files with 329 additions and 80 deletions.
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -581,6 +581,18 @@ final: prev:
     meta.homepage = "https://github.com/derekelkins/agda-vim/";
   };
 
+  agitator-nvim = buildVimPlugin {
+    pname = "agitator.nvim";
+    version = "2024-12-02";
+    src = fetchFromGitHub {
+      owner = "emmanueltouzery";
+      repo = "agitator.nvim";
+      rev = "dc2843869b8bb9e5096edf53583b1dee1e62aa6b";
+      sha256 = "12d75hjc1vxwbd7imdn8s1d3gqkqk8xg1sdpxx262kk2c90grxpn";
+    };
+    meta.homepage = "https://github.com/emmanueltouzery/agitator.nvim/";
+  };
+
   ai-vim = buildVimPlugin {
     pname = "ai.vim";
     version = "2023-10-03";

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -143,6 +143,13 @@ in
     ];
   };
 
+  agitator-nvim = super.agitator-nvim.overrideAttrs {
+    dependencies = with self; [
+      telescope-nvim
+      plenary-nvim
+    ];
+  };
+
   astrocore = super.astrocore.overrideAttrs {
     dependencies = [ self.lazy-nvim ];
   };

diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -47,6 +47,7 @@ https://github.com/Mofiqul/adwaita.nvim/,HEAD,
 https://github.com/stevearc/aerial.nvim/,,
 https://github.com/Numkil/ag.nvim/,,
 https://github.com/derekelkins/agda-vim/,,
+https://github.com/emmanueltouzery/agitator.nvim/,HEAD,
 https://github.com/aduros/ai.vim/,HEAD,
 https://github.com/joshuavial/aider.nvim/,HEAD,
 https://github.com/slashmili/alchemist.vim/,,

diff --git a/pkgs/by-name/fa/fakechroot/package.nix b/pkgs/by-name/fa/fakechroot/package.nix
@@ -4,6 +4,9 @@
   fetchFromGitHub,
   fetchpatch,
   autoreconfHook,
+  bash,
+  buildPackages,
+  coreutils,
   nixosTests,
   perl,
 }:
@@ -54,8 +57,29 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  postPatch = ''
+    for f in scripts/*; do
+      substituteInPlace $f \
+        --replace-quiet "@SHELL@" "${lib.getExe bash}" \
+        --replace-quiet "@CHROOT@" "${lib.getExe' coreutils "chroot"}" \
+        --replace-quiet "@ECHO@" "${lib.getExe' coreutils "echo"}" \
+        --replace-quiet "@ENV@" "${lib.getExe' coreutils "env"}" \
+        --replace-quiet "@MKFIFO@" "${lib.getExe' coreutils "mkfifo"}" \
+        --replace-quiet "@SEQ@" "${lib.getExe' coreutils "seq"}"
+    done
+  '';
+
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ perl ];
+
+  buildInputs = [
+    bash
+    perl
+  ];
+
+  configureFlags = [
+    # pass in correct pod2man when cross-compiling
+    "ac_cv_path_POD2MAN=${lib.getExe' buildPackages.perl "pod2man"}"
+  ];
 
   passthru = {
     tests = {
@@ -64,6 +88,10 @@ stdenv.mkDerivation rec {
     };
   };
 
+  preFixup = ''
+    patchShebangs --host $out/bin
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/dex4er/fakechroot";
     description = "Give a fake chroot environment through LD_PRELOAD";

diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix
@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "icloudpd";
-  version = "1.25.1";
+  version = "1.26.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "icloud-photos-downloader";
     repo = "icloud_photos_downloader";
     rev = "v${version}";
-    hash = "sha256-Wjei2hJpeVYVgShbbzikZk4yr71HoeP/caqU1ktDQbI=";
+    hash = "sha256-tythfDw053UjxbiZsT0AqUA9ckzHy5XgJD3Q8B5QRDM=";
   };
 
   pythonRelaxDeps = true;

diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix
@@ -53,16 +53,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "rio";
-  version = "0.1.17";
+  version = "0.2.4";
 
   src = fetchFromGitHub {
     owner = "raphamorim";
     repo = "rio";
     rev = "v${version}";
-    hash = "sha256-10E7tIuix0BGKFbADLhcReRC01FXV/dBivJjfSe/X/c=";
+    hash = "sha256-dH/r6Bumis8WOM/c/FAvFD2QYuMeHWOMQuU6zLWrlaM=";
   };
 
-  cargoHash = "sha256-yGOvY5+ThSey/k8ilTTC0CzaOIJtc4hDYmdrHJC3HyE=";
+  cargoHash = "sha256-ERB8l5WCgk6oLLWcI99mfGrWIQvsHH4bhaaCS3VqQTs=";
 
   nativeBuildInputs =
     [

diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix
@@ -26,12 +26,10 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "weblate";
-  version = "5.8.3";
+  version = "5.9.2";
 
   pyproject = true;
 
-  disabled = python.pythonOlder "3.11";
-
   outputs = [
     "out"
     "static"
@@ -41,7 +39,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "WeblateOrg";
     repo = "weblate";
     tag = "weblate-${version}";
-    hash = "sha256-Kmna23jhhFRJ0ExplYNPFEaIAJxmwHU2azivfKHHnjs=";
+    hash = "sha256-/fsNQvIIgcTPZHHIwr8sruEJpPJTmXbevoxy1GPmOOU=";
   };
 
   patches = [
@@ -75,6 +73,7 @@ python.pkgs.buildPythonApplication rec {
     [
       aeidon
       ahocorasick-rs
+      altcha
       (toPythonModule (borgbackup.override { python3 = python; }))
       celery
       certifi
@@ -103,6 +102,7 @@ python.pkgs.buildPythonApplication rec {
       gitpython
       hiredis
       html2text
+      httpx
       iniparse
       jsonschema
       lxml
@@ -131,6 +131,7 @@ python.pkgs.buildPythonApplication rec {
       tesserocr
       translate-toolkit
       translation-finder
+      unidecode
       user-agents
       weblate-language-data
       weblate-schemas

diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix
@@ -49,11 +49,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.22.10";
+  version = "1.22.11";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-HpT9SL51DR+vtNmztt0xpunSc10zm/JGK8l7ZMpMEDc=";
+    hash = "sha256-pgwj3sldEKJXYmXOWA9Xhp1awkccT0rKgFrdyeoPyf4=";
   };
 
   strictDeps = true;

diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix
@@ -49,11 +49,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.24rc1";
+  version = "1.24rc2";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-r9iiP9Jg8qJG0XQEmgdrigW7C62T8SIHaNIZuL33U50=";
+    hash = "sha256-uge2hj8ggWDo8J8RyLlYJym1HP63Us5rp5o3m0+8rG0=";
   };
 
   strictDeps = true;

diff --git a/pkgs/development/compilers/go/bootstrap122.nix b/pkgs/development/compilers/go/bootstrap122.nix
@@ -1,27 +1,27 @@
 { callPackage }:
 callPackage ./binary.nix {
-  version = "1.22.10";
+  version = "1.22.11";
   hashes = {
     # Use `print-hashes.sh ${version}` to generate the list below
-    darwin-amd64 = "dd2c4ac3702658c2c20e3a8b394da1917d86156b2cb4312c9d2f657f80067874";
-    darwin-arm64 = "21cf49415ffe0755b45f2b63e75d136528a32f7bb7bdd0166f51d22a03eb0a3f";
-    freebsd-386 = "f82f5d194114963693e0f51fd56d55d8417ca556438062f2b0df608473b62837";
-    freebsd-amd64 = "cce9da240870a4430c5cf1227bcf29d37575043ff16f7982a69f1139c6f564b5";
-    freebsd-arm64 = "abae388d0d42563a242db0d405172cb73e09236f68000ff90c2a327ec8c5764c";
-    freebsd-armv6l = "7c9c8fe30cbabbb4fb597f0f0ad1279fd2b320bc70831eba4c207b55ad46931d";
-    freebsd-riscv64 = "d6f25fd79e17b84d1b61bec3e2fdffc47377b28b51a04b6bdbeac0199313e059";
-    linux-386 = "2ae9f00e9621489b75494fa2b8abfc5d09e0cae6effdd4c13867957ad2e4deba";
-    linux-amd64 = "736ce492a19d756a92719a6121226087ccd91b652ed5caec40ad6dbfb2252092";
-    linux-arm64 = "5213c5e32fde3bd7da65516467b7ffbfe40d2bb5a5f58105e387eef450583eec";
-    linux-armv6l = "a7bbbc80fe736269820bbdf3555e91ada5d18a5cde2276aac3b559bc1d52fc70";
-    linux-loong64 = "0be34dbc69726b52414e0283736f997fee477379ebff66cebd7d8c35f4f64f9d";
-    linux-mips = "bb7d7e99db7ee70063cb57bb7395c392b8b5ed87f37d733a1c91de935c70bb91";
-    linux-mips64 = "c7f0571410297cb29e52d10fed7a2a21aeaeabb9539d0c04a6d778adf0fe7f1b";
-    linux-mips64le = "e66c440c03dd19bf8423034cbde7f6813321beb18d3fcf2ef234c13a25467952";
-    linux-mipsle = "b4e0061f62a9c1f874893aa4951a4883c19762a9dd64c5710554ec5a7aaf311a";
-    linux-ppc64 = "4192158cdedc6a124aa32a099cc6bebebabf1f4d380c46c5e36ea52c30a3888b";
-    linux-ppc64le = "db05b9838f69d741fb9a5301220b1a62014aee025b0baf341aba3d280087b981";
-    linux-riscv64 = "aef9b186c1b9b58c0472dbf54978f97682852a91b2e8d6bf354e59ba9c24438a";
-    linux-s390x = "4ab2286adb096576771801b5099760b1d625fd7b44080449151a4d9b21303672";
+    darwin-amd64 = "c6d130066d509ccca1164d84514905b1e8dc5f5f4c25c24113f1b65ad87cd020";
+    darwin-arm64 = "3980b1d2be042a164989f2fd24f0bb306a2397d581a29c7426885578b369db5d";
+    freebsd-386 = "ab10063b2620de387b74bc2eeadc2642a960b1c97c3fc8193447977954262241";
+    freebsd-amd64 = "7910de647cab36eea010da64c07c31484a2c94e0447a0d81f339415de0def2a4";
+    freebsd-arm64 = "9b5043744bd56d36d66ed193776952dd5ebdef31302d6b209e9e87f3b3936e85";
+    freebsd-armv6l = "31cebf4d5280db96dc742fb71301eae5ca4ada5b48b76fb339a03bf857288eeb";
+    freebsd-riscv64 = "b8196ed8ee94eb4c3bbbd4147af9362ffc6b77511dabaf9beb60ac072cf00ead";
+    linux-386 = "b40ee463437e8c8f2d6c9685a0e166eaecb36615afa362eaa58459d3369f3baf";
+    linux-amd64 = "0fc88d966d33896384fbde56e9a8d80a305dc17a9f48f1832e061724b1719991";
+    linux-arm64 = "9ebfcab26801fa4cf0627c6439db7a4da4d3c6766142a3dd83508240e4f21031";
+    linux-armv6l = "ac3ba3e0433d96b041f683e9bbb791ca39e159b3d4bb948de4ab3a2c1af1b257";
+    linux-loong64 = "83ced97550e9afc82a48d98534a2457c9662a9071a35439558a70167c8cd513b";
+    linux-mips = "e8c507c5516328e61e7af442f4901f3481859679284eff20198b4180f98fdfd9";
+    linux-mips64 = "22ad73f1762a3129b96f398f4c65fe8a63f5e5657d4bc7f14e153728777ab323";
+    linux-mips64le = "d4ad600a7c6b3c113984b1c301afec67a696a598b0f0ed2841a52c3b9051cd2d";
+    linux-mipsle = "5ebd447b07f33b57e264c80a8229e5c7e09bbc3203efdd72568e7e3267538479";
+    linux-ppc64 = "d3b8cda5a35d9ae670096d88cb8763424d1ac1c720521564eef8dc0dd68c2bc2";
+    linux-ppc64le = "963a0ec973640b23ee8bb7a462cc415276fd8436111a03df8c34eb3b1ae29f12";
+    linux-riscv64 = "150fd528397622764285f807d3343c36d052ed8cfc390a95e6336738c53f68f4";
+    linux-s390x = "1a235afe650dee989fb37fef6aa520f35e4cd557c31453f3e82b553da3a90669";
   };
 }
diff --git a/pkgs/development/python-modules/altcha/default.nix b/pkgs/development/python-modules/altcha/default.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "altcha";
+  version = "0.1.7";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "altcha-org";
+    repo = "altcha-lib-py";
+    tag = "v${version}";
+    hash = "sha256-jQUzIriy7p43WfbJ2XtT/n3AQy+f2ByDl7zNBBAxZ4I=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "altcha" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
+    description = "Lightweight Python library for creating and verifying ALTCHA challenges";
+    homepage = "https://github.com/altcha-org/altcha-lib-py";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ erictapen ];
+  };
+}
diff --git a/pkgs/development/python-modules/crochet/default.nix b/pkgs/development/python-modules/crochet/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  twisted,
+  wrapt,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "crochet";
+  version = "2.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "itamarst";
+    repo = "crochet";
+    tag = version;
+    hash = "sha256-grymhvCC9zDBKhNnQC0o07hdLPV5KMWb6HSz/ntSbq8=";
+  };
+
+  # fix for python>=3.12
+  postPatch = ''
+    substituteInPlace versioneer.py \
+      --replace-fail "SafeConfigParser()" "ConfigParser()" \
+      --replace-fail "parser.readfp" "parser.read_file"
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    twisted
+    wrapt
+  ];
+
+  pythonImportsCheck = [ "crochet" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
+    description = "Library that makes it easier to use Twisted from regular blocking code";
+    homepage = "https://github.com/itamarst/crochet";
+    changelog = "https://github.com/itamarst/crochet/blob/${src.tag}/docs/news.rst";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ erictapen ];
+  };
+}
diff --git a/pkgs/development/python-modules/dploot/default.nix b/pkgs/development/python-modules/dploot/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "dploot";
-  version = "3.0.3";
+  version = "3.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-MBuO9anCe8wDD+72pR/bFrV5pAmEIWY2pKSvPSTq0yQ=";
+    hash = "sha256-DlMaEkgbDHQb5BV0mI8qjTBGpmRX7bP67MZO4g+I1uI=";
   };
 
   pythonRelaxDeps = [