Merge staging-next into staging

2023-11-25 06:01:24 +00:00 · 2023-11-25 06:01:24 +00:00 · c47766d44a
commit c47766d44a
parent 1f8691c69f 8775024419
19 changed files with 110 additions and 56 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -1585,6 +1585,13 @@
    githubId = 1482768;
    name = "Benjamin Asbach";
  };
+  asbjornolling = {
+    email = "asbjorn@olli.ng";
+    matrix = "@asbjorn:olli.ng";
+    github = "AsbjornOlling";
+    githubId = 11493130;
+    name = "Asbjørn Olling";
+  };
  asciimoth = {
    name = "Andrew";
    email = "ascii@moth.contact";
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@ -281,6 +281,20 @@ let
          packageRequires = [ self.haskell-mode ];
        });

+        hotfuzz = super.hotfuzz.overrideAttrs (old: {
+          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.cmake ];
+
+          dontUseCmakeBuildDir = true;
+
+          preBuild = ''
+            make -j$NIX_BUILD_CORES
+          '';
+
+          postInstall = (old.postInstall or "") + "\n" + ''
+            install source/hotfuzz-module.so $out/share/emacs/site-lisp/elpa/hotfuzz-*
+          '';
+        });
+
        irony = super.irony.overrideAttrs (old: {
          cmakeFlags = old.cmakeFlags or [ ] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ];
          env.NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR";
--- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix
+++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix
@ -89,7 +89,7 @@ let
      ++ lib.optionals mediaSupport [ ffmpeg ]
  );

-  version = "13.0.1";
+  version = "13.0.4";

  sources = {
    x86_64-linux = fetchurl {
@ -101,7 +101,7 @@ let
        "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
        "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
      ];
-      hash = "sha256-VYkRHWyTAAt5P7jnNuf4s2bOv36LuqcTMMKOLRGE9FQ=";
+      hash = "sha256-qK67rf9zkMA53WFIcMCsPUH4m6YkMVqAUsHiGsy/xN4=";
    };
  };

--- a/pkgs/applications/networking/browsers/tor-browser/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser/default.nix
@ -105,7 +105,7 @@ lib.warnIf (useHardenedMalloc != null)
      ++ lib.optionals mediaSupport [ ffmpeg ]
  );

-  version = "13.0.1";
+  version = "13.0.5";

  sources = {
    x86_64-linux = fetchurl {
@ -115,7 +115,7 @@ lib.warnIf (useHardenedMalloc != null)
        "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
        "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
      ];
-      hash = "sha256-ORa973US2VY9Can4Nr35YSpZrYGqBP4I/S/ulsbRJLc=";
+      hash = "sha256-WZq8ig62Mu3q6OrVSaPbe6MLQ6pvFNo3yQMXC7PCGJY=";
    };

    i686-linux = fetchurl {
@ -125,7 +125,7 @@ lib.warnIf (useHardenedMalloc != null)
        "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
        "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
      ];
-      hash = "sha256-OBUleXLTNFG+aFuftnphgBtQCfyoIWDcoVFs5elJ0tA=";
+      hash = "sha256-/enIdKLMRmJIjwXEo0i3hgHZKEtWaBgFzE1rtZMsqeY=";
    };
  };

