From 8d51652b7db0f90f1c293a2b54a6effe1e3fa365 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Thu, 11 Jan 2024 10:41:25 +0100 Subject: [PATCH 01/36] vvvvvv: 2.3.6 -> 2.4 Diff: https://github.com/TerryCavanagh/VVVVVV/compare/2.3.6...2.4 --- pkgs/games/vvvvvv/default.nix | 26 +++++++++++--------------- pkgs/games/vvvvvv/utf8cpp.patch | 13 ------------- 2 files changed, 11 insertions(+), 28 deletions(-) delete mode 100644 pkgs/games/vvvvvv/utf8cpp.patch diff --git a/pkgs/games/vvvvvv/default.nix b/pkgs/games/vvvvvv/default.nix index 909bfa430d70..07f98d94f3e1 100644 --- a/pkgs/games/vvvvvv/default.nix +++ b/pkgs/games/vvvvvv/default.nix @@ -6,11 +6,10 @@ , makeWrapper , copyDesktopItems , makeDesktopItem +, faudio , physfs , SDL2 -, SDL2_mixer , tinyxml-2 -, utf8cpp , Foundation , IOKit , makeAndPlay ? false @@ -18,19 +17,16 @@ stdenv.mkDerivation rec { pname = "vvvvvv"; - version = "2.3.6"; + version = "2.4"; src = fetchFromGitHub { owner = "TerryCavanagh"; repo = "VVVVVV"; rev = version; - sha256 = "sha256-sLNO4vkmlirsqJmCV9YWpyNnIiigU1KMls7rOgWgSmQ="; + sha256 = "sha256-AecaEWjWELRnCzTdMz+rDXVKnpPF+LNmxiKqMwQMm4k="; + fetchSubmodules = true; }; - patches = [ - ./utf8cpp.patch - ]; - dataZip = fetchurl { url = "https://thelettervsixtim.es/makeandplay/data.zip"; name = "data.zip"; @@ -45,21 +41,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + faudio physfs SDL2 - SDL2_mixer tinyxml-2 - utf8cpp ] ++ lib.optionals stdenv.isDarwin [ Foundation IOKit ]; - # Help CMake find SDL_mixer.h - env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2_mixer}/include/SDL2"; - cmakeDir = "../desktop_version"; cmakeFlags = [ "-DBUNDLE_DEPENDENCIES=OFF" - "-DCMAKE_CXX_FLAGS='-I${lib.getDev utf8cpp}/include/utf8cpp'" ] ++ lib.optional makeAndPlay "-DMAKEANDPLAY=ON"; desktopItems = [ @@ -80,8 +71,13 @@ stdenv.mkDerivation rec { install -Dm755 VVVVVV $out/bin/${pname} install -Dm644 "$src/desktop_version/icon.ico" "$out/share/pixmaps/VVVVVV.png" + cp -r "$src/desktop_version/fonts/" "$out/share/" + cp -r "$src/desktop_version/lang/" "$out/share/" - wrapProgram $out/bin/${pname} --add-flags "-assets ${dataZip}" + wrapProgram $out/bin/${pname} \ + --add-flags "-assets ${dataZip}" \ + --add-flags "-langdir $out/share/lang" \ + --add-flags "-fontsdir $out/share/fonts" runHook postInstall ''; diff --git a/pkgs/games/vvvvvv/utf8cpp.patch b/pkgs/games/vvvvvv/utf8cpp.patch deleted file mode 100644 index fc279564e759..000000000000 --- a/pkgs/games/vvvvvv/utf8cpp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/desktop_version/CMakeLists.txt b/desktop_version/CMakeLists.txt -index 7405c122..68ba40e3 100644 ---- a/desktop_version/CMakeLists.txt -+++ b/desktop_version/CMakeLists.txt -@@ -296,7 +296,7 @@ if(BUNDLE_DEPENDENCIES) - else() - find_package(utf8cpp CONFIG) - -- target_link_libraries(VVVVVV physfs tinyxml2 utf8cpp lodepng-static) -+ target_link_libraries(VVVVVV physfs tinyxml2 utf8cpp::utf8cpp lodepng-static) - endif() - - # SDL2 Dependency (Detection pulled from FAudio) From e9d1d734494dfa2dddaac86275986c091c54c59f Mon Sep 17 00:00:00 2001 From: siddharthdhakane Date: Mon, 22 Jan 2024 19:29:38 +0530 Subject: [PATCH 02/36] maintainers: add siddharthdhakane --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8d1584235d84..cb9dbf64f233 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17125,6 +17125,12 @@ github = "shymega"; githubId = 1334592; }; + siddharthdhakane = { + email = "siddharthdhakane@gmail.com"; + github = "siddharthdhakane"; + githubId = 28101092; + name = "Siddharth Dhakane"; + }; siddharthist = { email = "langston.barrett@gmail.com"; github = "langston-barrett"; From 7c95720fd6c72cee07f06f779ace83670a97273e Mon Sep 17 00:00:00 2001 From: siddharthdhakane Date: Sun, 21 Jan 2024 20:46:08 +0530 Subject: [PATCH 03/36] python311Packages.nameko: init at 2.4.1 --- .../python-modules/nameko/default.nix | 71 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/development/python-modules/nameko/default.nix diff --git a/pkgs/development/python-modules/nameko/default.nix b/pkgs/development/python-modules/nameko/default.nix new file mode 100644 index 000000000000..aec20b0f43e7 --- /dev/null +++ b/pkgs/development/python-modules/nameko/default.nix @@ -0,0 +1,71 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# install_requires +, dnspython +, eventlet +, kombu +, mock +, packaging +, path +, pyyaml +, requests +, setuptools +, six +, werkzeug +, wrapt +}: + +buildPythonPackage rec { + pname = "nameko"; + version = "2.14.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-J1NXi7Tca5KAGuozTSkwuX37dEhucF7daRmDBqlGjIg="; + }; + + postPatch = '' + substituteInPlace setup.py --replace "path.py" "path" + ''; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + dnspython + eventlet + kombu + mock + packaging + path + pyyaml + requests + setuptools + six + werkzeug + wrapt + ]; + + # tests depend on RabbitMQ being installed - https://nameko.readthedocs.io/en/stable/contributing.html#running-the-tests + # and most of the tests are network based + doCheck = false; + + pythonImportsCheck = [ + "nameko" + ]; + + meta = with lib; { + description = "A microservices framework that lets service developers concentrate on application logic and encourages testability"; + homepage = "https://www.nameko.io/"; + changelog = "https://github.com/nameko/nameko/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ siddharthdhakane ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb15676b1260..4fe6cce12629 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8152,6 +8152,8 @@ self: super: with self; { name-that-hash = callPackage ../development/python-modules/name-that-hash { }; + nameko = callPackage ../development/python-modules/nameko { }; + nampa = callPackage ../development/python-modules/nampa { }; nanoid = callPackage ../development/python-modules/nanoid { }; From fdf23b92ec4ed3a0b39ba8f0ec251e3cca66ed11 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Sun, 5 Nov 2023 23:50:49 +0100 Subject: [PATCH 04/36] privoxy: fix socks4 and socks4a support under glibc's source fortification Closes #265654. --- pkgs/tools/networking/privoxy/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 276bc133dfb1..048ee085a6f2 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , nixosTests +, fetchpatch , fetchurl, autoreconfHook , zlib, pcre, w3m, man , openssl, brotli @@ -15,6 +16,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-5sy8oWVvTmFrRlf4UU4zpw9ml+nXKUNWV3g5Mio8XSw="; }; + # Patch to fix socks4 and socks4a support under glibc's source fortification + # (enabled by default since glibc 2.38-0) + patches = [ + (fetchpatch { + url = "https://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=19d7684ca10f6c1279568aa19e9a9da2276851f1"; + sha256 = "sha256-bCb0RUVrWeGfqZYFHXDEEx+76xiNyVqehtLvk9C1j+4="; + }) + ]; + hardeningEnable = [ "pie" ]; nativeBuildInputs = [ autoreconfHook w3m man ]; From 206d26ad5d47702f815e98ea66c6db59cea50ac2 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 17 Jan 2024 00:39:42 +0100 Subject: [PATCH 05/36] python3Packages.ziafont: fix ModuleNotFoundError: No module named 'setuptools' --- pkgs/development/python-modules/ziafont/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/ziafont/default.nix b/pkgs/development/python-modules/ziafont/default.nix index 4e55583b211b..0ab7589c98ba 100644 --- a/pkgs/development/python-modules/ziafont/default.nix +++ b/pkgs/development/python-modules/ziafont/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , pytestCheckHook , nbval }: @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-3ZVj1ZxbFkFDDYbsIPzo7GMWGx7f5qWZQlcGCVXv73M="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook nbval From 766bb714719c6958ecc98dd806277f37c04b606e Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 7 Jan 2024 22:55:52 +0100 Subject: [PATCH 06/36] python3Packages.ziafont: 0.6 -> 0.7 --- pkgs/development/python-modules/ziafont/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ziafont/default.nix b/pkgs/development/python-modules/ziafont/default.nix index 0ab7589c98ba..788dda332941 100644 --- a/pkgs/development/python-modules/ziafont/default.nix +++ b/pkgs/development/python-modules/ziafont/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ziafont"; - version = "0.6"; + version = "0.7"; format = "pyproject"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-3ZVj1ZxbFkFDDYbsIPzo7GMWGx7f5qWZQlcGCVXv73M="; + hash = "sha256-DQEVWYOgiGSP3WlmZzEweyRa0UY7fxjjpbued+5EH5I="; }; nativeBuildInputs = [ From faa8fa6cc055aac78f1057df6ab88800d8023e72 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 17 Jan 2024 00:40:05 +0100 Subject: [PATCH 07/36] python3Packages.ziamath: fix ModuleNotFoundError: No module named 'setuptools' --- pkgs/development/python-modules/ziamath/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/ziamath/default.nix b/pkgs/development/python-modules/ziamath/default.nix index 5e24f3c41670..9de1e6d658dd 100644 --- a/pkgs/development/python-modules/ziamath/default.nix +++ b/pkgs/development/python-modules/ziamath/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , ziafont , pytestCheckHook , nbval @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-Bbwq4Ods3P/724KO94jSmMLD1ubfaMHP/gTlOL/2pnE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ ziafont ]; From 7a4a5c709c79167a0953807c24a320e14cb978a9 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 7 Jan 2024 22:56:08 +0100 Subject: [PATCH 08/36] python3Packages.ziamath: 0.8.1 -> 0.9 --- pkgs/development/python-modules/ziamath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ziamath/default.nix b/pkgs/development/python-modules/ziamath/default.nix index 9de1e6d658dd..c2d72a25f810 100644 --- a/pkgs/development/python-modules/ziamath/default.nix +++ b/pkgs/development/python-modules/ziamath/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ziamath"; - version = "0.8.1"; + version = "0.9"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-Bbwq4Ods3P/724KO94jSmMLD1ubfaMHP/gTlOL/2pnE="; + hash = "sha256-ISd+J7R8qZ0NXdlyHMj+torzr+541UAhNCSaUH8ytSQ="; }; nativeBuildInputs = [ From 0bd988a489051a0523bebfb3af51094e08ea0f83 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 17 Jan 2024 00:40:16 +0100 Subject: [PATCH 09/36] python3Packages.schemdraw: fix ModuleNotFoundError: No module named 'setuptools' --- pkgs/development/python-modules/schemdraw/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/schemdraw/default.nix b/pkgs/development/python-modules/schemdraw/default.nix index bf4bcee43758..1c0c05d7d48b 100644 --- a/pkgs/development/python-modules/schemdraw/default.nix +++ b/pkgs/development/python-modules/schemdraw/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , pyparsing , matplotlib , latex2mathml @@ -25,6 +26,10 @@ buildPythonPackage rec { hash = "sha256-wa/IeNGZynU/xKwyFwebXcFaruhBFqGWsrZYaIEVa8Q="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyparsing ]; From 88189d0e878227122db7e8a04624fcbcf7a9bdd2 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 7 Jan 2024 22:56:20 +0100 Subject: [PATCH 10/36] python3Packages.schemdraw: 0.17 -> 0.18 --- pkgs/development/python-modules/schemdraw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/schemdraw/default.nix b/pkgs/development/python-modules/schemdraw/default.nix index 1c0c05d7d48b..441e668f81fc 100644 --- a/pkgs/development/python-modules/schemdraw/default.nix +++ b/pkgs/development/python-modules/schemdraw/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "schemdraw"; - version = "0.17"; + version = "0.18"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-wa/IeNGZynU/xKwyFwebXcFaruhBFqGWsrZYaIEVa8Q="; + hash = "sha256-JJc3LA+fqB+2g7pPIZ8YMV921EyYpLZrHSJCYyYThZg="; }; nativeBuildInputs = [ From 3796848533ba4c51dcd9c0ddcd26a45c75f81504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sun, 28 Jan 2024 14:38:23 +0100 Subject: [PATCH 11/36] lemminx: halve the closure size --- pkgs/by-name/le/lemminx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/lemminx/package.nix b/pkgs/by-name/le/lemminx/package.nix index 816f095e8ce5..df946d3b4dea 100644 --- a/pkgs/by-name/le/lemminx/package.nix +++ b/pkgs/by-name/le/lemminx/package.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , makeWrapper -, jre +, jre_headless , maven , writeScript , lemminx @@ -67,7 +67,7 @@ maven.buildMavenPackage rec { install -Dm644 org.eclipse.lemminx/target/org.eclipse.lemminx-uber.jar \ $out/share - makeWrapper ${jre}/bin/java $out/bin/lemminx \ + makeWrapper ${jre_headless}/bin/java $out/bin/lemminx \ --add-flags "-jar $out/share/org.eclipse.lemminx-uber.jar" runHook postInstall From 4976602506b24abcbfbe53be0b417ab71c484f07 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 31 Jan 2024 22:07:04 +0100 Subject: [PATCH 12/36] python311Packages.dask: 2023.12.0 -> 2024.1.1 Diff: https://github.com/dask/dask/compare/refs/tags/2023.12.0...2024.1.1 Changelog: https://docs.dask.org/en/latest/changelog.html --- pkgs/development/python-modules/dask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 70b15822cb65..77f702506136 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2023.12.0"; + version = "2024.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-LMd55s8LT4m6Ym+LmXb4TKPnZ0jMkNBfcPJxmgruMDM="; + hash = "sha256-L8bRh2bx36CYrAFXYJF67rCeCRfm5ufhTkMFRJo0yYo="; }; nativeBuildInputs = [ From a0b3ece1fde4f9dbddc8c735fd6ecb989ebc93ee Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 1 Feb 2024 19:08:36 +0100 Subject: [PATCH 13/36] mongoose: 3.3.1 -> 3.3.2 --- .../development/libraries/science/math/mongoose/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/math/mongoose/default.nix b/pkgs/development/libraries/science/math/mongoose/default.nix index df645809a445..29b901277f61 100644 --- a/pkgs/development/libraries/science/math/mongoose/default.nix +++ b/pkgs/development/libraries/science/math/mongoose/default.nix @@ -7,11 +7,11 @@ }: let - suitesparseVersion = "7.5.1"; + suitesparseVersion = "7.6.0"; in stdenv.mkDerivation { pname = "mongoose"; - version = "3.3.1"; + version = "3.3.2"; outputs = [ "bin" "out" "dev" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation { owner = "DrTimothyAldenDavis"; repo = "SuiteSparse"; rev = "v${suitesparseVersion}"; - hash = "sha256-6eC26rag9kZ1E4qJ5KY/dLXGld+EHP2OUpyikjXQhQk="; + hash = "sha256-zZXbUNXxVi4mpI4j4GjyVYraoPFWcuep9q5jl1XdqEo="; }; nativeBuildInputs = [ From f847055660a96b0cffc4534ea096aa123c245dc7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 2 Feb 2024 07:48:32 +0100 Subject: [PATCH 14/36] python311Packages.dask-histogram: 2023.10.0 -> 2024.2.0 Diff: https://github.com/dask-contrib/dask-histogram/compare/refs/tags/2023.10.0...2024.2.0 Changelog: https://github.com/dask-contrib/dask-histogram/releases/tag/2024.2.0 --- pkgs/development/python-modules/dask-histogram/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dask-histogram/default.nix b/pkgs/development/python-modules/dask-histogram/default.nix index c465baf23309..0931cf6060c0 100644 --- a/pkgs/development/python-modules/dask-histogram/default.nix +++ b/pkgs/development/python-modules/dask-histogram/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "dask-histogram"; - version = "2023.10.0"; - format = "pyproject"; + version = "2024.2.0"; + pyproject = true; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-histogram"; rev = "refs/tags/${version}"; - hash = "sha256-ugAqNdvCROCCXURwsGLpnl/lBEAremvTI7MVa/TWt6c="; + hash = "sha256-YU5i7mGOZxj/pvpkZLwohoSuHJgS3zkHYVuj1Vtyrj4="; }; nativeBuildInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Histograms with task scheduling"; homepage = "https://dask-histogram.readthedocs.io/"; + changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ veprbl ]; }; From 9f7633677facb6d90cb2a08326e477e611b8c943 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 2 Feb 2024 08:26:43 +0100 Subject: [PATCH 15/36] python311Packages.dask-awkward: 2024.1.2 -> 2024.2.0 Diff: https://github.com/dask-contrib/dask-awkward/compare/refs/tags/2024.1.2...2024.2.0 Changelog: https://github.com/dask-contrib/dask-awkward/releases/tag/2024.2.0 --- pkgs/development/python-modules/dask-awkward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index f2dc07fbd90b..0875430cc383 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2024.1.2"; + version = "2024.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "dask-contrib"; repo = "dask-awkward"; rev = "refs/tags/${version}"; - hash = "sha256-5UyB/qFfQPLA1N3L6NipW6+FzI0x6hZXu6ickAktlYw="; + hash = "sha256-oBGja1dt9UbHym0c5K/pAMXNErryr3u6IhDRuhwTvG0="; }; pythonRelaxDeps = [ From b9fd3082e79232759d8b4bab7e3ae87aa79d3e15 Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Fri, 2 Feb 2024 09:10:34 +0100 Subject: [PATCH 16/36] invidious: unstable-2023-12-06 -> unstable-2024-01-29 --- pkgs/servers/invidious/versions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index 24177680d770..73915248c706 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "9e8baa35397671aabfc77f6b912c9f1829be52b6", - "sha256": "sha256-Mbdh/YMTOamYLZcQ8afKREMC/wTutVnkx8Q0ON8wovQ=", - "version": "unstable-2023-12-06" + "rev": "c005ada48723808e507d0a4d5a3363a1c14a4f07", + "sha256": "sha256-KbnBdAAjScwKV4uUzyBXAQx2C7MqCdCM3gSvgNIzKAU=", + "version": "unstable-2024-01-29" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", From 1923704fa8b13330d3bc417c3d11254799c77001 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 2 Feb 2024 08:49:12 +0100 Subject: [PATCH 17/36] gpt4all: init at 2.6.2 --- pkgs/by-name/gp/gpt4all-chat/package.nix | 72 ++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 pkgs/by-name/gp/gpt4all-chat/package.nix diff --git a/pkgs/by-name/gp/gpt4all-chat/package.nix b/pkgs/by-name/gp/gpt4all-chat/package.nix new file mode 100644 index 000000000000..84a4de626204 --- /dev/null +++ b/pkgs/by-name/gp/gpt4all-chat/package.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qt6 +, fmt +, shaderc +, vulkan-headers +, wayland +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gpt4all-chat"; + version = "2.6.2"; + + src = fetchFromGitHub { + fetchSubmodules = true; + hash = "sha256-BQE4UQEOOUAh0uGwQf7Q9D30s+aoGFyyMH6EI/WVIkc="; + owner = "nomic-ai"; + repo = "gpt4all"; + rev = "v${finalAttrs.version}"; + }; + + sourceRoot = "${finalAttrs.src.name}/gpt4all-chat"; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'set(CMAKE_INSTALL_PREFIX ''${CMAKE_BINARY_DIR}/install)' "" + ''; + + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + fmt + qt6.qtwayland + qt6.qtquicktimeline + qt6.qtsvg + qt6.qthttpserver + qt6.qtwebengine + qt6.qt5compat + shaderc + vulkan-headers + wayland + ]; + + cmakeFlags = [ + "-DKOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER=OFF" + "-DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON" + "-DKOMPUTE_OPT_USE_BUILT_IN_FMT=OFF" + ]; + + postInstall = '' + rm -rf $out/include + rm -rf $out/lib/*.a + mv $out/bin/chat $out/bin/${finalAttrs.meta.mainProgram} + install -m 444 -D $src/gpt4all-chat/flatpak-manifest/io.gpt4all.gpt4all.desktop $out/share/applications/io.gpt4all.gpt4all.desktop + install -m 444 -D $src/gpt4all-chat/icons/logo.svg $out/share/icons/hicolor/scalable/apps/io.gpt4all.gpt4all.svg + substituteInPlace $out/share/applications/io.gpt4all.gpt4all.desktop \ + --replace 'Exec=chat' 'Exec=${finalAttrs.meta.mainProgram}' + ''; + + meta = { + description = "A free-to-use, locally running, privacy-aware chatbot. No GPU or internet required"; + homepage = "https://github.com/nomic-ai/gpt4all-chat"; + license = lib.licenses.mit; + mainProgram = "gpt4all-chat"; + maintainers = with lib.maintainers; [ drupol polygon ]; + }; +}) From 019015621b9f45f0c26e37a3f295d7393c54158a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Feb 2024 15:01:38 +0000 Subject: [PATCH 18/36] flyctl: 0.1.146 -> 0.1.147 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index c96cbe6cfb97..1fffbb6cd8c8 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.1.146"; + version = "0.1.147"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-FXEYZEMwUsDWoN+MHjg6Au0rgZTE4N0ViktmEi2nH7c="; + hash = "sha256-lSDoviV2jI6jYAZyFt2SppmBzMamflisCizABrLXVw4="; }; - vendorHash = "sha256-hfNrhaRZoRdbvh/MnwKWFbepGkCuCsbcW88tWSPwCO0="; + vendorHash = "sha256-x4lP0oLsII/auhr3DqlY9Tp75V4b0D9QwcDmGLy0ii4="; subPackages = [ "." ]; From 44d45eb78c6aa8c65597e09b20c8bf8ba0d424be Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 2 Feb 2024 21:09:45 +0100 Subject: [PATCH 19/36] python311Packages.awkward-cpp: 28 -> 29 Changelog: https://github.com/scikit-hep/awkward/releases/tag/v29 --- pkgs/development/python-modules/awkward-cpp/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index 3ccfc393a988..18c0be822dea 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "28"; + version = "29"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ME67+QDFdzaP08SRpN3+aleQvex2orBr3MRygXYmRZI="; + hash = "sha256-r0t4kbeLkDFxvONB6I0q3YQFn6Fn8I6KmTAFmZ0bnRs="; }; nativeBuildInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "CPU kernels and compiled extensions for Awkward Array"; homepage = "https://github.com/scikit-hep/awkward"; + changelog = "https://github.com/scikit-hep/awkward/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ veprbl ]; }; From efa1dbcd74f8bf7a1e57a6f66ac89f094f885f8e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 2 Feb 2024 21:10:56 +0100 Subject: [PATCH 20/36] python311Packages.awkward: 2.5.2 -> 2.6.0 Diff: https://github.com/scikit-hep/awkward/compare/refs/tags/v2.5.2...v2.6.0 Changelog: https://github.com/scikit-hep/awkward/releases/tag/v2.6.0 --- pkgs/development/python-modules/awkward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index fa31f3b5a4f7..0a5b78fc5cf6 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.5.2"; + version = "2.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "awkward"; rev = "refs/tags/v${version}"; - hash = "sha256-n50REyU/aWx6rj+9TZ52S3sZS25/hIaNfOe+AQGaXVA="; + hash = "sha256-rSEGQqCbmB1IWm6gHjYEO1wiTUPlz1s/SwQ5BiI1YRc="; }; nativeBuildInputs = [ From c73afae89bac84114dd729592f79c7a98f20f678 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Feb 2024 16:05:42 +0100 Subject: [PATCH 21/36] python311Packages.timezonefinder: 6.2.0 -> 6.4.0 Diff: https://github.com/jannikmi/timezonefinder/compare/refs/tags/6.2.0...6.4.0 Changelog: https://github.com/jannikmi/timezonefinder/blob/6.4.0/CHANGELOG.rst --- pkgs/development/python-modules/timezonefinder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index a0a72de7bb17..c124083bdc0b 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "timezonefinder"; - version = "6.2.0"; + version = "6.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jannikmi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-n6TcTezu5seKy34KDlzGikAVaqAud00gxywwJA3MaWM="; + hash = "sha256-6hcReAzqTp4Od/PJN/W1uz4VS129yMFqQYznbsC/TRY="; }; nativeBuildInputs = [ From ad2ffe074593cbefb378f592f09aa6a73ae97e6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Feb 2024 15:07:58 +0000 Subject: [PATCH 22/36] python311Packages.ezyrb: 1.3.0.post2401 -> 1.3.0.post2402 --- pkgs/development/python-modules/ezyrb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ezyrb/default.nix b/pkgs/development/python-modules/ezyrb/default.nix index faa7efa650f8..024509dad06b 100644 --- a/pkgs/development/python-modules/ezyrb/default.nix +++ b/pkgs/development/python-modules/ezyrb/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ezyrb"; - version = "1.3.0.post2401"; + version = "1.3.0.post2402"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mathLab"; repo = "EZyRB"; rev = "refs/tags/v${version}"; - hash = "sha256-mNpW9RSli7af0fHLh+cmBrOQaO0wlGOrcLigefMR2ww="; + hash = "sha256-MiFNTz3vrN4rMHK7e4ntE35wzgnPt6yczCv7XDcUlO8="; }; propagatedBuildInputs = [ From ebd7defbeefc858fd63fd8efe3473bab6122a836 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Feb 2024 16:09:14 +0100 Subject: [PATCH 23/36] python311Packages.timezonefinder: refactor --- .../python-modules/timezonefinder/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index c124083bdc0b..9ad58a97ff4a 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "timezonefinder"; version = "6.4.0"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "jannikmi"; - repo = pname; + repo = "timezonefinder"; rev = "refs/tags/${version}"; hash = "sha256-6hcReAzqTp4Od/PJN/W1uz4VS129yMFqQYznbsC/TRY="; }; @@ -42,11 +42,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'numpy = "^1.22"' 'numpy = "*"' - ''; - pythonImportsCheck = [ "timezonefinder" ]; From 2f6fad2a2cab5047920b6f6f59069915c35190bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Feb 2024 15:18:50 +0000 Subject: [PATCH 24/36] dracula-theme: unstable-2024-01-24 -> unstable-2024-01-31 --- pkgs/data/themes/dracula-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/data/themes/dracula-theme/default.nix index 0f40caab8c6a..b36c806e6a23 100644 --- a/pkgs/data/themes/dracula-theme/default.nix +++ b/pkgs/data/themes/dracula-theme/default.nix @@ -2,7 +2,7 @@ let themeName = "Dracula"; - version = "unstable-2024-01-24"; + version = "unstable-2024-01-31"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "ed505cce4b61831765a128ebb544edf040f57be5"; - hash = "sha256-jPZabinmQMCtBPj/P3vuqb3OCUbx9OAuCoar7ZnegPQ="; + rev = "cd11595a2301a6f47a14b25992783ef199c44311"; + hash = "sha256-i2jO9103uwjNawvDBrHOa18svwCI6NsAVybnUaJBLt0="; }; propagatedUserEnvPkgs = [ From 1243fd78eee0ac13f4b9e105ecc7d6784c74bf02 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Sat, 3 Feb 2024 12:15:57 +0100 Subject: [PATCH 25/36] linuxPackages.nvidiaPackages.vulkan_beta: 535.43.24 -> 535.43.25 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f0c6ce6c3f8b..de3248c2dd59 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -70,11 +70,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "535.43.24"; + version = "535.43.25"; persistencedVersion = "535.98"; settingsVersion = "535.98"; - sha256_64bit = "sha256-UbheqrPzSMPFjM3URN/Jr8rpuY12BCFtCvBlxMqXFbo="; - openSha256 = "sha256-01UOzUZTCf7pHUc61/qlh98qAiXsYp8Iankev9+wVdI="; + sha256_64bit = "sha256-Ir75rT1xs3Cycd1Wl7EqIUuU5bGfeSPYbGiq2Eqjlsw="; + openSha256 = "sha256-HnM4/sUKvZ8hGuwa0YSTAuC9HShw6on3+lk0TcqcPEQ="; settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s="; persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; From 9f24a286adfb4ca4f136b1f347b6cc4d6440684f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 3 Feb 2024 10:49:43 -0500 Subject: [PATCH 26/36] sing-box: 1.8.4 -> 1.8.5 Diff: https://github.com/SagerNet/sing-box/compare/v1.8.4...v1.8.5 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index ded2dd4ce28b..f2c0b85980b2 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-Zn2akHyStq014k4ze3zsqASFnn6VTQ6fu1HdYMBDI1Y="; + hash = "sha256-fW96Hh0eBK8pKkrQP+uA2uaqnZFvZszX2d+VOxKo5Zk="; }; - vendorHash = "sha256-L5TFMwhxit4Bm6h6KSEygKxGHbflNa0UQ9lzNqsvuGA="; + vendorHash = "sha256-4PauMcKpjXtXHJds8MJPH9L+UYPu2fFltP2uUEXtb+o="; tags = [ "with_quic" From 01d6a2756841fc2637c1e57869c4a54fa5878979 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 3 Feb 2024 09:18:01 -0500 Subject: [PATCH 27/36] krane: 3.4.0 -> 3.4.2 https://github.com/Shopify/krane/blob/v3.4.2/CHANGELOG.md --- .../networking/cluster/krane/Gemfile.lock | 32 +++++---- .../networking/cluster/krane/gemset.nix | 68 ++++++++++++------- 2 files changed, 62 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index 4a131603e178..81217037a353 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.2) + activesupport (7.1.3) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -14,26 +14,25 @@ GEM addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) base64 (0.2.0) - bigdecimal (3.1.5) + bigdecimal (3.1.6) colorize (0.8.1) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) connection_pool (2.4.1) - domain_name (0.6.20231109) + domain_name (0.6.20240107) drb (2.2.0) ruby2_keywords ejson (1.4.1) - faraday (2.7.12) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-net_http (3.1.0) + net-http ffi (1.16.3) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - google-cloud-env (2.1.0) + google-cloud-env (2.1.1) faraday (>= 1.0, < 3.a) - googleauth (1.9.1) + googleauth (1.9.2) faraday (>= 1.0, < 3.a) google-cloud-env (~> 2.1) jwt (>= 1.4, < 3.0) @@ -54,7 +53,7 @@ GEM jsonpath (1.1.5) multi_json jwt (2.7.1) - krane (3.4.0) + krane (3.4.2) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -73,12 +72,14 @@ GEM llhttp-ffi (0.4.0) ffi-compiler (~> 1.0) rake (~> 13.0) - mime-types (3.5.1) + mime-types (3.5.2) mime-types-data (~> 3.2015) mime-types-data (3.2023.1205) - minitest (5.20.0) + minitest (5.21.2) multi_json (1.15.0) mutex_m (0.2.0) + net-http (0.4.1) + uri netrc (0.11.0) os (1.1.4) public_suffix (5.0.4) @@ -99,6 +100,7 @@ GEM thor (1.3.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) + uri (0.13.0) PLATFORMS ruby @@ -107,4 +109,4 @@ DEPENDENCIES krane BUNDLED WITH - 2.4.22 + 2.5.5 diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index 0326b6d1146d..16634bfff85b 100644 --- a/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/pkgs/applications/networking/cluster/krane/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l6hmf99zgckpn812qfxfz60rbh0zixv1hxnxhjlg8942pvixn2v"; + sha256 = "09zrw3sydkk6lwzjhzia38wg1as5aab2lgnysfdr1qxh39zi7z7v"; type = "gem"; }; - version = "7.1.2"; + version = "7.1.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b1gqa90amazwnll9590m5ighywh9sacsmpyd5ihljivmvjswksk"; + sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; type = "gem"; }; - version = "3.1.5"; + version = "3.1.6"; }; colorize = { groups = ["default"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; + sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; connection_pool = { groups = ["default"]; @@ -76,10 +76,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gpciaifmxql8h01ci12qq08dnqrdlzkkz6fmia9v9yc3r9a29si"; + sha256 = "0cyr2xm576gqhqicsyqnhanni47408w2pgvrfi8pd13h2li3nsaz"; type = "gem"; }; - version = "0.6.20231109"; + version = "0.6.20240107"; }; drb = { dependencies = ["ruby2_keywords"]; @@ -103,25 +103,26 @@ version = "1.4.1"; }; faraday = { - dependencies = ["base64" "faraday-net_http" "ruby2_keywords"]; + dependencies = ["faraday-net_http"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19w1lzipnxs6vy3y0pw1mf956f768ppzgfrnlpwgrpnjjv9xqf7d"; + sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s"; type = "gem"; }; - version = "2.7.12"; + version = "2.9.0"; }; faraday-net_http = { + dependencies = ["net-http"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8"; + sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn"; type = "gem"; }; - version = "3.0.2"; + version = "3.1.0"; }; ffi = { groups = ["default"]; @@ -150,10 +151,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "056r1p8vhjswnx2cy3mzhwc5gj03whmpz8m4p2ph37gag5bpnxmf"; + sha256 = "16b9yjbrzal1cjkdbn29fl06ikjn1dpg1vdsjak1xvhpsp3vhjyg"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.1"; }; googleauth = { dependencies = ["faraday" "google-cloud-env" "jwt" "multi_json" "os" "signet"]; @@ -161,10 +162,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0spv89di017rg25psiv4w3pn6f67y2w6vv8w910i83b5yii84rl1"; + sha256 = "1qpvsvcag90nw2fjws12m96hsicpmcv04v35j9aiik9rmxxvlk9h"; type = "gem"; }; - version = "1.9.1"; + version = "1.9.2"; }; http = { dependencies = ["addressable" "http-cookie" "http-form_data" "llhttp-ffi"]; @@ -246,10 +247,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1phcappqkj30i99cqggj4sqzhcb3gim9my5xqzybq3byqfrcprqg"; + sha256 = "0lgl5x8b0wwih6h609sglp5zfdg8ymbmh8yv4vp1lcxvf885riyz"; type = "gem"; }; - version = "3.4.0"; + version = "3.4.2"; }; kubeclient = { dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; @@ -279,10 +280,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; + sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1"; type = "gem"; }; - version = "3.5.1"; + version = "3.5.2"; }; mime-types-data = { groups = ["default"]; @@ -299,10 +300,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; + sha256 = "1hmszq7p4zp2ha3qjv1axam602rgnqhlz5zfzil7yk4nvfwcv1bn"; type = "gem"; }; - version = "5.20.0"; + version = "5.21.2"; }; multi_json = { groups = ["default"]; @@ -324,6 +325,17 @@ }; version = "0.2.0"; }; + net-http = { + dependencies = ["uri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9"; + type = "gem"; + }; + version = "0.4.1"; + }; netrc = { groups = ["default"]; platforms = []; @@ -437,4 +449,14 @@ }; version = "2.0.6"; }; + uri = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96"; + type = "gem"; + }; + version = "0.13.0"; + }; } From 689f7f0061f7339ee7470bbcc3c41f4cf2a633b9 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 3 Feb 2024 16:15:24 +0000 Subject: [PATCH 28/36] cie-middleware-linux: pull upstream `gcc-13` build fix Without the change build against `gcc-13` fails as https://hydra.nixos.org/build/247556526: ../pkcs11/src/LOGGER/Logger.h:74:15: error: 'uint8_t' has not been declared 74 | void buffer(uint8_t* buff, size_t buff_size) throw(); | ^~~~~~~ --- pkgs/tools/security/cie-middleware-linux/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/security/cie-middleware-linux/default.nix b/pkgs/tools/security/cie-middleware-linux/default.nix index fa5ec2d2af83..9982da5ae896 100644 --- a/pkgs/tools/security/cie-middleware-linux/default.nix +++ b/pkgs/tools/security/cie-middleware-linux/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , makeWrapper , strip-nondeterminism , meson @@ -92,6 +93,15 @@ stdenv.mkDerivation { libxml2 ]; + patches = [ + # Fix gcc-13 build by adding missing include. + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/M0Rf30/cie-middleware-linux/commit/1da1196152f7a3bbe92ba3ce993ebb6785ff049e.patch"; + hash = "sha256-aM23A1ZX8kebgX6RXVS78SEa+to93glUmIYO+lfUzfg="; + }) + ]; + postPatch = '' # substitute the cieid command with this $out/bin/cieid substituteInPlace libs/pkcs11/src/CSP/AbilitaCIE.cpp \ From 3d01a2c66c2da52b8f4277cc09473e057b763d17 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 3 Feb 2024 17:31:14 +0100 Subject: [PATCH 29/36] rye: 0.20.0 -> 0.21.0 Diff: https://github.com/mitsuhiko/rye/compare/refs/tags/0.20.0...0.21.0 Changelog: https://github.com/mitsuhiko/rye/releases/tag/0.21.0 --- pkgs/development/tools/rye/Cargo.lock | 2 +- pkgs/development/tools/rye/default.nix | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/rye/Cargo.lock b/pkgs/development/tools/rye/Cargo.lock index ee100f150091..f6e5b5d01966 100644 --- a/pkgs/development/tools/rye/Cargo.lock +++ b/pkgs/development/tools/rye/Cargo.lock @@ -1786,7 +1786,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.20.0" +version = "0.21.0" dependencies = [ "age", "anyhow", diff --git a/pkgs/development/tools/rye/default.nix b/pkgs/development/tools/rye/default.nix index 79d77675975b..6ed67fd5bdff 100644 --- a/pkgs/development/tools/rye/default.nix +++ b/pkgs/development/tools/rye/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, fetchpatch , installShellFiles , pkg-config , openssl @@ -13,23 +12,15 @@ rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-btgX1nDBJeZjwv2pBi4OEwzFf7xpRDaq63JTrSkF+BM="; + hash = "sha256-H41gJNNrelPyCP1EYXIjwEc+1v2lnw9xmm0J+12lENA="; }; - patches = [ - (fetchpatch { # Fixes the build: https://github.com/mitsuhiko/rye/issues/575 - name = "bump-monotrail"; - url = "https://github.com/mitsuhiko/rye/commit/675255c2c12176fff8988b6c3896dcd10766b681.patch"; - hash = "sha256-kBqjTHW7oT6DY17bdReoRfV9E75QtYqBlOv4FHbbexw="; - }) - ]; - cargoLock = { lockFile = ./Cargo.lock; outputHashes = { From 84fe26e88423675ba37999867902afddd3c9b9f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Feb 2024 17:18:29 +0000 Subject: [PATCH 30/36] minio-client: 2024-01-28T16-23-14Z -> 2024-01-31T08-59-40Z --- pkgs/tools/networking/minio-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index a2e53bb79890..34fb4dc3f313 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "minio-client"; - version = "2024-01-28T16-23-14Z"; + version = "2024-01-31T08-59-40Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-1FV7o4kkFEbcEmkV3Kj37vQ6uKZ/GoSnuCp3NNxMGN8="; + sha256 = "sha256-SD/CtYQFWy7VFo2jT53LDQfH7fw14OOKAbImNeG/amE="; }; vendorHash = "sha256-wxFhj+oqj5WV/UkPZlmeJHF2WC4oLlZOql1qgSFs+zU="; From 9650e5af804d94f32276a3783052a35715c8d006 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Feb 2024 17:32:42 +0000 Subject: [PATCH 31/36] blackfire: 2.24.4 -> 2.25.0 --- pkgs/development/tools/misc/blackfire/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 6d77711f1c80..a55f0d0edea9 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.24.4"; + version = "2.25.0"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "lQqVpuDIDATyUUZmCz6JCy4ENDhDGyo5ojeSleLVEcI="; + sha256 = "F3OkFTHPO6zBOYu2umAQIPW7CQ+K+J2/mmL98H2xaCg="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "wwl6MZNSbtoP+o6ZIto1zoAFpymKe5uoBHRj+HzY7YA="; + sha256 = "/rDH9dzSlqDSqkIHzDy/8rJQ+Ow9SAPn+/oRGP37lL8="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "7AxcCNZY05nWzkiUAkN6LOv9te0uXSHyzOR/1vol6xg="; + sha256 = "2fjRPrl9SYCS32lO4bFLam4IrigMjucVc/OVg4yrWsM="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "CEVXM/Xt5IN+yYTKbKOzw3Pm9xZoF+QmVUrmFZJ1PCY="; + sha256 = "GYjKOUDLCHPkI5k4nt2NB/R8IJhLP+4VNifEhRSsnu8="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "Y2WCknZhAl09Ip6RsfGzbXw9h8k1+fDThYDcpr25CJk="; + sha256 = "/Uvwq3wxbIT0kqKJJfh9W55EguUoBdTQ426FI0XOD0o="; }; }; From c9e81e12c7ac3b3d1a40ecea201d86394b0fad46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Feb 2024 18:15:14 +0000 Subject: [PATCH 32/36] renode-dts2repl: unstable-2024-01-20 -> unstable-2024-02-02 --- pkgs/by-name/re/renode-dts2repl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index d0dee53f5964..0ba3bfa6a4b5 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "unstable-2024-01-20"; + version = "unstable-2024-02-02"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "bd09db556fa762cb1a4857d874545957d91b0010"; - hash = "sha256-bGDM23PuON4fx4pNCNVYw2bN0tIWjmwZqghhksAIVGA="; + rev = "84b14adc21fcd12b9772f69f9dcf702133fa6551"; + hash = "sha256-xFMkYjSZajQSflsTF1BtARUZWbnAvBRfN4gK3RAgeIU="; }; nativeBuildInputs = [ From 2a343855de6d1225800c6cb0eb4c312b5c430fc2 Mon Sep 17 00:00:00 2001 From: "Elijah M. Immer" Date: Sat, 3 Feb 2024 11:43:59 -0800 Subject: [PATCH 33/36] noisetorch: add `meta.mainProgram` the `lib.getExe`'s feature to use the package's name as the binary is deprecated, and `pkgs/README.md` says: > `meta.mainProgram` must be set when appropriate. This just adds the `meta.mainProgram` to `noisetorch` as it's the only binary. --- pkgs/applications/audio/noisetorch/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix index 51b565bc3e74..78f50cbbedbc 100644 --- a/pkgs/applications/audio/noisetorch/default.nix +++ b/pkgs/applications/audio/noisetorch/default.nix @@ -37,5 +37,6 @@ buildGoModule rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ panaeon lom ]; + mainProgram = "noisetorch"; }; } From d6d8fd86dd7a9487ebc04778d778327dbbf23807 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 3 Feb 2024 14:42:33 -0500 Subject: [PATCH 34/36] abella: update url, refactor to finalAttrs style --- pkgs/applications/science/logic/abella/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix index 7e4cfad72ed1..4483b8ad4756 100644 --- a/pkgs/applications/science/logic/abella/default.nix +++ b/pkgs/applications/science/logic/abella/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, rsync, ocamlPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "abella"; version = "2.0.8"; src = fetchurl { - url = "http://abella-prover.org/distributions/${pname}-${version}.tar.gz"; + url = "http://abella-prover.org/distributions/abella-${finalAttrs.version}.tar.gz"; sha256 = "sha256-80b/RUpE3KRY0Qu8eeTxAbk6mwGG6jVTPOP0qFjyj2M="; }; @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { of programming languages and other logical systems which manipulate objects with binding. ''; - homepage = "http://abella-prover.org/"; + homepage = "https://abella-prover.org"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ bcdarwin ciil ]; platforms = lib.platforms.unix; }; -} +}) From 33da84b0c7f4561fc84a9b97a193d5eedf05bcb3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Feb 2024 20:01:33 +0000 Subject: [PATCH 35/36] httplib: 0.15.0 -> 0.15.2 --- pkgs/development/libraries/httplib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix index 1de0082cade2..ad27a98fa60b 100644 --- a/pkgs/development/libraries/httplib/default.nix +++ b/pkgs/development/libraries/httplib/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "httplib"; - version = "0.15.0"; + version = "0.15.2"; src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; rev = "v${version}"; - hash = "sha256-HV2RiWu4rt3rau/flcha500R67oGwbmyEPPnklpAvgY="; + hash = "sha256-DNktnRckqiZf0EQ96LfweDvBNgcX8u3Gry1LCs/Qj74="; }; nativeBuildInputs = [ cmake ]; From e36568edcd7c3459ee4ffa9bb31f2236edfee169 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Feb 2024 22:09:38 +0100 Subject: [PATCH 36/36] go-task: 3.33.1 -> 3.34.1 Diff: https://github.com/go-task/task/compare/refs/tags/v3.33.1...v3.34.1 Changelog: https://github.com/go-task/task/blob/v3.34.1/CHANGELOG.md --- pkgs/development/tools/go-task/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 2be4e63f3453..3c5e13473fc6 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.33.1"; + version = "3.34.1"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "refs/tags/v${version}"; - hash = "sha256-GeAVI1jsYH66KIJsdC20j3HADl6y8gRezSWBUEF1Muw="; + hash = "sha256-ngDAItX7aTWDpf2lOiJYUC7QXXzrexPV3nvZ/esLb7g="; }; - vendorHash = "sha256-kKYE8O+07ha35koSO+KG/K98rVbmDLqAhvaZsVHwUjY="; + vendorHash = "sha256-Czf7Bkld1NWJzU34NfDFL/Us9awnhlv8V9S4XxeoGxY="; doCheck = false;