--- a/pkgs/by-name/em/emocli/package.nix
+++ b/pkgs/by-name/em/emocli/package.nix
@ -0,0 +1,25 @@
+{ lib, nimPackages, fetchFromGitLab, unicode-emoji }:
+
+nimPackages.buildNimPackage rec {
+  pname = "emocli";
+  version = "1.0.0";
+  src = fetchFromGitLab {
+    owner = "AsbjornOlling";
+    repo = "emocli";
+    rev = "v${version}";
+    hash = "sha256-yJu+8P446gzRFOi9/+TcN8AKL0jKHUxhOvi/HXNWL1A=";
+  };
+  nimFlags = [
+    "-d:release"
+    "--maxLoopIterationsVM:1000000000"
+  ];
+  doCheck = true;
+  env.EMOCLI_DATAFILE = "${unicode-emoji}/share/unicode/emoji/emoji-test.txt";
+  meta = with lib; {
+    homepage = "https://gitlab.com/AsbjornOlling/emocli";
+    description = "The emoji picker for your command line";
+    license = licenses.eupl12;
+    maintainers = with maintainers; [ asbjornolling ];
+    mainProgram = "emocli";
+  };
+}
--- a/pkgs/by-name/my/mystmd/package.nix
+++ b/pkgs/by-name/my/mystmd/package.nix
@ -1,17 +1,17 @@
-{ lib, buildNpmPackage, fetchFromGitHub, mystmd, testers }:
+{ lib, buildNpmPackage, fetchFromGitHub, mystmd, testers, nix-update-script }:

 buildNpmPackage rec {
  pname = "mystmd";
-  version = "1.1.29";
+  version = "1.1.31";

  src = fetchFromGitHub {
    owner = "executablebooks";
    repo = "mystmd";
    rev = "mystmd@${version}";
-    hash = "sha256-vI30dAcHdVtfD3xWIEytlDaobRX7Wkc7xt8vVHdXJxY=";
+    hash = "sha256-1zjz1HJxa8ww02MnqravCWM51bpuSpnLxn34Kazbt5o=";
  };

-  npmDepsHash = "sha256-l/jpNCVZe++o494W4EV86VAVdH9W8W8I0+dC2rBome8=";
+  npmDepsHash = "sha256-7H3VKJAzbsKLhyFD7MoASsOyJwbt6vERO6LM2mpz/y0=";

  dontNpmInstall = true;

@ -23,9 +23,12 @@ buildNpmPackage rec {
    runHook postInstall
  '';

-  passthru.tests.version = testers.testVersion {
-    package = mystmd;
-    version = "v${version}";
+  passthru = {
+    tests.version = testers.testVersion {
+      package = mystmd;
+      version = "v${version}";
+    };
+    updateScript = nix-update-script { };
  };

  meta = with lib; {
--- a/pkgs/by-name/us/usql/package.nix
+++ b/pkgs/by-name/us/usql/package.nix
@ -1,4 +1,5 @@
 { lib
+, stdenv
 , fetchFromGitHub
 , buildGoModule
 , unixODBC
@ -49,6 +50,11 @@ buildGoModule rec {
    "no_adodb"
  ];

+  # Work around https://github.com/NixOS/nixpkgs/issues/166205.
+  env = lib.optionalAttrs stdenv.cc.isClang {
+    NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";
+  };
+
  ldflags = [
    "-s"
    "-w"
--- a/pkgs/development/python-modules/pymc/default.nix
+++ b/pkgs/development/python-modules/pymc/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "pymc";
-  version = "5.9.1";
+  version = "5.9.2";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "pymc-devs";
    repo = "pymc";
    rev = "refs/tags/v${version}";
-    hash = "sha256-yY8W3B1yqj0oOkR6+nMbFgCFmTStXkePWnEYPHI8Zto=";
+    hash = "sha256-fbS4JSbmdOGz570awEpT6ut0NJ8TbiAeJWaETMBeI3c=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/pytensor/default.nix
+++ b/pkgs/development/python-modules/pytensor/default.nix
@ -18,15 +18,13 @@
 , pytest-mock
 , pytestCheckHook
 , pythonOlder
-# Tensorflow is currently (2023/10/04) broken.
-# Thus, we don't provide this optional test dependency.
-# , tensorflow-probability
+, tensorflow-probability
 , stdenv
 }:

 buildPythonPackage rec {
  pname = "pytensor";
-  version = "2.17.3";
+  version = "2.18.1";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -35,7 +33,7 @@ buildPythonPackage rec {
    owner = "pymc-devs";
    repo = "pytensor";
    rev = "refs/tags/rel-${version}";
-    hash = "sha256-FufPCFzSjG8BrHes7t3XsdovX9gqUBG0gMDGKvkRkSA=";
+    hash = "sha256-8bt6ps5bwT+Atr6JgQMxe234bL/ZriYlURUdX0sC1kk=";
  };

  postPatch = ''
@ -66,9 +64,7 @@ buildPythonPackage rec {
    numba-scipy
    pytest-mock
    pytestCheckHook
-    # Tensorflow is currently (2023/10/04) broken.
-    # Thus, we don't provide this optional test dependency.
-    # tensorflow-probability
+    tensorflow-probability
  ];

  preBuild = ''
@ -86,8 +82,6 @@ buildPythonPackage rec {
    "test_logsumexp_benchmark"
    "test_scan_multiple_output"
    "test_vector_taps_benchmark"
-    # Temporarily disabled because of broken tensorflow-probability
-    "test_tfp_ops"
  ];

  disabledTestPaths = [
--- a/pkgs/development/python-modules/streamlit/default.nix
+++ b/pkgs/development/python-modules/streamlit/default.nix
@ -32,14 +32,14 @@

 buildPythonPackage rec {
  pname = "streamlit";
-  version = "1.28.1";
+  version = "1.28.2";
  pyproject = true;

  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-zKBPbZWxS3vDfwyrrydQS4ava04a+Y1zrMgOzc+8xJI=";
+    hash = "sha256-wUQWiIG/e9bWAXqb/eWFtS0gCHsQstXIXTdu9tUqqO4=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/timm/default.nix
+++ b/pkgs/development/python-modules/timm/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "timm";
-  version = "0.9.11";
+  version = "0.9.12";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "huggingface";
    repo = "pytorch-image-models";
    rev = "refs/tags/v${version}";
-    hash = "sha256-xa7oDa8fzQT+hixuszCqCoLYfJcMLeZcHLlBT9KUWUo=";
+    hash = "sha256-dDd/Sjy4xmJlaAg+fOxxcuX3FX//uJJkW0q3AaeCfns=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@ -10,14 +10,14 @@

 buildPythonPackage rec {
  pname = "trimesh";
-  version = "4.0.4";
+  version = "4.0.5";
  format = "pyproject";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-3XpncG6ISKQU+hqJpvck82s0BYgvYpNGn3zcdWkB5Ps=";
+    hash = "sha256-ub/P7AO3CrTSHwVd8atz6HQN0LyP1WSCc+74/sds3fk=";
  };

  nativeBuildInputs = [ setuptools ];
--- a/pkgs/development/tools/database/sqlc/default.nix
+++ b/pkgs/development/tools/database/sqlc/default.nix
@ -1,7 +1,7 @@
 { lib, buildGoModule, fetchFromGitHub }:

 let
-  version = "1.23.0";
+  version = "1.24.0";
 in
 buildGoModule {
  pname = "sqlc";
@ -11,11 +11,11 @@ buildGoModule {
    owner = "sqlc-dev";
    repo = "sqlc";
    rev = "v${version}";
-    hash = "sha256-MM4O/njW4R1darZMtoevuLMt14/BrCAaFvSX06CTso8=";
+    hash = "sha256-j+pyj1CJw0L3s4Nyhy+XXUgX2wbrOWveEJQ4cFhQEvs=";
  };

  proxyVendor = true;
-  vendorHash = "sha256-tJ+Bih+vwkYfEvIsJ6R2Z0eDS9m1eTOS68uyad0F6f0=";
+  vendorHash = "sha256-xOMqZCuENGuCs+VkbCxMpXOEr4MALhlveTfUHEPnP1w=";

  subPackages = [ "cmd/sqlc" ];

--- a/pkgs/development/tools/literate-programming/noweb/default.nix
+++ b/pkgs/development/tools/literate-programming/noweb/default.nix
@ -1,17 +1,17 @@
 { lib, stdenv, fetchFromGitHub, nawk, groff, icon-lang, useIcon ? true }:

-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "noweb";
-  version = "2.12";
+  version = "2.13";

  src = fetchFromGitHub {
    owner = "nrnrnr";
    repo = "noweb";
-    rev = "v${builtins.replaceStrings ["."] ["_"] version}";
-    sha256 = "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95";
+    rev = "v${builtins.replaceStrings ["."] ["_"] finalAttrs.version}";
+    sha256 = "sha256-COcWyrYkheRaSr2gqreRRsz9SYRTX2PSl7km+g98ljs=";
  };

-  sourceRoot = "${src.name}/src";
+  sourceRoot = "${finalAttrs.src.name}/src";

  patches = [
    # Remove FAQ
@ -20,6 +20,7 @@ stdenv.mkDerivation (finalAttrs: rec {

  postPatch = ''
    substituteInPlace Makefile --replace 'strip' '${stdenv.cc.targetPrefix}strip'
+    substituteInPlace Makefile --replace '`./gitversion`' '${finalAttrs.src.rev}'
  '';

  nativeBuildInputs = [ groff ] ++ lib.optionals useIcon [ icon-lang ];
--- a/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch
+++ b/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch
@ -1,11 +1,13 @@
--- a/Makefile	2006-06-12 22:14:20.000000000 +0200
-+++ b/Makefile	2010-06-17 11:30:11.804018145 +0200
-@@ -198,7 +198,7 @@
- 	(cd elisp; ci -l $(CINAME) $(CIMSG) *.el)
- 	ci -l $(CINAME) $(CIMSG) Makefile.nw INSTALL INSTALL.DOS README FAQ COPYRIGHT nwmake *.nw
+diff --git a/Makefile b/Makefile
+index 1897c09..770e108 100644
+--- a/Makefile
+++ b/Makefile
+@@ -195,7 +195,7 @@ install-elisp:
 
+ uninstall-elisp:
+ 	rm -f $(ELISP)/noweb-mode.el
 -source: FAQ
 +source:
- 	for i in c shell lib xdoc icon awk tex; do (cd $$i; make CPIF=">" source); done
+ 	for i in c shell lib xdoc icon awk tex; do (cd $$i && $(MAKE) CPIF=">" $@); done
 	sleep 1
- 	for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done
+ 	for i in c shell lib xdoc icon awk tex; do (cd $$i && $(MAKE) touch); done
--- a/pkgs/games/heroic/default.nix
+++ b/pkgs/games/heroic/default.nix
@ -3,7 +3,7 @@
 , fetchFromGitHub
 , fetchYarnDeps
 , yarn
-, fixup_yarn_lock
+, prefetch-yarn-deps
 , nodejs
 , python3
 , makeWrapper
@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {

  nativeBuildInputs = [
    yarn
-    fixup_yarn_lock
+    prefetch-yarn-deps
    nodejs
    python3
    makeWrapper
@ -62,7 +62,7 @@ in stdenv.mkDerivation rec {

    export HOME=$(mktemp -d)
    yarn config --offline set yarn-offline-mirror $offlineCache
-    fixup_yarn_lock yarn.lock
+    fixup-yarn-lock yarn.lock
    yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
    patchShebangs node_modules/

--- a/pkgs/games/r2modman/default.nix
+++ b/pkgs/games/r2modman/default.nix
@ -2,7 +2,7 @@
 , stdenv
 , yarn
 , fetchYarnDeps
-, fixup_yarn_lock
+, prefetch-yarn-deps
 , nodejs
 , electron
 , fetchFromGitHub
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [
    yarn
-    fixup_yarn_lock
+    prefetch-yarn-deps
    nodejs
    makeWrapper
    copyDesktopItems
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
    export NODE_OPTIONS="--openssl-legacy-provider"
    export HOME=$(mktemp -d)
    yarn config --offline set yarn-offline-mirror $offlineCache
-    fixup_yarn_lock yarn.lock
+    fixup-yarn-lock yarn.lock
    yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
    patchShebangs node_modules/

--- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  pname = "pg-safeupdate";
-  version = "1.4";
+  version = "1.5";

  buildInputs = [ postgresql ];

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
    owner  = "eradman";
    repo   = pname;
    rev    = version;
-    sha256 = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y=";
+    sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs=";
  };

  installPhase = ''
@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "A simple extension to PostgreSQL that requires criteria for UPDATE and DELETE";
    homepage    = "https://github.com/eradman/pg-safeupdate";
+    changelog   = "https://github.com/eradman/pg-safeupdate/raw/${src.rev}/NEWS";
    platforms   = postgresql.meta.platforms;
    license     = licenses.postgresql;
+    broken      = versionOlder postgresql.version "14";
  };
 }
--- a/pkgs/tools/admin/pgadmin/default.nix
+++ b/pkgs/tools/admin/pgadmin/default.nix
@ -7,7 +7,7 @@
 , postgresqlTestHook
 , postgresql
 , yarn
-, fixup_yarn_lock
+, prefetch-yarn-deps
 , nodejs
 , fetchpatch
 , server-mode ? true
@ -165,7 +165,7 @@ pythonPackages.buildPythonApplication rec {
    rm yarn.lock
    cp ${./yarn.lock} yarn.lock
    chmod +w yarn.lock
-    fixup_yarn_lock yarn.lock
+    fixup-yarn-lock yarn.lock
    yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
    patchShebangs node_modules/
    yarn webpacker
@ -189,7 +189,7 @@ pythonPackages.buildPythonApplication rec {
    cp -v ../pkg/pip/setup_pip.py setup.py
  '';

-  nativeBuildInputs = with pythonPackages; [ cython pip sphinx yarn fixup_yarn_lock nodejs ];
+  nativeBuildInputs = with pythonPackages; [ cython pip sphinx yarn prefetch-yarn-deps nodejs ];
  buildInputs = [
    zlib
    pythonPackages.wheel