From c4f70c3c275cc6ede5e190f8b3ad2a7817c5ef9c Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Wed, 14 Aug 2024 15:47:58 +0200 Subject: [PATCH 01/91] moodle: 4.4.1 -> 4.4.3 --- pkgs/servers/web-apps/moodle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 025bd8b00b02..fb24592e1625 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ], nixosTests }: let - version = "4.4.1"; + version = "4.4.3"; versionParts = lib.take 2 (lib.splitVersion version); # 4.2 -> 402, 3.11 -> 311 @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/download.php/direct/stable${stableVersion}/${pname}-${version}.tgz"; - hash = "sha256-+pzDrSMm+V4pEze13mJ/eyhaxcvnmG/eno0csCRTisU="; + hash = "sha256-SFysVBGGJKQFzm3pV25+wHaF7R1trqAOFQ1BLBTIzWk="; }; phpConfig = writeText "config.php" '' From 55e7c6155a91eb6b3a9f400cbc830c7271da5983 Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Wed, 14 Aug 2024 15:58:49 +0200 Subject: [PATCH 02/91] nixos/moodle: update to php83 --- nixos/modules/services/web-apps/moodle.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix index 7e2d59d3c3e7..9a66591badb5 100644 --- a/nixos/modules/services/web-apps/moodle.nix +++ b/nixos/modules/services/web-apps/moodle.nix @@ -56,7 +56,7 @@ let mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql"; pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql"; - phpExt = pkgs.php81.buildEnv { + phpExt = pkgs.php83.buildEnv { extensions = { all, ... }: with all; [ iconv mbstring curl openssl tokenizer soap ctype zip gd simplexml dom intl sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo filter opcache exif sodium ]; extraConfig = "max_input_vars = 5000"; }; From 5b260ab83d67b08d561f3191971efa57f6df87c0 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 20:26:32 +0900 Subject: [PATCH 03/91] python312Packages.vobject: 0.9.7 -> 0.9.8 Diff: https://github.com/py-vobject/vobject/compare/v0.9.7...v0.9.8 --- pkgs/development/python-modules/vobject/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index db8692e77b06..ad3bc832a428 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "0.9.7"; + version = "0.9.8"; format = "setuptools"; pname = "vobject"; src = fetchPypi { inherit pname version; - hash = "sha256-q3J7+B3oiYStpcEfBm8eFkmQPT49fskfHOloFyr9UlY="; + hash = "sha256-2wCn9NtJOXFV3YpoceiioBdabrpaZUww6RD4KylRS1g="; }; disabled = isPyPy; From 21d6e5c776852852fda897b0b33a4b137fed2f20 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 3 Nov 2024 00:03:26 +0900 Subject: [PATCH 04/91] python312Packages.vobject: refactor --- .../python-modules/vobject/default.nix | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index ad3bc832a428..44a769b306b3 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -3,14 +3,17 @@ buildPythonPackage, fetchPypi, isPyPy, - python, + setuptools, python-dateutil, + pytz, + six, + pytestCheckHook, }: buildPythonPackage rec { version = "0.9.8"; - format = "setuptools"; pname = "vobject"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -19,13 +22,23 @@ buildPythonPackage rec { disabled = isPyPy; - propagatedBuildInputs = [ python-dateutil ]; + build-system = [ setuptools ]; - checkPhase = "${python.interpreter} tests.py"; + dependencies = [ + python-dateutil + pytz + six + ]; + + pythonImportsCheck = [ "vobject" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "tests.py" ]; meta = with lib; { description = "Module for reading vCard and vCalendar files"; - homepage = "http://eventable.github.io/vobject/"; + homepage = "https://github.com/py-vobject/vobject"; license = licenses.asl20; maintainers = [ ]; }; From 17c58cde1623229a7f34973ca49fb9204badddda Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sat, 19 Oct 2024 10:10:06 +1100 Subject: [PATCH 05/91] python312Packages.llama-cpp-python: init at 0.3.1 --- .../llama-cpp-python/default.nix | 96 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 98 insertions(+) create mode 100644 pkgs/development/python-modules/llama-cpp-python/default.nix diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix new file mode 100644 index 000000000000..9a2f9458a875 --- /dev/null +++ b/pkgs/development/python-modules/llama-cpp-python/default.nix @@ -0,0 +1,96 @@ +{ + lib, + buildPythonPackage, + cmake, + fetchFromGitHub, + gitUpdater, + ninja, + pathspec, + pyproject-metadata, + pytestCheckHook, + pythonOlder, + scikit-build-core, + + config, + cudaSupport ? config.cudaSupport, + cudaPackages ? { }, + + diskcache, + jinja2, + numpy, + typing-extensions, + scipy, + huggingface-hub, +}: + +buildPythonPackage rec { + pname = "llama-cpp-python"; + version = "0.3.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "abetlen"; + repo = "llama-cpp-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-eO1zvNJZBE5BCnbgbh00tFIRWBCWor1lIsrLXs/HFds="; + fetchSubmodules = true; + }; + + dontUseCmakeConfigure = true; + SKBUILD_CMAKE_ARGS = lib.strings.concatStringsSep ";" ( + lib.optionals cudaSupport [ + "-DGGML_CUDA=on" + "-DCUDAToolkit_ROOT=${lib.getDev cudaPackages.cuda_nvcc}" + "-DCMAKE_CUDA_COMPILER=${lib.getExe cudaPackages.cuda_nvcc}" + ] + ); + + nativeBuildInputs = [ + cmake + ninja + pathspec + pyproject-metadata + scikit-build-core + ]; + + buildInputs = lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cudart # cuda_runtime.h + cuda_cccl # + libcublas # cublas_v2.h + ] + ); + + propagatedBuildInputs = [ + diskcache + jinja2 + numpy + typing-extensions + ]; + + nativeCheckInputs = [ + pytestCheckHook + scipy + huggingface-hub + ]; + + disabledTests = [ + # tries to download model from huggingface-hub + "test_real_model" + "test_real_llama" + ]; + + pythonImportsCheck = [ "llama_cpp" ]; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { + description = "Python bindings for llama.cpp"; + homepage = "https://github.com/abetlen/llama-cpp-python"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kirillrdy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e15b48dcb152..64247563f162 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7366,6 +7366,8 @@ self: super: with self; { lizard = callPackage ../development/python-modules/lizard { }; + llama-cpp-python = callPackage ../development/python-modules/llama-cpp-python { }; + llama-cloud = callPackage ../development/python-modules/llama-cloud { }; llama-index = callPackage ../development/python-modules/llama-index { }; From cc1ac71df5506424d9a6f27969515bc930e08d74 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sat, 26 Oct 2024 06:50:47 +1100 Subject: [PATCH 06/91] python312Packages.llama-cpp-python: add passthru.test to build with CUDA support --- pkgs/development/python-modules/llama-cpp-python/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix index 9a2f9458a875..30eaf7ee6b77 100644 --- a/pkgs/development/python-modules/llama-cpp-python/default.nix +++ b/pkgs/development/python-modules/llama-cpp-python/default.nix @@ -10,6 +10,7 @@ pytestCheckHook, pythonOlder, scikit-build-core, + llama-cpp-python, config, cudaSupport ? config.cudaSupport, @@ -86,6 +87,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "llama_cpp" ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + passthru.tests.llama-cpp-python = llama-cpp-python.override { cudaSupport = true; }; meta = { description = "Python bindings for llama.cpp"; From f4e43ac273943bedb957d13fcdcf0cba4203e9bc Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 27 Oct 2024 04:45:16 +1100 Subject: [PATCH 07/91] python312Packages.llama-cpp-python: use stdenv from cudaPackages --- .../python-modules/llama-cpp-python/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix index 30eaf7ee6b77..4c0391858e4a 100644 --- a/pkgs/development/python-modules/llama-cpp-python/default.nix +++ b/pkgs/development/python-modules/llama-cpp-python/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, cmake, fetchFromGitHub, @@ -23,14 +24,18 @@ scipy, huggingface-hub, }: - -buildPythonPackage rec { - pname = "llama-cpp-python"; +let version = "0.3.1"; +in +buildPythonPackage { + pname = "llama-cpp-python"; + inherit version; pyproject = true; disabled = pythonOlder "3.7"; + stdenv = if cudaSupport then cudaPackages.backendStdenv else stdenv; + src = fetchFromGitHub { owner = "abetlen"; repo = "llama-cpp-python"; From d753a00a5a84b436881a1d6a861d7c0dbd81ad24 Mon Sep 17 00:00:00 2001 From: aktaboot Date: Sun, 17 Nov 2024 23:37:29 +0100 Subject: [PATCH 08/91] mullvad-vpn: 2024.6 -> 2024.7 --- pkgs/applications/networking/mullvad-vpn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 098051c72fb1..025fe29a45d9 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -64,7 +64,7 @@ let systemd ]; - version = "2024.6"; + version = "2024.7"; selectSystem = attrs: attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -74,8 +74,8 @@ let }; hash = selectSystem { - x86_64-linux = "sha256-paP9W23AbA9O4MiTdF5r7N50GgT4xu2vb9ktfBdPqDM="; - aarch64-linux = "sha256-5FRPjiLyWDe7RNlhkiF4NUaCxVkfXZbxeoQxNAAls/I="; + x86_64-linux = "sha256-l6uWrOzMzn8bF5iZzfa/xffLIvAPsCaLwzcRPRW3t0o="; + aarch64-linux = "sha256-/RLTjhkiH9WdYO56njnxQyJ0nSaAq/awrkm0NhctFZY="; }; in From d87419737d1eaf75f20f39c124309a4038443d7a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 12:02:21 +0100 Subject: [PATCH 09/91] python312Packages.libcst: 1.5.0 -> 1.5.1 Diff: https://github.com/Instagram/LibCST/compare/refs/tags/v1.5.0...v1.5.1 Changelog: https://github.com/Instagram/LibCST/blob/v1.5.1/CHANGELOG.md --- pkgs/development/python-modules/libcst/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 01dab0b558c6..94d18746a5b6 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "libcst"; - version = "1.5.0"; + version = "1.5.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,14 +32,14 @@ buildPythonPackage rec { owner = "Instagram"; repo = "LibCST"; rev = "refs/tags/v${version}"; - hash = "sha256-0r2xQ8QVmA4I6eZHBWd/U1fQ8nK5rdblIoMACudOYPY="; + hash = "sha256-fveY4ah94pv9ImI36MNrrxTpZv/DtLb45pXm67L8/GA="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${src.name}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-mexXuOsL1+F/GL2wMf/pwK7bJLFRgPtPSYE4W3E0VQ0="; + hash = "sha256-TcWGW1RF2se89BtvQHO+4BwnRMZ8ygqO3du9Q/gZi/Q="; }; cargoRoot = "native"; From c73e275bfa481a79298a554c134554cc9c536618 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 24 Nov 2024 12:12:42 +0100 Subject: [PATCH 10/91] pg_top: 3.7.0 -> 4.1.0 Changelog: https://gitlab.com/pg_top/pg_top/-/blob/main/HISTORY.rst --- pkgs/by-name/pg/pg_top/package.nix | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/pg/pg_top/package.nix b/pkgs/by-name/pg/pg_top/package.nix index c8a35e9fb178..c3695574116a 100644 --- a/pkgs/by-name/pg/pg_top/package.nix +++ b/pkgs/by-name/pg/pg_top/package.nix @@ -1,30 +1,33 @@ -{ lib, stdenv, fetchurl, ncurses, postgresql }: +{ lib, stdenv, fetchurl, ncurses, postgresql, cmake, libelf, libbsd }: stdenv.mkDerivation rec { pname = "pg_top"; - version = "3.7.0"; + version = "4.1.0"; src = fetchurl { - url = "https://pgfoundry.org/frs/download.php/1781/pg_top-${version}.tar.gz"; - sha256 = "17xrv0l58rv3an06gkajzw0gg6v810xx6vl137an1iykmhvfh7h2"; + url = "https://pg_top.gitlab.io/source/pg_top-${version}.tar.xz"; + sha256 = "sha256-WdSiQURJgtBCYoS/maImppcyM8wzUIJzLWmiSZPlx1Q="; }; - buildInputs = [ ncurses postgresql ]; + buildInputs = [ libbsd libelf ncurses postgresql ]; + + nativeBuildInputs = [ cmake ]; meta = with lib; { description = "'top' like tool for PostgreSQL"; longDescription = '' pg_top allows you to: * View currently running SQL statement of a process. - * View query plan of a currently running SQL statement. + * View query plan of a currently running SELECT statement. * View locks held by a process. - * View user table statistics. - * View user index statistics. + * View I/O statistics per process. + * View replication statistics for downstream nodes. ''; - homepage = "http://ptop.projects.postgresql.org/"; + homepage = "https://pg_top.gitlab.io"; + changelog = "https://gitlab.com/pg_top/pg_top/-/blob/main/HISTORY.rst"; platforms = platforms.linux; - license = licenses.free; # see commands.c + license = licenses.bsd3; mainProgram = "pg_top"; }; } From e36b87dce3d8e49c41c21613ae73b05b2b4b1f85 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 24 Nov 2024 12:14:22 +0100 Subject: [PATCH 11/91] pg_top: nixfmt --- pkgs/by-name/pg/pg_top/package.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pg/pg_top/package.nix b/pkgs/by-name/pg/pg_top/package.nix index c3695574116a..14327c00c602 100644 --- a/pkgs/by-name/pg/pg_top/package.nix +++ b/pkgs/by-name/pg/pg_top/package.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, ncurses, postgresql, cmake, libelf, libbsd }: +{ + cmake, + fetchurl, + lib, + libbsd, + libelf, + ncurses, + postgresql, + stdenv, +}: stdenv.mkDerivation rec { pname = "pg_top"; @@ -9,7 +18,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-WdSiQURJgtBCYoS/maImppcyM8wzUIJzLWmiSZPlx1Q="; }; - buildInputs = [ libbsd libelf ncurses postgresql ]; + buildInputs = [ + libbsd + libelf + ncurses + postgresql + ]; nativeBuildInputs = [ cmake ]; From 6d0eadc43951dcc0730fc18b34a6494f30251d58 Mon Sep 17 00:00:00 2001 From: parth Date: Mon, 25 Nov 2024 13:39:09 -0500 Subject: [PATCH 12/91] maintainers: add parth --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e831b07b5197..9eb601c7c811 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16771,6 +16771,11 @@ githubId = 33826198; name = "Philipp Arras"; }; + parth = { + github = "parth"; + githubId = 821972; + name = "Parth Mehrotra"; + }; pashashocky = { email = "pashashocky@gmail.com"; github = "pashashocky"; From a4633945f09d7478712a65855d450f92266bef1f Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Tue, 26 Nov 2024 21:06:05 +0100 Subject: [PATCH 13/91] gerrit: 3.10.2 -> 3.10.3 Signed-off-by: Felix Singer --- pkgs/by-name/ge/gerrit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ge/gerrit/package.nix b/pkgs/by-name/ge/gerrit/package.nix index df65ab9837e4..653100b42698 100644 --- a/pkgs/by-name/ge/gerrit/package.nix +++ b/pkgs/by-name/ge/gerrit/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.10.2"; + version = "3.10.3"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - hash = "sha256-jsyL7j4ENzHVi07Uii0ouWXF3hkoGrq3NJi8fB1kj8o="; + hash = "sha256-pVI5YZihvJNuaboh2dLe/Aw371rNPiGbaLUd0ALpANQ="; }; buildCommand = '' From 47f6cf666d20a311ee33275d95167a809798be6f Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Tue, 26 Nov 2024 21:06:46 +0100 Subject: [PATCH 14/91] gerrit: Apply nixfmt Signed-off-by: Felix Singer --- pkgs/by-name/ge/gerrit/package.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ge/gerrit/package.nix b/pkgs/by-name/ge/gerrit/package.nix index 653100b42698..0db54bbf88ec 100644 --- a/pkgs/by-name/ge/gerrit/package.nix +++ b/pkgs/by-name/ge/gerrit/package.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, nixosTests }: +{ + lib, + stdenv, + fetchurl, + nixosTests, +}: stdenv.mkDerivation rec { pname = "gerrit"; @@ -40,7 +45,10 @@ stdenv.mkDerivation rec { license = licenses.asl20; description = "Web based code review and repository management for the git version control system"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; - maintainers = with maintainers; [ flokli zimbatm ]; + maintainers = with maintainers; [ + flokli + zimbatm + ]; platforms = platforms.unix; }; } From 9896808a2529df22485d3965f9152a4cd0867940 Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Tue, 26 Nov 2024 23:47:46 -0800 Subject: [PATCH 15/91] hdf5_1_10: enable cpp support --- pkgs/tools/misc/hdf5/1.10.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/hdf5/1.10.nix b/pkgs/tools/misc/hdf5/1.10.nix index dda8fd3a8fa4..5e9c99e5d939 100644 --- a/pkgs/tools/misc/hdf5/1.10.nix +++ b/pkgs/tools/misc/hdf5/1.10.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , removeReferencesTo +, cppSupport ? true , zlibSupport ? true , zlib , enableShared ? !stdenv.hostPlatform.isStatic @@ -28,7 +29,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = optional zlibSupport zlib; configureFlags = optional enableShared "--enable-shared" - ++ optional javaSupport "--enable-java"; + ++ optional javaSupport "--enable-java" + ++ optional cppSupport "--enable-cxx"; patches = [ ]; From aebb41980c3cb6bfc88379f307aae4fd14f5e37b Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Tue, 26 Nov 2024 23:48:40 -0800 Subject: [PATCH 16/91] hdf5_1_10: add stephen-huan as maintainer --- pkgs/tools/misc/hdf5/1.10.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/hdf5/1.10.nix b/pkgs/tools/misc/hdf5/1.10.nix index 5e9c99e5d939..c74911d241ad 100644 --- a/pkgs/tools/misc/hdf5/1.10.nix +++ b/pkgs/tools/misc/hdf5/1.10.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { applications for managing, manipulating, viewing, and analyzing data in the HDF5 format. ''; license = lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant + maintainers = with lib.maintainers; [ stephen-huan ]; homepage = "https://www.hdfgroup.org/HDF5/"; platforms = lib.platforms.unix; }; From 51383099e79203959fc31abdccb0fd1e2b243ae7 Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Tue, 26 Nov 2024 23:50:05 -0800 Subject: [PATCH 17/91] rPackages.Rhdf5lib: remove hdf5_1_10 override --- pkgs/development/r-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 085a62509620..1e5420467e12 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1809,7 +1809,7 @@ let }); Rhdf5lib = let - hdf5 = pkgs.hdf5_1_10.overrideAttrs (attrs: {configureFlags = attrs.configureFlags ++ [ "--enable-cxx" ];}); + hdf5 = pkgs.hdf5_1_10; in old.Rhdf5lib.overrideAttrs (attrs: { propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ hdf5.dev pkgs.libaec ]; patches = [ ./patches/Rhdf5lib.patch ]; From 4e80396028047ac25db1f87c5828b4b31514ee21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Nov 2024 00:08:52 +0000 Subject: [PATCH 18/91] dmarc-metrics-exporter: 1.1.0 -> 1.2.0 --- pkgs/by-name/dm/dmarc-metrics-exporter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix b/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix index 7b6ef72c7d20..0a0cab6b0e9c 100644 --- a/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix +++ b/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "dmarc-metrics-exporter"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { owner = "jgosmann"; repo = "dmarc-metrics-exporter"; rev = "refs/tags/v${version}"; - hash = "sha256-xzIYlOZ1HeW+jbVDVlUPTIooFraQ0cJltsDoCzVMNsA="; + hash = "sha256-cIsI4TNYuLK0fpUg9lnbl5KSBtzQoT/pTByI9hiy/7o="; }; pythonRelaxDeps = true; From 602c7e45533c8eac822b1697efc086f731cdd59c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Nov 2024 16:06:50 +0000 Subject: [PATCH 19/91] python312Packages.python-gvm: 24.8.0 -> 24.11.0 --- pkgs/development/python-modules/python-gvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index 6d346d6c638b..6e3c886a5632 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "24.8.0"; + version = "24.11.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "python-gvm"; rev = "refs/tags/v${version}"; - hash = "sha256-JyImC75Le6S2kQXSU/Ze4TNaitJSJ8LD9j/ny+xjoGA="; + hash = "sha256-n4Izhtqs6awEtnt4r915ZtyHQnM49ExbuAzqJw/CNa0="; }; build-system = [ poetry-core ]; From 30ccc85dd929b5164505bb713bd3f601d34e6c5c Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 28 Nov 2024 12:12:30 -0800 Subject: [PATCH 20/91] README: Update to 24.11 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 990d8a53e202..7a87ec45361b 100644 --- a/README.md +++ b/README.md @@ -52,9 +52,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration system, [Hydra](https://hydra.nixos.org/). * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for the NixOS 24.05 release](https://hydra.nixos.org/jobset/nixos/release-24.05) +* [Continuous package builds for the NixOS 24.11 release](https://hydra.nixos.org/jobset/nixos/release-24.11) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for the NixOS 24.05 release](https://hydra.nixos.org/job/nixos/release-24.05/tested#tabs-constituents) +* [Tests for the NixOS 24.11 release](https://hydra.nixos.org/job/nixos/release-24.11/tested#tabs-constituents) Artifacts successfully built with Hydra are published to cache at https://cache.nixos.org/. When successful build and test criteria are From 5395596316216030152e807d9a189ede58dc2930 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 00:58:06 +0000 Subject: [PATCH 21/91] updatecli: 0.82.0 -> 0.88.0 --- pkgs/by-name/up/updatecli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix index 9695618455ba..9a1b2e0bd6c2 100644 --- a/pkgs/by-name/up/updatecli/package.nix +++ b/pkgs/by-name/up/updatecli/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "updatecli"; - version = "0.82.0"; + version = "0.88.0"; src = fetchFromGitHub { owner = "updatecli"; repo = "updatecli"; rev = "v${version}"; - hash = "sha256-kNc+Z+v4fvuWO/Ibr9VOekMDT39YEwA/fReP+e3C74U="; + hash = "sha256-qWggdLNF6iWrbcKgdR3Tr19bwK5wS5ffadS3kMFGp5E="; }; - vendorHash = "sha256-fnx0EAGxau0+ktnuUb8ljolNAlwu2595FMjsDbM2MiY="; + vendorHash = "sha256-feBmzBrV6yoepU8CiqKaB/bCWIhuiDNhMTem0y1Lynw="; # tests require network access doCheck = false; From 79466231490c7f6b5d2a6d7c37df204d44ff844c Mon Sep 17 00:00:00 2001 From: unrooted Date: Fri, 29 Nov 2024 04:37:01 +0100 Subject: [PATCH 22/91] chainsaw 2.9.2 -> 2.10.1 --- pkgs/by-name/ch/chainsaw/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/chainsaw/package.nix b/pkgs/by-name/ch/chainsaw/package.nix index 5789f488985c..f345d897c2f5 100644 --- a/pkgs/by-name/ch/chainsaw/package.nix +++ b/pkgs/by-name/ch/chainsaw/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "chainsaw"; - version = "2.9.2"; + version = "2.10.1"; src = fetchFromGitHub { owner = "WithSecureLabs"; repo = "chainsaw"; rev = "refs/tags/v${version}"; - hash = "sha256-oKlLFKCZNBcHURVvT0i8Hfym6r30ikndV30uuxjYgDM="; + hash = "sha256-ErDIfLhzCiFm3dZzr6ThjYCplfDKbALAqcu8c0gREH4="; }; - cargoHash = "sha256-1w3DYP69aOphoqbsZIF9aX56Lftg2niKClmImLTa5DE="; + cargoHash = "sha256-WuPfYxI61wsQyOKqPF7/a3Hx9vMBCkTkoXsZczgeKpg="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation From cafc21fb166d083707d085ac30f564d3375ff5b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Nov 2024 08:27:32 +0100 Subject: [PATCH 23/91] python312Packages.glances-api: 0.8.0 -> 0.9.0 Diff: https://github.com/home-assistant-ecosystem/python-glances-api/compare/refs/tags/0.8.0...0.9.0 Changelog: https://github.com/home-assistant-ecosystem/python-glances-api/releases/tag/0.9.0 --- .../python-modules/glances-api/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index 0f0f22280579..a9f103b417ed 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "glances-api"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,17 +22,9 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; rev = "refs/tags/${version}"; - hash = "sha256-QAnwFX53jf7yWWa308/XTARNw5Qeo9K2zfD+6+HiFuM="; + hash = "sha256-VLsNMFFt+kMxNw/81OMX4Fg/xCbQloCURmV0OxvClq8="; }; - patches = [ - (fetchpatch2 { - name = "pytest-httpx-compat.patch"; - url = "https://github.com/home-assistant-ecosystem/python-glances-api/commit/f193472a25469e7e4b946f9a1c3a7a95949c6c04.patch"; - hash = "sha256-hFeWv2WdbdeoaHgAOmwtBwWwPLjJzyurTZDV98qR7F8="; - }) - ]; - build-system = [ poetry-core ]; dependencies = [ httpx ]; @@ -49,7 +41,7 @@ buildPythonPackage rec { description = "Python API for interacting with Glances"; homepage = "https://github.com/home-assistant-ecosystem/python-glances-api"; changelog = "https://github.com/home-assistant-ecosystem/python-glances-api/releases/tag/${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From a0559c7b2bf243978a759fdaceb8507d9a04e657 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 28 Nov 2024 12:19:08 -0800 Subject: [PATCH 24/91] Release 24.11 --- CONTRIBUTING.md | 2 +- .../doc/manual/installation/upgrading.chapter.md | 16 ++++++++-------- .../doc/manual/release-notes/rl-2411.section.md | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f7e159cfef3e..655e57df2829 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -345,7 +345,7 @@ See [Nix Channel Status](https://status.nixos.org/) for the current channels and Here's a brief overview of the main Git branches and what channels they're used for: - `master`: The main branch, used for the unstable channels such as `nixpkgs-unstable`, `nixos-unstable` and `nixos-unstable-small`. -- `release-YY.MM` (e.g. `release-24.11`): The NixOS release branches, used for the stable channels such as `nixos-24.11`, `nixos-24.11-small` and `nixpkgs-24.11-darwin`. +- `release-YY.MM` (e.g. `release-25.05`): The NixOS release branches, used for the stable channels such as `nixos-25.05`, `nixos-25.05-small` and `nixpkgs-25.05-darwin`. When a channel is updated, a corresponding Git branch is also updated to point to the corresponding commit. So e.g. the [`nixpkgs-unstable` branch](https://github.com/nixos/nixpkgs/tree/nixpkgs-unstable) corresponds to the Git commit from the [`nixpkgs-unstable` channel](https://channels.nixos.org/nixpkgs-unstable). diff --git a/nixos/doc/manual/installation/upgrading.chapter.md b/nixos/doc/manual/installation/upgrading.chapter.md index 1a3fc10ec800..86567c7a3d26 100644 --- a/nixos/doc/manual/installation/upgrading.chapter.md +++ b/nixos/doc/manual/installation/upgrading.chapter.md @@ -6,7 +6,7 @@ expressions and associated binaries. The NixOS channels are updated automatically from NixOS's Git repository after certain tests have passed and all packages have been built. These channels are: -- *Stable channels*, such as [`nixos-24.05`](https://channels.nixos.org/nixos-24.05). +- *Stable channels*, such as [`nixos-24.11`](https://channels.nixos.org/nixos-24.11). These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not @@ -19,7 +19,7 @@ passed and all packages have been built. These channels are: radical changes between channel updates. It's not recommended for production systems. -- *Small channels*, such as [`nixos-24.05-small`](https://channels.nixos.org/nixos-24.05-small) +- *Small channels*, such as [`nixos-24.11-small`](https://channels.nixos.org/nixos-24.11-small) or [`nixos-unstable-small`](https://channels.nixos.org/nixos-unstable-small). These are identical to the stable and unstable channels described above, except that they contain fewer binary packages. This means they get updated @@ -38,8 +38,8 @@ supported stable release. When you first install NixOS, you're automatically subscribed to the NixOS channel that corresponds to your installation source. For -instance, if you installed from a 24.05 ISO, you will be subscribed to -the `nixos-24.05` channel. To see which NixOS channel you're subscribed +instance, if you installed from a 24.11 ISO, you will be subscribed to +the `nixos-24.11` channel. To see which NixOS channel you're subscribed to, run the following as root: ```ShellSession @@ -54,16 +54,16 @@ To switch to a different NixOS channel, do ``` (Be sure to include the `nixos` parameter at the end.) For instance, to -use the NixOS 24.05 stable channel: +use the NixOS 24.11 stable channel: ```ShellSession -# nix-channel --add https://channels.nixos.org/nixos-24.05 nixos +# nix-channel --add https://channels.nixos.org/nixos-24.11 nixos ``` If you have a server, you may want to use the "small" channel instead: ```ShellSession -# nix-channel --add https://channels.nixos.org/nixos-24.05-small nixos +# nix-channel --add https://channels.nixos.org/nixos-24.11-small nixos ``` And if you want to live on the bleeding edge: @@ -117,6 +117,6 @@ modules. You can also specify a channel explicitly, e.g. ```nix { - system.autoUpgrade.channel = "https://channels.nixos.org/nixos-24.05"; + system.autoUpgrade.channel = "https://channels.nixos.org/nixos-24.11"; } ``` diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 4f2420579ec5..91b6d65604ce 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -1,4 +1,4 @@ -# Release 24.11 (“Vicuña”, 2024.11/??) {#sec-release-24.11} +# Release 24.11 (“Vicuña”, 2024.11/28) {#sec-release-24.11} From a23730505eb0cc9e29f4cffe15b67a4a6359e681 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Fri, 29 Nov 2024 14:20:45 +0000 Subject: [PATCH 25/91] parca-agent: init at 0.35.0 --- pkgs/by-name/pa/parca-agent/package.nix | 47 +++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/pa/parca-agent/package.nix diff --git a/pkgs/by-name/pa/parca-agent/package.nix b/pkgs/by-name/pa/parca-agent/package.nix new file mode 100644 index 000000000000..16cbb20a2e05 --- /dev/null +++ b/pkgs/by-name/pa/parca-agent/package.nix @@ -0,0 +1,47 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, + stdenv, +}: + +buildGoModule rec { + pname = "parca-agent"; + version = "0.35.0"; + + src = fetchFromGitHub { + owner = "parca-dev"; + repo = "parca-agent"; + rev = "refs/tags/v${version}"; + hash = "sha256-5MoHX47uUtQgszNuu9ImLJPYnaN2NKZKOPa60PMHDL0="; + fetchSubmodules = true; + }; + + proxyVendor = true; + vendorHash = "sha256-v2OnCuOI9inZ4WiU/3PbBwK6ZcvZX21MNsLhRWZ6sGY="; + + buildInputs = [ + stdenv.cc.libc.static + ]; + + ldflags = [ + "-X=main.version=${version}" + "-X=main.commit=${src.rev}" + "-extldflags=-static" + ]; + + tags = [ + "osusergo" + "netgo" + ]; + + meta = { + description = "eBPF based, always-on profiling agent"; + homepage = "https://github.com/parca-dev/parca-agent"; + changelog = "https://github.com/parca-dev/parca-agent/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jnsgruk ]; + platforms = lib.platforms.linux; + mainProgram = "parca-agent"; + }; +} From c0f61fe3d4a780f79399fedf00624bdc3bb9c19a Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Fri, 29 Nov 2024 14:49:42 +0000 Subject: [PATCH 26/91] parca-debuginfo: init at 0.11.0 --- pkgs/by-name/pa/parca-debuginfo/package.nix | 34 +++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pkgs/by-name/pa/parca-debuginfo/package.nix diff --git a/pkgs/by-name/pa/parca-debuginfo/package.nix b/pkgs/by-name/pa/parca-debuginfo/package.nix new file mode 100644 index 000000000000..39acbf3d2633 --- /dev/null +++ b/pkgs/by-name/pa/parca-debuginfo/package.nix @@ -0,0 +1,34 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "parca-debuginfo"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "parca-dev"; + repo = "parca-debuginfo"; + rev = "refs/tags/v${version}"; + hash = "sha256-gL1BgDtEf2Q7yxzpoiTJY+nsRlsWv3zYzLVvaVijMDM="; + }; + + vendorHash = "sha256-xtKkKhKQmZcCIFTOH+oM5a2cPlAWlJPRNQWfrAl2948="; + + ldflags = [ + "-X=main.version=${version}" + "-X=main.commit=${src.rev}" + ]; + + meta = { + description = "Command line utility for handling debuginfos"; + changelog = "https://github.com/parca-dev/parca-debuginfo/releases/tag/v${version}"; + homepage = "https://github.com/parca-dev/parca-debuginfo"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jnsgruk ]; + platforms = lib.platforms.unix; + mainProgram = "parca-debuginfo"; + }; +} From 9b0e7e5e504ff7184de67a973236c81f3062ea80 Mon Sep 17 00:00:00 2001 From: parth Date: Tue, 26 Nov 2024 13:36:25 -0500 Subject: [PATCH 27/91] lockbook: init at 0.9.15 --- pkgs/by-name/lo/lockbook/package.nix | 50 ++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pkgs/by-name/lo/lockbook/package.nix diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix new file mode 100644 index 000000000000..751a83f43136 --- /dev/null +++ b/pkgs/by-name/lo/lockbook/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + installShellFiles, +}: +rustPlatform.buildRustPackage rec { + pname = "lockbook"; + version = "0.9.15"; + + src = fetchFromGitHub { + owner = "lockbook"; + repo = "lockbook"; + rev = "refs/tags/${version}"; + hash = "sha256-hqBjA/6MWlhVjV4m+cIcnoRTApHuzbPzivMsaQHfRcc="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-+M+wL26KDbLKhcujPyWAsTlXwLrQVCUbTnnu/7sXul4="; + + doCheck = false; # there are no cli tests + cargoBuildFlags = [ + "--package" + "lockbook-cli" + ]; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --bash --name lockbook.bash <($out/bin/lockbook completions bash) + installShellCompletion --zsh --name _lockbook <($out/bin/lockbook completions zsh) + installShellCompletion --fish --name lockbook.fish <($out/bin/lockbook completions fish) + ''; + + meta = { + description = "Private, polished note-taking platform"; + longDescription = '' + Write notes, sketch ideas, and store files in one secure place. + Share seamlessly, keep data synced, and access it on any + platform—even offline. Lockbook encrypts files so even we + can’t see them, but don’t take our word for it: + Lockbook is 100% open-source. + ''; + homepage = "https://lockbook.net"; + license = lib.licenses.unlicense; + platforms = lib.platforms.all; + changelog = "https://github.com/lockbook/lockbook/releases"; + maintainers = [ lib.maintainers.parth ]; + }; +} From 8ee82bb6f61980d94676909cea861cd2ec4c1117 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 16:40:10 +0000 Subject: [PATCH 28/91] restinio: 0.7.2 -> 0.7.3 --- pkgs/by-name/re/restinio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/restinio/package.nix b/pkgs/by-name/re/restinio/package.nix index 84e8ff69e2dc..d9fc3d97d61d 100644 --- a/pkgs/by-name/re/restinio/package.nix +++ b/pkgs/by-name/re/restinio/package.nix @@ -21,13 +21,13 @@ assert !with_boost_asio -> asio != null; stdenv.mkDerivation (finalAttrs: { pname = "restinio"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "Stiffstream"; repo = "restinio"; rev = "v.${finalAttrs.version}"; - hash = "sha256-Nv/VVdHciCv+DsVu3MqfXeAa8Ef+qi6c1OaTAVrYUg0="; + hash = "sha256-heVdo0MtsWi/r9yse+/FZ55lhiunyEdwB3UkOOY5Vj0="; }; strictDeps = true; From 5de6a11a5082bdd1582775c2783c4a0debd4c30e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 18:03:20 +0000 Subject: [PATCH 29/91] pragtical: 3.5.0 -> 3.5.1 --- pkgs/by-name/pr/pragtical/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/pragtical/package.nix b/pkgs/by-name/pr/pragtical/package.nix index 7cac519f039f..a3429658b317 100644 --- a/pkgs/by-name/pr/pragtical/package.nix +++ b/pkgs/by-name/pr/pragtical/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pragtical"; - version = "3.5.0"; + version = "3.5.1"; pluginManagerVersion = "1.2.9"; src = fetchFromGitHub { @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { find subprojects -type d -name .git -prune -execdir rm -r {} + ''; - hash = "sha256-a9LnLKtJ33YHtlnhWmKBeW5dOjjwa7PmaZjYh0+Nx9g="; + hash = "sha256-o19akSgsWLRTyHT+dvmTeTS4HtNfzEyNXBhVot92OD4="; }; nativeBuildInputs = [ From ae944e6d41b7ea00b02a4e5693bae07eb44d606f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 18:10:03 +0000 Subject: [PATCH 30/91] python312Packages.unstructured: 0.15.14 -> 0.16.8 --- pkgs/development/python-modules/unstructured/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index 74667094daa2..03b39aa71743 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -57,7 +57,7 @@ grpcio, }: let - version = "0.15.14"; + version = "0.16.8"; optional-dependencies = { huggingflace = [ langdetect @@ -100,7 +100,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-cIMKaSKG4T832rpiJeiwftqVrcMezD9ICfislGPV/TQ="; + hash = "sha256-TIJ1cfti+zF9sP0LrIIue9F8n8gRAy5+8hb4cIzHk2U="; }; propagatedBuildInputs = [ From 55d1ba40f24f818a6a20acf421414bb4eacbd21e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Nov 2024 20:14:28 +0100 Subject: [PATCH 31/91] morf: init at 1.0.0 Offensive mobile security tool designed to identify and address sensitive information https://github.com/amrudesh1/morf --- pkgs/by-name/mo/morf/package.nix | 33 ++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/mo/morf/package.nix diff --git a/pkgs/by-name/mo/morf/package.nix b/pkgs/by-name/mo/morf/package.nix new file mode 100644 index 000000000000..c2a9f7ba2811 --- /dev/null +++ b/pkgs/by-name/mo/morf/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "morf"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "amrudesh1"; + repo = "morf"; + rev = "refs/tags/v${version}"; + hash = "sha256-3PJ+YtKSH6HHAXBSHO8iMP2HFiuW1RQ0N8iUjQD7NBw="; + }; + + vendorHash = "sha256-tK58UGCI7CuJsFSM7htRQT98tzunAOXyYAxhCkdTJdU="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "Offensive mobile security tool designed to identify and address sensitive information"; + homepage = "https://github.com/amrudesh1/morf"; + changelog = "https://github.com/amrudesh1/morf/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "morf"; + }; +} From 2f9c22f53b48b720c242e50a58084a34d9382599 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sat, 30 Nov 2024 03:16:04 +0800 Subject: [PATCH 32/91] bombsquad: fix hash mismatch --- pkgs/by-name/bo/bombsquad/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bo/bombsquad/package.nix b/pkgs/by-name/bo/bombsquad/package.nix index 078d12df8dd7..55afb4eb444c 100644 --- a/pkgs/by-name/bo/bombsquad/package.nix +++ b/pkgs/by-name/bo/bombsquad/package.nix @@ -22,11 +22,11 @@ let { x86_64-linux = { name = "BombSquad_Linux_x86_64"; - hash = "sha256-jrExsqaM6uhnKMGPkJJTsKt2Imek+YDI2soSP/kfPj0="; + hash = "sha256-aujLYzFcKaW0ff7sRdyJ6SvSQowafWVbmwycQfDQUYY="; }; aarch-64-linux = { name = "BombSquad_Linux_Arm64"; - hash = "sha256-o1Yg0C5k07NZzc9jQrHXR+kkQl8HZ55U9/fqcpe3Iyw="; + hash = "sha256-pPP7QZzToTOQtSxzF7Q3ZzlDjUjQWMBM/y79d6Yf38I="; }; } .${stdenv.targetPlatform.system} or (throw "${stdenv.targetPlatform.system} is unsupported."); From 4c5015ad7dce874be4bdc2d0d5c52147eb21a220 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 19:33:32 +0000 Subject: [PATCH 33/91] gcov2lcov: 1.1.0 -> 1.1.1 --- pkgs/by-name/gc/gcov2lcov/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gc/gcov2lcov/package.nix b/pkgs/by-name/gc/gcov2lcov/package.nix index 4bc714a6a199..712a65506214 100644 --- a/pkgs/by-name/gc/gcov2lcov/package.nix +++ b/pkgs/by-name/gc/gcov2lcov/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gcov2lcov"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "jandelgado"; repo = "gcov2lcov"; rev = "v${version}"; - hash = "sha256-E8TPxaKJTd+5OP9e5S1FD5aZP42nJvjiqqNs4xP9gm4="; + hash = "sha256-ifXpT5jGNaStqvzP5Rq6Hf6PFhpiKMRC+eSYOZfzt+s="; }; vendorHash = "sha256-/2OIBWXbNch6lmw0C1jkyJfNefJXOVG9/jNW8CYHTsc="; From 37715c31379d3601e023f2bca2b733fa4d9b7885 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 20:53:45 +0000 Subject: [PATCH 34/91] legcord: 1.0.4 -> 1.0.5 --- pkgs/by-name/le/legcord/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix index e83bf3d254e2..13a78b07246b 100644 --- a/pkgs/by-name/le/legcord/package.nix +++ b/pkgs/by-name/le/legcord/package.nix @@ -11,20 +11,20 @@ }: stdenv.mkDerivation rec { pname = "legcord"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "Legcord"; repo = "Legcord"; rev = "v${version}"; - hash = "sha256-1nM0v8cjLcctvRcGHGtbyGxaqonIY8wM9s413NxTo+I="; + hash = "sha256-9CicqDZDetxElD36OLizyVNxkqz3rQOjAtUNTGWVwss="; }; nativeBuildInputs = [ pnpm.configHook nodejs makeWrapper copyDesktopItems ]; pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-E1kT3WiCYkLwrfHa11P1Z6e0fVnZSpXEQStr1NPjEJU="; + hash = "sha256-5GE/I2xLmu2Wu9mjzZMk1YZvtS5PgpwgXnxuY+4nimQ="; }; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; From 50d277f9e774121ce7309d2c5a51618b5e5a6c42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 23:23:21 +0000 Subject: [PATCH 35/91] kube-bench: 0.9.0 -> 0.9.2 --- pkgs/by-name/ku/kube-bench/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kube-bench/package.nix b/pkgs/by-name/ku/kube-bench/package.nix index d24be8a0df40..3e61ac525d06 100644 --- a/pkgs/by-name/ku/kube-bench/package.nix +++ b/pkgs/by-name/ku/kube-bench/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-bench"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-x6xCrxePB/TR7BP1kLiVFjv4pLUJu9JVh5/Y0ebOjvY="; + hash = "sha256-wRY40yNXTcixCUYWFMQsfkI7MPE4RuxCEHBoedDpW9Y="; }; - vendorHash = "sha256-d6GhZBHDSRgMVeglw8rhq5QF7gRH4hQOzTn0DZjvhiA="; + vendorHash = "sha256-bTpE8zJ6dCMimTowexehxnWPq3tXd0H9ZduJvCVqAlI="; nativeBuildInputs = [ installShellFiles ]; From 8c4cc0b2c1048d8651f1548758ee3b1f257dc698 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 00:37:55 +0000 Subject: [PATCH 36/91] terraform-backend-git: 0.1.7 -> 0.1.8 --- pkgs/by-name/te/terraform-backend-git/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/terraform-backend-git/package.nix b/pkgs/by-name/te/terraform-backend-git/package.nix index 54bbb1b13b1e..1c96250f991c 100644 --- a/pkgs/by-name/te/terraform-backend-git/package.nix +++ b/pkgs/by-name/te/terraform-backend-git/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "terraform-backend-git"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "plumber-cd"; repo = "terraform-backend-git"; rev = "v${version}"; - hash = "sha256-mLgUA7f4enlVuQx4VM3QbNuaAq7FgDaRyiG0sbT31ng="; + hash = "sha256-mZbGMv5b9wK/gWqQB75sDJIVURrS6t/L7WBhTonaatQ="; }; vendorHash = "sha256-vFx59dIdniLRP0xHcD3c22GidZOPdGZvmvg/BvxFBGI="; From a4242293ee02b75bcf0e1fc3918586d3d09d3ec5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 00:42:43 +0000 Subject: [PATCH 37/91] svd2rust: 0.33.5 -> 0.35.0 --- pkgs/by-name/sv/svd2rust/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sv/svd2rust/package.nix b/pkgs/by-name/sv/svd2rust/package.nix index c49435674e44..c8849693ff5d 100644 --- a/pkgs/by-name/sv/svd2rust/package.nix +++ b/pkgs/by-name/sv/svd2rust/package.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.33.5"; + version = "0.35.0"; src = fetchCrate { inherit pname version; - hash = "sha256-wZfCk8jzTmltpmrp7QWU1uS5ct10iltNFdUCJvnrv98="; + hash = "sha256-KLwIwJtPBQ8Sa94/IEJhIGTx/n3oYQKINmNV5L5TJV0="; }; - cargoHash = "sha256-5m3/5zwjDeDgPuUsTIknXwEMjQs0gtVoksQn4EdPnwM="; + cargoHash = "sha256-4a89Do57KFKu/RDTB4BxUxVlO46HL5aEhhHmnzLuZGo="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From 5196f6a891ce4a3550b8685f1d3625f1caeb17d9 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sat, 30 Nov 2024 01:45:18 +0100 Subject: [PATCH 38/91] vencord: 1.10.7 -> 1.10.8 --- pkgs/by-name/ve/vencord/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index c84ba05fe514..763d671f28be 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vencord"; - version = "1.10.7"; + version = "1.10.8"; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; rev = "v${finalAttrs.version}"; - hash = "sha256-/CZzRIXD0shEok9H+Vx7s9BmzXTI6ly957jvS+nU2fI="; + hash = "sha256-2UOz8o+3jWppk6lWatbG0avcqBFpxHYSMEspCpFWWOk="; }; pnpmDeps = pnpm.fetchDeps { From f962636439680f403ef87dbcb1fb5bca8a3443be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 01:31:29 +0000 Subject: [PATCH 39/91] mpvScripts.mpv-image-viewer.equalizer: 0-unstable-2023-03-03 -> 0-unstable-2024-11-23 --- pkgs/applications/video/mpv/scripts/mpv-image-viewer.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/mpv-image-viewer.nix b/pkgs/applications/video/mpv/scripts/mpv-image-viewer.nix index f00f0cbd9ba4..9527ed2c651f 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-image-viewer.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-image-viewer.nix @@ -10,12 +10,12 @@ let let self = { inherit pname; - version = "0-unstable-2023-03-03"; + version = "0-unstable-2024-11-23"; src = fetchFromGitHub { owner = "occivink"; repo = "mpv-image-viewer"; - rev = "efc82147cba4809f22e9afae6ed7a41ad9794ffd"; - hash = "sha256-H7uBwrIb5uNEr3m+rHED/hO2CHypGu7hbcRpC30am2Q="; + rev = "128b498e3e57a14deea5ca9bbf662f8c1ca79e8d"; + hash = "sha256-VwIL1529CW9MLK4N9jHHddSSZD5RsJ5bWGWqGJ751C0="; }; sourceRoot = "source/scripts"; From 4d39a7b8e637d6d666e83ab7df01a3e540e3318c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 02:06:13 +0000 Subject: [PATCH 40/91] cargo-tarpaulin: 0.31.2 -> 0.31.3 --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index f426f0f35dcd..a68328655e35 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.31.2"; + version = "0.31.3"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - hash = "sha256-rYu8SsG2vEXMpwsLV/6TjC0iDJRsm6UEl4qXZwXRRpE="; + hash = "sha256-ROsoTXkNB6qlcKFXgylZYuKp+WTFcbcDfw6L5ZqiRiA="; }; - cargoHash = "sha256-5zhsWliwPPXq+KUKW0N1qyueg8BD+qmUqeKUrVl/vZ8="; + cargoHash = "sha256-1ZyAyJvHJtf8qEW7VmrZLL8WeVjD+w5vkVUld6keL+s="; nativeBuildInputs = [ pkg-config From 3be17711c3ff54763365e04502a7d63b3ee00e9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 02:16:11 +0000 Subject: [PATCH 41/91] grpcui: 1.4.1 -> 1.4.2 --- pkgs/by-name/gr/grpcui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grpcui/package.nix b/pkgs/by-name/gr/grpcui/package.nix index 2f8106a2854a..3691a3ab8eb8 100644 --- a/pkgs/by-name/gr/grpcui/package.nix +++ b/pkgs/by-name/gr/grpcui/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpcui"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "fullstorydev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OIwfLuWY7Y0t85v+P/0F55vEe0hNohlqMl16Omr8AF0="; + sha256 = "sha256-yk9SgQMUga7htP7XTKFk2JGzixxBV3y3PrnkzsiAMbw="; }; - vendorHash = "sha256-dEek7q8OjFgCn+f/qyiQL/5qu8RJp38vZk3OrBREHx4="; + vendorHash = "sha256-uP5jtFji2E6GqpzjD7X5p59TXu7KQVBgEX+Gh0BIclM="; doCheck = false; From 7e8137033ccb9b55120d6936025f1e35101c247c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Nov 2024 18:36:33 -0800 Subject: [PATCH 42/91] radicale2: drop It is broken in master and release-24.05. --- pkgs/servers/radicale/2.x.nix | 51 --------------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pkgs/servers/radicale/2.x.nix diff --git a/pkgs/servers/radicale/2.x.nix b/pkgs/servers/radicale/2.x.nix deleted file mode 100644 index 23195338641f..000000000000 --- a/pkgs/servers/radicale/2.x.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, fetchFromGitHub, python3 }: - -python3.pkgs.buildPythonApplication rec { - pname = "Radicale"; - version = "2.1.12"; - - # No tests in PyPI tarball - src = fetchFromGitHub { - owner = "Kozea"; - repo = "Radicale"; - rev = version; - sha256 = "14f9ql0fiwapaa4xaslwgk1ah9fzxxan2p1p2rxb4a5iqph1z0cl"; - }; - - # We only want functional tests - postPatch = '' - sed -i "s/pytest-cov\|pytest-flake8\|pytest-isort//g" setup.py - sed -i "/^addopts/d" setup.cfg - ''; - - propagatedBuildInputs = with python3.pkgs; [ - vobject - python-dateutil - passlib - setuptools - ]; - - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; - - disabledTests = [ - # uses unsupported crypt method - "test_htpasswd_crypt" - ]; - - meta = with lib; { - homepage = "https://radicale.org/v2.html"; - description = "CalDAV CardDAV server"; - mainProgram = "radicale"; - longDescription = '' - The Radicale Project is a complete CalDAV (calendar) and CardDAV - (contact) server solution. Calendars and address books are available for - both local and remote access, possibly limited through authentication - policies. They can be viewed and edited by calendar and contact clients - on mobile phones or computers. - ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ edwtjo pSub ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6fdda136f76d..6cdf9663d6f8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1077,6 +1077,7 @@ mapAliases { rabbitvcs = throw "rabbitvcs has been removed from nixpkgs, because it was broken"; # Added 2024-07-15 radare2-cutter = throw "'radare2-cutter' has been renamed to/replaced by 'cutter'"; # Converted to throw 2024-10-17 + radicale2 = throw "'radicale2' was removed because it was broken. Use 'radicale' (version 3) instead"; # Added 2024-11-29 radicle-cli = throw "'radicle-cli' was removed in favor of 'radicle-node'"; # Added 2024-05-04 radicle-upstream = throw "'radicle-upstream' was sunset, see "; # Added 2024-05-04 railway-travel = diebahn; # Added 2024-04-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27331b8f8b4f..023bde4c0ada 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12139,7 +12139,6 @@ with pkgs; erlang = erlang_26; }; - radicale2 = callPackage ../servers/radicale/2.x.nix { }; radicale3 = radicale; qcal = callPackage ../tools/networking/qcal/default.nix { }; From 6bff67cfbb52664816bc1c67e642e1c0c0ca64e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Nov 2024 18:40:24 -0800 Subject: [PATCH 43/91] radicale3: move to aliases --- pkgs/by-name/et/etesync-dav/package.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/et/etesync-dav/package.nix b/pkgs/by-name/et/etesync-dav/package.nix index 1758dde546ea..00b9c2227b90 100644 --- a/pkgs/by-name/et/etesync-dav/package.nix +++ b/pkgs/by-name/et/etesync-dav/package.nix @@ -3,7 +3,7 @@ , nixosTests , python3 , fetchFromGitHub -, radicale3 +, radicale }: python3.pkgs.buildPythonApplication { @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication { flask-wtf msgpack setuptools - (python.pkgs.toPythonModule (radicale3.override { python3 = python; })) + (python.pkgs.toPythonModule (radicale.override { python3 = python; })) requests types-setuptools ] ++ requests.optional-dependencies.socks; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6cdf9663d6f8..93a0e4224d10 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1078,6 +1078,7 @@ mapAliases { rabbitvcs = throw "rabbitvcs has been removed from nixpkgs, because it was broken"; # Added 2024-07-15 radare2-cutter = throw "'radare2-cutter' has been renamed to/replaced by 'cutter'"; # Converted to throw 2024-10-17 radicale2 = throw "'radicale2' was removed because it was broken. Use 'radicale' (version 3) instead"; # Added 2024-11-29 + radicale3 = radicale; # Added 2024-11-29 radicle-cli = throw "'radicle-cli' was removed in favor of 'radicle-node'"; # Added 2024-05-04 radicle-upstream = throw "'radicle-upstream' was sunset, see "; # Added 2024-05-04 railway-travel = diebahn; # Added 2024-04-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 023bde4c0ada..4532a81787ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12139,8 +12139,6 @@ with pkgs; erlang = erlang_26; }; - radicale3 = radicale; - qcal = callPackage ../tools/networking/qcal/default.nix { }; rake = callPackage ../development/tools/build-managers/rake { }; From ad356675a803934c0bd3d0bf749b43bde061ac17 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Sat, 30 Nov 2024 12:13:03 +0900 Subject: [PATCH 44/91] nixos-rebuild-ng: don't repeat the keep_going argument It is already provided by common_args, and repeating it leads to a runtime error. --- .../by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 2aead64c5465..25519dac6240 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -238,7 +238,6 @@ def execute(argv: list[str]) -> None: path_to_config = nix.nixos_build_flake( "toplevel", flake, - keep_going=True, dry_run=dry_run, **flake_build_flags, ) @@ -247,7 +246,6 @@ def execute(argv: list[str]) -> None: "system", args.attr, args.file, - keep_going=True, dry_run=dry_run, **build_flags, ) @@ -266,7 +264,6 @@ def execute(argv: list[str]) -> None: path_to_config = nix.nixos_build_flake( attr, flake, - keep_going=True, **flake_build_flags, ) else: @@ -274,7 +271,6 @@ def execute(argv: list[str]) -> None: attr, args.attr, args.file, - keep_going=True, **build_flags, ) vm_path = next(path_to_config.glob("bin/run-*-vm"), "./result/bin/run-*-vm") From fe1d869538a57c0336fa1052119ae7656d6438d4 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sat, 30 Nov 2024 12:10:28 +0800 Subject: [PATCH 45/91] microsoft-identity-broker: format --- .../mi/microsoft-identity-broker/package.nix | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/mi/microsoft-identity-broker/package.nix b/pkgs/by-name/mi/microsoft-identity-broker/package.nix index 3d467d2155da..b87900180bb3 100644 --- a/pkgs/by-name/mi/microsoft-identity-broker/package.nix +++ b/pkgs/by-name/mi/microsoft-identity-broker/package.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchurl -, dpkg -, openjdk11 -, jnr-posix -, makeWrapper -, openjfx17 -, zip -, nixosTests -, bash +{ + stdenv, + lib, + fetchurl, + dpkg, + openjdk11, + jnr-posix, + makeWrapper, + openjfx17, + zip, + nixosTests, + bash, }: stdenv.mkDerivation rec { pname = "microsoft-identity-broker"; @@ -19,7 +20,12 @@ stdenv.mkDerivation rec { hash = "sha256-I4Q6ucT6ps8/QGiQTNbMXcKxq6UMcuwJ0Prcqvov56M="; }; - nativeBuildInputs = [ dpkg makeWrapper openjdk11 zip ]; + nativeBuildInputs = [ + dpkg + makeWrapper + openjdk11 + zip + ]; buildPhase = '' runHook preBuild @@ -93,11 +99,11 @@ stdenv.mkDerivation rec { tests = { inherit (nixosTests) intune; }; }; - meta = with lib; { + meta = { description = "Microsoft Authentication Broker for Linux"; homepage = "https://www.microsoft.com/"; - license = licenses.unfree; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ rhysmdnz ]; }; From 9ae3dd306933d94af8494cc8dae5414bb4a4d928 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sat, 30 Nov 2024 12:10:55 +0800 Subject: [PATCH 46/91] microsoft-identity-broker: fix hash mismatch --- pkgs/by-name/mi/microsoft-identity-broker/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/microsoft-identity-broker/package.nix b/pkgs/by-name/mi/microsoft-identity-broker/package.nix index b87900180bb3..8957184c928d 100644 --- a/pkgs/by-name/mi/microsoft-identity-broker/package.nix +++ b/pkgs/by-name/mi/microsoft-identity-broker/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/microsoft-identity-broker/microsoft-identity-broker_${version}_amd64.deb"; - hash = "sha256-I4Q6ucT6ps8/QGiQTNbMXcKxq6UMcuwJ0Prcqvov56M="; + hash = "sha256-v/FxtdvRaUHYqvFSkJIZyicIdcyxQ8lPpY5rb9smnqA="; }; nativeBuildInputs = [ From 8f9968055f5731a8cc4440bb5d7a29f9ad65cc58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 04:29:24 +0000 Subject: [PATCH 47/91] nufmt: 0-unstable-2024-10-20 -> 0-unstable-2024-11-21 --- pkgs/by-name/nu/nufmt/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix index f91ce84fc683..d13f2834c674 100644 --- a/pkgs/by-name/nu/nufmt/package.nix +++ b/pkgs/by-name/nu/nufmt/package.nix @@ -10,13 +10,13 @@ }: rustPlatform.buildRustPackage { pname = "nufmt"; - version = "0-unstable-2024-10-20"; + version = "0-unstable-2024-11-21"; src = fetchFromGitHub { owner = "nushell"; repo = "nufmt"; - rev = "decc88ef8e11a14081c2dd86c6ea0c94d6d2861d"; - hash = "sha256-AurQGIZDYOkMMyAEXP01QziISQcSME3GFtvqjCDoeiw="; + rev = "628a3b73ea637c96f2c191ae066cf1cecadeafa3"; + hash = "sha256-ideILLOawU6BNawmr4lqt2LGkf29wvlwQe9gqgdYRiI="; }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage { env.LIBCLANG_PATH = lib.optionalString stdenv.cc.isClang "${lib.getLib llvmPackages.libclang}/lib"; - cargoHash = "sha256-5DS6pTYGOQ4qay6+YiUstInRX17n3RViNxKXtFZ6J3k="; + cargoHash = "sha256-MHZlXmHAYIiaB6Isutqjrh45jppRzTZRSE3VqzpFBBA="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; From 5a32f1dbafd45086445bc540df14128c78a87009 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 04:46:30 +0000 Subject: [PATCH 48/91] mxt-app: 1.40 -> 1.41 --- pkgs/by-name/mx/mxt-app/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mx/mxt-app/package.nix b/pkgs/by-name/mx/mxt-app/package.nix index 6ddf91523cd3..02bd829c9431 100644 --- a/pkgs/by-name/mx/mxt-app/package.nix +++ b/pkgs/by-name/mx/mxt-app/package.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libtool }: stdenv.mkDerivation rec { - version="1.40"; + version="1.41"; pname = "mxt-app"; src = fetchFromGitHub { owner = "atmel-maxtouch"; repo = "mxt-app"; rev = "v${version}"; - sha256 = "sha256-ZquD1aZu/TJQdr7QwKHTbCwSCFxt4drVBm4D1FLlzF0="; + sha256 = "sha256-Sn83k04ctwyVH90wnPIFuH91epPgLt1mWY+07r5eKpk="; }; nativeBuildInputs = [ autoreconfHook ]; From 8819a28de8d446ed7e05b4c0fd8a1ac267c3b42a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 06:00:57 +0000 Subject: [PATCH 49/91] python312Packages.opensearch-py: 2.7.1 -> 2.8.0 --- pkgs/development/python-modules/opensearch-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opensearch-py/default.nix b/pkgs/development/python-modules/opensearch-py/default.nix index 5557ea3e21b1..4034286edacc 100644 --- a/pkgs/development/python-modules/opensearch-py/default.nix +++ b/pkgs/development/python-modules/opensearch-py/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "opensearch-py"; - version = "2.7.1"; + version = "2.8.0"; pyproject = true; src = fetchFromGitHub { owner = "opensearch-project"; repo = "opensearch-py"; rev = "refs/tags/v${version}"; - hash = "sha256-GC0waXxHRiXVXjhTGbet3HvDKmUBKzoufu/J4fmrM+k="; + hash = "sha256-rPHpGKEIINAEUu2UkJwAM60i0hTzXd1ec6WD50RrgL8="; }; nativeBuildInputs = [ setuptools ]; From 866939c5b21cd78d400a19a63e43c8aa2f4198e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 07:24:10 +0000 Subject: [PATCH 50/91] python312Packages.pyoverkiz: 1.15.0 -> 1.15.1 --- pkgs/development/python-modules/pyoverkiz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 3e584668eab8..9d37ca61d2dc 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.15.0"; + version = "1.15.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-nwRPIudrxsbK6UYLaGjQJBkGMI5cKEE7m8M0h3k6434="; + hash = "sha256-3j72zLBMm6tuQDWqNrkVEFvDAc45xyLnG19lEsJV1Mg="; }; build-system = [ poetry-core ]; From b0822b5dcb21443b04cfecca9a6e8592a8894433 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 08:15:30 +0000 Subject: [PATCH 51/91] tbls: 1.78.0 -> 1.79.4 --- pkgs/by-name/tb/tbls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix index 1a33f5433511..84f4d8ca34b5 100644 --- a/pkgs/by-name/tb/tbls/package.nix +++ b/pkgs/by-name/tb/tbls/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.78.0"; + version = "1.79.4"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-vqt4IlVvqlUjDqvcdiRctt/VuEkZ5YzCXYHvHfc87Ew="; + hash = "sha256-o/ZhXoenK3xlflRMXS9NtnW23VBiDmDPSGlHtE3cNiM="; }; - vendorHash = "sha256-cnACY+NIjsVe6BU7AjTO+yLDn0f1HO1gHnw5SgqKuy4="; + vendorHash = "sha256-SkddF8ZxvGRQ+/tWnmlcoaTs3MRfVgQWX4MZ05nZ9XA="; nativeBuildInputs = [ installShellFiles ]; From be214b4f0ef99927fc2b7fdb73ac5e3aed22f1bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 08:17:49 +0000 Subject: [PATCH 52/91] mlx42: 2.4.0 -> 2.4.1 --- pkgs/by-name/ml/mlx42/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ml/mlx42/package.nix b/pkgs/by-name/ml/mlx42/package.nix index 16634879e2f3..5bedd585948f 100644 --- a/pkgs/by-name/ml/mlx42/package.nix +++ b/pkgs/by-name/ml/mlx42/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mlx42"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "codam-coding-college"; repo = "MLX42"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-jYcBvvx0Xfc/wDWSUROfQeRvn+tWvSS0ymKO1iuzg8w="; + hash = "sha256-/HCP6F7N+J97n4orlLxg/4agEoq4+rJdpeW/3q+DI1I="; }; postPatch = From 64d83722982f7726413be91706bb58bfd46ece2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 09:10:44 +0000 Subject: [PATCH 53/91] python312Packages.latexrestricted: 0.6.0 -> 0.6.2 --- pkgs/development/python-modules/latexrestricted/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/latexrestricted/default.nix b/pkgs/development/python-modules/latexrestricted/default.nix index dfccf69e0563..6c567519fff9 100644 --- a/pkgs/development/python-modules/latexrestricted/default.nix +++ b/pkgs/development/python-modules/latexrestricted/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "latexrestricted"; - version = "0.6.0"; + version = "0.6.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-/N5eC32OVN6qxWZAwAUlCIrMV2ARitiX3gaCPiSCRHs="; + hash = "sha256-1R0hpBGXpYH/KcD4GFUfFvoOaJDe+Sl5msC952KnqmA="; }; build-system = [ setuptools ]; From fb35df9f914adc2f86c4d109f5a10e82118c6a1f Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Fri, 29 Nov 2024 04:58:46 -0700 Subject: [PATCH 54/91] julia.withPackages: expose pname/version and move things to passthru --- pkgs/development/julia-modules/default.nix | 30 ++++++++++++---------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/development/julia-modules/default.nix b/pkgs/development/julia-modules/default.nix index 737cb9345a4b..b1761e19240a 100644 --- a/pkgs/development/julia-modules/default.nix +++ b/pkgs/development/julia-modules/default.nix @@ -165,21 +165,23 @@ in runCommand "julia-${julia.version}-env" { nativeBuildInputs = [makeWrapper]; - inherit julia; - inherit juliaWrapped; - meta = julia.meta; + passthru = { + inherit julia; + inherit juliaWrapped; + inherit (julia) pname version meta; - # Expose the steps we used along the way in case the user wants to use them, for example to build - # expressions and build them separately to avoid IFD. - inherit dependencies; - inherit closureYaml; - inherit dependencyUuidToInfoYaml; - inherit dependencyUuidToRepoYaml; - inherit minimalRegistry; - inherit artifactsNix; - inherit overridesJson; - inherit overridesToml; - inherit projectAndDepot; + # Expose the steps we used along the way in case the user wants to use them, for example to build + # expressions and build them separately to avoid IFD. + inherit dependencies; + inherit closureYaml; + inherit dependencyUuidToInfoYaml; + inherit dependencyUuidToRepoYaml; + inherit minimalRegistry; + inherit artifactsNix; + inherit overridesJson; + inherit overridesToml; + inherit projectAndDepot; + }; } ('' mkdir -p $out/bin makeWrapper ${juliaWrapped}/bin/julia $out/bin/julia \ From 425683af2dc279e3eac57a0c1b6abfc77e1ab10a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 09:56:50 +0000 Subject: [PATCH 55/91] kubecfg: 0.35.0 -> 0.35.1 --- pkgs/by-name/ku/kubecfg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kubecfg/package.nix b/pkgs/by-name/ku/kubecfg/package.nix index 41971cb79334..e2282ac4144a 100644 --- a/pkgs/by-name/ku/kubecfg/package.nix +++ b/pkgs/by-name/ku/kubecfg/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubecfg"; - version = "0.35.0"; + version = "0.35.1"; src = fetchFromGitHub { owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - hash = "sha256-/xfZcykOGYOnCkKQDUJ9k4xh+bwrDmy2iSNFPVLkjew="; + hash = "sha256-5xs9iE6sfFzoTq24DTNKOj4D+A5ezBKN1lfIdJCt+pk="; }; vendorHash = "sha256-K2IyljE5QS/SZ6EXV42q/a5ru+0UXZ69oLNi94XKxw4="; From 8a667a5213f1214b5433cc2c97b5f7fd0f871198 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 30 Nov 2024 10:58:50 +0100 Subject: [PATCH 56/91] buildFHSEnv: fix cross compilation rootfs-builder is executed at build time and thus needs to be built for the build machine architecture. --- pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index dc8ee68e8783..2c2888e5a0da 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -174,7 +174,7 @@ let allPaths = paths ++ paths32; - rootfs-builder = pkgs.rustPlatform.buildRustPackage { + rootfs-builder = pkgs.buildPackages.rustPlatform.buildRustPackage { name = "fhs-rootfs-bulder"; src = ./rootfs-builder; cargoLock.lockFile = ./rootfs-builder/Cargo.lock; From 617a7655c23cd92e26be7a0d73052059234951e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 10:03:04 +0000 Subject: [PATCH 57/91] python312Packages.pystac-client: 0.8.4 -> 0.8.5 --- pkgs/development/python-modules/pystac-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pystac-client/default.nix b/pkgs/development/python-modules/pystac-client/default.nix index e554cf140167..19633be8e032 100644 --- a/pkgs/development/python-modules/pystac-client/default.nix +++ b/pkgs/development/python-modules/pystac-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pystac-client"; - version = "0.8.4"; + version = "0.8.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "stac-utils"; repo = "pystac-client"; rev = "refs/tags/v${version}"; - hash = "sha256-EetS0MD5DLBR+ht9YfD+oRdfHbVONuVHdSZj3FQ5Sm8="; + hash = "sha256-bryJCg0JqjxQi5tAvd5Y2f/hXmHoIGEFiHuSPCjqfYk="; }; build-system = [ setuptools ]; From 1f506d83a5634f205cb7610e523d852a7914271a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 30 Nov 2024 10:26:44 +0100 Subject: [PATCH 58/91] python312Packages.moderngl-window: 2.4.6 -> 3.0.0 Diff: https://github.com/moderngl/moderngl_window/compare/refs/tags/2.4.6...3.0.0 Changelog: https://github.com/moderngl/moderngl-window/blob/3.0.0/CHANGELOG.md --- .../moderngl-window/default.nix | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/moderngl-window/default.nix b/pkgs/development/python-modules/moderngl-window/default.nix index 073c99026b9a..98f091927bdb 100644 --- a/pkgs/development/python-modules/moderngl-window/default.nix +++ b/pkgs/development/python-modules/moderngl-window/default.nix @@ -3,49 +3,53 @@ stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, - glfw, - mesa, + + # dependencies moderngl, numpy, pillow, - pygame, pyglet, - pyqt5, - pyrr, + pyglm, + + # optional-dependencies + trimesh, + scipy, + glfw, + pygame, pysdl2, pyside2, - pythonOlder, - scipy, - trimesh, + pyqt5, + + mesa, }: buildPythonPackage rec { pname = "moderngl-window"; - version = "2.4.6"; + version = "3.0.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "moderngl"; repo = "moderngl_window"; rev = "refs/tags/${version}"; - hash = "sha256-zTygSXU/vQZaFCuHbRBpO9/BYYA2UOid+wvhyc2bWMI="; + hash = "sha256-V6QQCQcSSEt11+Xv6HtWZSH+/nPFRZZK1ThQJipIT0M="; }; pythonRelaxDeps = [ "pillow" ]; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ - numpy + dependencies = [ moderngl - pyglet + numpy pillow - pyrr + pyglet + pyglm ]; optional-dependencies = { @@ -65,12 +69,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "moderngl_window" ]; - meta = with lib; { + meta = { description = "Cross platform helper library for ModernGL making window creation and resource loading simple"; homepage = "https://github.com/moderngl/moderngl-window"; changelog = "https://github.com/moderngl/moderngl-window/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ c0deaddict ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ c0deaddict ]; inherit (mesa.meta) platforms; broken = stdenv.hostPlatform.isDarwin; }; From e307953903351b05fe2d09cf2df89c7ee973c763 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 10:25:00 +0000 Subject: [PATCH 59/91] rfc: 1.0.0 -> 1.0.1 --- pkgs/by-name/rf/rfc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rf/rfc/package.nix b/pkgs/by-name/rf/rfc/package.nix index b172122d828f..136e4567c18d 100644 --- a/pkgs/by-name/rf/rfc/package.nix +++ b/pkgs/by-name/rf/rfc/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "rfc"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "bfontaine"; repo = "rfc"; rev = "v${version}"; - hash = "sha256-zN+MQtHh69PkzbrfceHFpBYCPmTg9qrOf/ML2efq6Xk="; + hash = "sha256-bCqgLkbZGQFcxhLwekVw+rUGinXTc7QJHlVRGtNf6Jc="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From f3bb835a462a04cc9a0e90bbe2820c5797f2338f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 10:31:40 +0000 Subject: [PATCH 60/91] gapless: 4.0 -> 4.2 --- pkgs/by-name/ga/gapless/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gapless/package.nix b/pkgs/by-name/ga/gapless/package.nix index 1f42ef3e8916..c9b0c0e58738 100644 --- a/pkgs/by-name/ga/gapless/package.nix +++ b/pkgs/by-name/ga/gapless/package.nix @@ -15,14 +15,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gapless"; - version = "4.0"; + version = "4.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "neithern"; repo = "g4music"; rev = "v${finalAttrs.version}"; - hash = "sha256-t9YthW8HZz2kXYPvidVRy7GVB2cRGEOCrXZtIpW65MA="; + hash = "sha256-lH3bogDbUjfNC6rC1UG2MiLRmc8YDaP0+STNKzg54dQ="; }; nativeBuildInputs = [ From c18529fe1658a9891e38b0e248fa6c91d39dc25a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 10:51:47 +0000 Subject: [PATCH 61/91] python312Packages.kbcstorage: 0.9.1 -> 0.9.2 --- pkgs/development/python-modules/kbcstorage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix index c7adc7438123..90daccfbffae 100644 --- a/pkgs/development/python-modules/kbcstorage/default.nix +++ b/pkgs/development/python-modules/kbcstorage/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "sapi-python-client"; - version = "0.9.1"; + version = "0.9.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "keboola"; repo = "sapi-python-client"; rev = "refs/tags/${version}"; - hash = "sha256-4ykOwSQ1tM0ZviETkjU0ydg7FWjkGNysHQe+f9MS0MM="; + hash = "sha256-30bAw5pYEUj0jeZWiJxzZ7lDs/+63tlcoLaHrUmYCs8="; }; postPatch = '' From a68512db54c292664bbc4a874add68002934e94c Mon Sep 17 00:00:00 2001 From: Patrizio Bekerle Date: Sat, 30 Nov 2024 13:18:08 +0100 Subject: [PATCH 62/91] lact: mention NVIDIA --- pkgs/by-name/la/lact/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/la/lact/package.nix b/pkgs/by-name/la/lact/package.nix index 9181dec17b73..cd02227b837c 100644 --- a/pkgs/by-name/la/lact/package.nix +++ b/pkgs/by-name/la/lact/package.nix @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec { ''; meta = { - description = "Linux AMDGPU Controller"; + description = "Linux GPU Configuration Tool for AMD and NVIDIA"; homepage = "https://github.com/ilya-zlobintsev/LACT"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ figsoda atemu ]; From 56597456e194fde80d8100a5b2af5504d79fa4b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 12:24:16 +0000 Subject: [PATCH 63/91] python312Packages.herepy: 3.6.4 -> 3.6.5 --- pkgs/development/python-modules/herepy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/herepy/default.nix b/pkgs/development/python-modules/herepy/default.nix index 617a2be4493d..f934de881cbe 100644 --- a/pkgs/development/python-modules/herepy/default.nix +++ b/pkgs/development/python-modules/herepy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "herepy"; - version = "3.6.4"; + version = "3.6.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "abdullahselek"; repo = "HerePy"; rev = "refs/tags/${version}"; - hash = "sha256-XefoRAaWq5sPQsrqek6kibRjKU+ZImQmt32jutfptNw="; + hash = "sha256-8DwzzC0sTrGnMpuADc55HCIeH/KyWacv8X+Ubh+n7ZM="; }; build-system = [ setuptools ]; From 0633f26e7b10c33a23e877be090375f409fd7eb0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Nov 2024 13:32:51 +0100 Subject: [PATCH 64/91] python312Packages.fastcore: 1.7.20 -> 1.7.22 Diff: https://github.com/fastai/fastcore/compare/refs/tags/1.7.20...1.7.22 Changelog: https://github.com/fastai/fastcore/blob/1.7.22/CHANGELOG.md --- pkgs/development/python-modules/fastcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 0e015800c910..3adf0ad601ae 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.7.20"; + version = "1.7.22"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-UGY6iSRF8pY5frZqarxpiNkGEQtgNdXY5mMQzbzMjhA="; + hash = "sha256-llD7hDZStgCUfp06byGLtLPgDqiK7BAMw9kLNzOGUec="; }; build-system = [ setuptools ]; From cd45cfe9c49e3ce260547b7e15c4afe44ef3226a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 30 Nov 2024 20:38:25 +0800 Subject: [PATCH 65/91] nixosTests.vscodium: Workaround OCR tests An attempt to help https://hydra.nixos.org/build/279535629/nixlog/1. The "Get Started with" text is much easier to find. Also scale vscodium to help OCR find the "Untitled" text. --- nixos/tests/vscodium.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/tests/vscodium.nix b/nixos/tests/vscodium.nix index 76d5244b3ee3..b3512ec66107 100644 --- a/nixos/tests/vscodium.nix +++ b/nixos/tests/vscodium.nix @@ -3,7 +3,8 @@ let wayland = { pkgs, ... }: { imports = [ ./common/wayland-cage.nix ]; - services.cage.program = "${pkgs.vscodium}/bin/codium"; + # We scale vscodium to help OCR find the small "Untitled" text. + services.cage.program = "${pkgs.vscodium}/bin/codium --force-device-scale-factor=2"; environment.variables.NIXOS_OZONE_WL = "1"; environment.variables.DISPLAY = "do not use"; @@ -16,7 +17,7 @@ let virtualisation.memorySize = 2047; services.xserver.enable = true; services.xserver.displayManager.sessionCommands = '' - ${pkgs.vscodium}/bin/codium + ${pkgs.vscodium}/bin/codium --force-device-scale-factor=2 ''; test-support.displayManager.auto.user = "alice"; }; @@ -46,7 +47,7 @@ let codium_running.wait() # type: ignore[union-attr] with codium_running: # type: ignore[union-attr] # Wait until vscodium is visible. "File" is in the menu bar. - machine.wait_for_text('Welcome') + machine.wait_for_text('Get Started with') machine.screenshot('start_screen') test_string = 'testfile' From 99c3d04cf22966b42f90a9ae8c677988c6392723 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Nov 2024 13:45:59 +0100 Subject: [PATCH 66/91] python312Packages.aiovlc: 0.6.2 -> 0.6.3 Diff: https://github.com/MartinHjelmare/aiovlc/compare/refs/tags/v0.6.2...v0.6.3 Changelog: https://github.com/MartinHjelmare/aiovlc/blob/v0.6.3/CHANGELOG.md --- pkgs/development/python-modules/aiovlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiovlc/default.nix b/pkgs/development/python-modules/aiovlc/default.nix index eae29bbcf565..e577b6d2a7a2 100644 --- a/pkgs/development/python-modules/aiovlc/default.nix +++ b/pkgs/development/python-modules/aiovlc/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiovlc"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiovlc"; rev = "refs/tags/v${version}"; - hash = "sha256-tvMd7kydL4fx9JLTFQgCskBQCV0Zs/swDpPBxtSEvyM="; + hash = "sha256-b4QtTR/p2wmVk4LZdkWwzM1odx1cxjUF08pV/zunTx4="; }; build-system = [ poetry-core ]; From 511b0843c746d6aea287e16d6e2c6bd35e592998 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 26 Nov 2024 22:15:03 +0100 Subject: [PATCH 67/91] postgresqlPackages.pg-gvm: move from top-level package This is a PostgreSQL extension, which only works properly when made available in the postgresql.pkgs package set. --- pkgs/servers/sql/postgresql/ext/default.nix | 2 ++ .../sql/postgresql/ext/pg-gvm.nix} | 22 +++++-------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 9 insertions(+), 16 deletions(-) rename pkgs/{by-name/pg/pg-gvm/package.nix => servers/sql/postgresql/ext/pg-gvm.nix} (74%) diff --git a/pkgs/servers/sql/postgresql/ext/default.nix b/pkgs/servers/sql/postgresql/ext/default.nix index 30cd54914119..4df9052ebb9a 100644 --- a/pkgs/servers/sql/postgresql/ext/default.nix +++ b/pkgs/servers/sql/postgresql/ext/default.nix @@ -72,6 +72,8 @@ in { pg_net = super.callPackage ./pg_net.nix { }; + pg-gvm = super.callPackage ./pg-gvm.nix { }; + pg-semver = super.callPackage ./pg-semver.nix { }; pgtap = super.callPackage ./pgtap.nix { }; diff --git a/pkgs/by-name/pg/pg-gvm/package.nix b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix similarity index 74% rename from pkgs/by-name/pg/pg-gvm/package.nix rename to pkgs/servers/sql/postgresql/ext/pg-gvm.nix index dca83ea0bdd6..249300584112 100644 --- a/pkgs/by-name/pg/pg-gvm/package.nix +++ b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix @@ -1,4 +1,5 @@ { + buildPostgresqlExtension, cmake, fetchFromGitHub, glib, @@ -9,31 +10,21 @@ pcre2, pkg-config, postgresql, - stdenv, }: -stdenv.mkDerivation rec { +buildPostgresqlExtension (finalAttrs: { pname = "pg-gvm"; version = "22.6.5"; src = fetchFromGitHub { owner = "greenbone"; repo = "pg-gvm"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-19ZmQdLjfwJwOMoO16rKJYKOnRyt7SQOdkYTxt8WQ2A="; }; strictDeps = true; - configurePhase = '' - runHook preConfigure - - cmake \ - -DCMAKE_INSTALL_DEV_PREFIX=$out . - - runHook postConfigure - ''; - nativeBuildInputs = [ cmake pkg-config @@ -46,16 +37,15 @@ stdenv.mkDerivation rec { icu libical pcre2 - postgresql ]; meta = { description = "Greenbone Library for helper functions in PostgreSQL"; homepage = "https://github.com/greenbone/pg-gvm"; - changelog = "https://github.com/greenbone/pg-gvm/releases/tag/v${version}"; + changelog = "https://github.com/greenbone/pg-gvm/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ tochiaha ]; mainProgram = "pg-gvm"; - platforms = lib.platforms.all; + platforms = postgresql.meta.platforms; }; -} +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 56a4fcbcd822..650056e66615 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -972,6 +972,7 @@ mapAliases { perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead"; perldevelPackages = perldevel; petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09 + pg-gvm = throw "pg-gvm has been moved to postgresql.pkgs.pg-gvm to make it work with all versions of PostgreSQL"; # added 2024-11-30 pgadmin = pgadmin4; pharo-spur64 = pharo; # Added 2022-08-03 picom-next = picom; # Added 2024-02-13 From 7064bc9d991468a04935dc153fd2b3b613f1fd4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 13:48:57 +0000 Subject: [PATCH 68/91] python312Packages.dbt-snowflake: 1.8.3 -> 1.8.4 --- pkgs/development/python-modules/dbt-snowflake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbt-snowflake/default.nix b/pkgs/development/python-modules/dbt-snowflake/default.nix index 17e9cd092709..7924c1c4ec87 100644 --- a/pkgs/development/python-modules/dbt-snowflake/default.nix +++ b/pkgs/development/python-modules/dbt-snowflake/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbt-snowflake"; - version = "1.8.3"; + version = "1.8.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-snowflake"; rev = "refs/tags/v${version}"; - hash = "sha256-jvhjf+Ce/oyHXFxMryz5Uy6Hq5Sx6vKgaGEJVAzqSdA="; + hash = "sha256-XUHXyxAoIBHXmH2xXOGrCO2+WMwwJ7oVYt4+m/fT/Ko="; }; build-system = [ setuptools ]; From 01ccbb3e07356ce324ada4a6af479ad96fa19e88 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 31 Oct 2024 12:39:34 +0100 Subject: [PATCH 69/91] rustls-ffi: 0.13.0 -> 0.14.1 Changes: https://github.com/rustls/rustls-ffi/releases/tag/v0.14.0 https://github.com/rustls/rustls-ffi/releases/tag/v0.14.1 --- pkgs/by-name/ru/rustls-ffi/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ru/rustls-ffi/package.nix b/pkgs/by-name/ru/rustls-ffi/package.nix index e5317b40b78c..7dd4fe038f0e 100644 --- a/pkgs/by-name/ru/rustls-ffi/package.nix +++ b/pkgs/by-name/ru/rustls-ffi/package.nix @@ -15,19 +15,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "rustls-ffi"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "rustls"; repo = "rustls-ffi"; rev = "v${finalAttrs.version}"; - hash = "sha256-Bc9bVZ2pDsG118l/SlElZpgh9F1JEgPF8LzBX7d4mhE="; + hash = "sha256-ZKAyKcKwhnPE6PrfBFjLJKkTlGbdLcmW1EP/xSv2cpM="; }; cargoDeps = rustPlatform.fetchCargoTarball { src = finalAttrs.src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-gDQ9AFrJuV7SrzKCAHQBkKj6clXuPLO0DHhnvcBqRLs="; + hash = "sha256-IaOhQfDEgLhGmes0xzhLVym29aP691TY0EXdOIgXEMA="; }; propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; @@ -54,7 +54,6 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { curl = curl.override { opensslSupport = false; rustlsSupport = true; rustls-ffi = finalAttrs.finalPackage; }; - apacheHttpd = apacheHttpd.override { modTlsSupport = true; rustls-ffi = finalAttrs.finalPackage; }; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; From b5dea63a56c863803e63fe6d10f33b170d368cd2 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 31 Oct 2024 12:41:44 +0100 Subject: [PATCH 70/91] apacheHttpd: remove support for mod_tls It has been removed upstream and is now managed independently. https://github.com/apache/httpd/commit/988f4496320604225900061e696c7201db8e9d03 --- pkgs/servers/http/apache-httpd/2.4.nix | 4 ---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 2d9ac45b8e82..304ff008348b 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -2,7 +2,6 @@ , nixosTests , proxySupport ? true , sslSupport ? true, openssl -, modTlsSupport ? false, rustls-ffi, Foundation , http2Support ? true, nghttp2 , ldapSupport ? true, openldap , libxml2Support ? true, libxml2 @@ -40,8 +39,6 @@ stdenv.mkDerivation rec { buildInputs = [ perl libxcrypt zlib ] ++ lib.optional brotliSupport brotli ++ lib.optional sslSupport openssl ++ - lib.optional modTlsSupport rustls-ffi ++ - lib.optional (modTlsSupport && stdenv.hostPlatform.isDarwin) Foundation ++ lib.optional ldapSupport openldap ++ # there is no --with-ldap flag lib.optional libxml2Support libxml2 ++ lib.optional http2Support nghttp2 ++ @@ -70,7 +67,6 @@ stdenv.mkDerivation rec { "--includedir=${placeholder "dev"}/include" (lib.enableFeature proxySupport "proxy") (lib.enableFeature sslSupport "ssl") - (lib.enableFeature modTlsSupport "tls") (lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2") "--docdir=$(doc)/share/doc" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6d18c1a3849..f4a844762ba5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11518,9 +11518,7 @@ with pkgs; alerta-server = callPackage ../servers/monitoring/alerta { }; - apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = apacheHttpd_2_4; apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { From 0ff027e0aebfc60db4a984dc7f2d2e760906d74d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 30 Nov 2024 08:39:09 -0500 Subject: [PATCH 71/91] nufmt: use rustPlatform.bindgenHook --- pkgs/by-name/nu/nufmt/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix index d13f2834c674..8c956cb82080 100644 --- a/pkgs/by-name/nu/nufmt/package.nix +++ b/pkgs/by-name/nu/nufmt/package.nix @@ -4,10 +4,9 @@ fetchFromGitHub, rustPlatform, apple-sdk_11, - llvmPackages, nix-update-script, - ... }: + rustPlatform.buildRustPackage { pname = "nufmt"; version = "0-unstable-2024-11-21"; @@ -19,12 +18,14 @@ rustPlatform.buildRustPackage { hash = "sha256-ideILLOawU6BNawmr4lqt2LGkf29wvlwQe9gqgdYRiI="; }; + nativeBuildInputs = [ + rustPlatform.bindgenHook + ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; - env.LIBCLANG_PATH = lib.optionalString stdenv.cc.isClang "${lib.getLib llvmPackages.libclang}/lib"; - cargoHash = "sha256-MHZlXmHAYIiaB6Isutqjrh45jppRzTZRSE3VqzpFBBA="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; From b20782310e89b55f4b11e2471b261fe7df64fdc0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 30 Nov 2024 08:39:49 -0500 Subject: [PATCH 72/91] neothesia: use rustPlatform.bindgenHook --- pkgs/by-name/ne/neothesia/package.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/by-name/ne/neothesia/package.nix b/pkgs/by-name/ne/neothesia/package.nix index f474a82d2bf1..26f09906f40d 100644 --- a/pkgs/by-name/ne/neothesia/package.nix +++ b/pkgs/by-name/ne/neothesia/package.nix @@ -35,6 +35,7 @@ rustPlatform.buildRustPackage { pkg-config llvmPackages.clang makeWrapper + rustPlatform.bindgenHook ]; cargoLock = { @@ -54,10 +55,6 @@ rustPlatform.buildRustPackage { install -Dm 644 flatpak/com.github.polymeilex.neothesia.png $out/share/icons/hicolor/256x256/apps/com.github.polymeilex.neothesia.png ''; - env = { - LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; - }; - meta = { description = "Flashy Synthesia Like Software For Linux, Windows and macOS"; homepage = "https://github.com/PolyMeilex/Neothesia"; From c56b3749469d9e3de67307ab048c358b2de99d59 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 30 Nov 2024 08:40:30 -0500 Subject: [PATCH 73/91] libkrun: use rustPlatform.bindgenHook --- pkgs/by-name/li/libkrun/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libkrun/package.nix b/pkgs/by-name/li/libkrun/package.nix index 61da30b13478..3b84fb6a9847 100644 --- a/pkgs/by-name/li/libkrun/package.nix +++ b/pkgs/by-name/li/libkrun/package.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ llvmPackages.clang rustPlatform.cargoSetupHook + rustPlatform.bindgenHook cargo rustc ] ++ lib.optional (sevVariant || withGpu) pkg-config; @@ -52,8 +53,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withSound pipewire ++ lib.optional sevVariant openssl; - env.LIBCLANG_PATH = "${lib.getLib llvmPackages.clang-unwrapped}/lib/libclang.so"; - makeFlags = [ "PREFIX=${placeholder "out"}" ] ++ lib.optional withGpu "GPU=1" From b88f9fe294723f9b111c9b949d419f56a776b433 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 30 Nov 2024 08:41:11 -0500 Subject: [PATCH 74/91] caligula: use rustPlatform.bindgenHook --- pkgs/by-name/ca/caligula/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix index b423fa01beca..da88e59572f1 100644 --- a/pkgs/by-name/ca/caligula/package.nix +++ b/pkgs/by-name/ca/caligula/package.nix @@ -19,10 +19,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ma7JVbWSiKfkCXCDwA8DFm2+KPrWR+8nSdgGSqehNg8="; - env = { - LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; - }; - + nativeBuildInputs = [ + rustPlatform.bindgenHook + ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ From f9b5b1f98c36b5a44a2ac0d2bf9c4df096b3a9f4 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 30 Nov 2024 08:41:38 -0500 Subject: [PATCH 75/91] caligula: use new darwin sdk pattern --- pkgs/by-name/ca/caligula/package.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix index da88e59572f1..75cc0534138c 100644 --- a/pkgs/by-name/ca/caligula/package.nix +++ b/pkgs/by-name/ca/caligula/package.nix @@ -1,9 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, llvmPackages -, stdenv -, darwin }: rustPlatform.buildRustPackage rec { @@ -23,15 +20,6 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; [ - Cocoa - IOKit - Foundation - DiskArbitration - ] - ); - RUSTFLAGS = "--cfg tracing_unstable"; meta = with lib; { From bbd2561c7fe75915afb5791acf184cd801451f8e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 30 Nov 2024 08:42:31 -0500 Subject: [PATCH 76/91] fedimint: use rustPlatform.bindgenHook --- pkgs/by-name/fe/fedimint/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix index a3d2d5c7f97a..179227a49c12 100644 --- a/pkgs/by-name/fe/fedimint/package.nix +++ b/pkgs/by-name/fe/fedimint/package.nix @@ -40,6 +40,7 @@ buildRustPackage rec { pkg-config clang (lib.getLib libclang) + rustPlatform.bindgenHook ]; buildInputs = [ @@ -79,7 +80,6 @@ buildRustPackage rec { PROTOC = "${buildPackages.protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; OPENSSL_DIR = openssl.dev; - LIBCLANG_PATH = "${lib.getLib libclang}/lib"; FEDIMINT_BUILD_FORCE_GIT_HASH = "0000000000000000000000000000000000000000"; From 52614866fd27628245f961fedcc1e963316537da Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 30 Nov 2024 08:43:10 -0500 Subject: [PATCH 77/91] servo: use rustPlatform.bindgenHook --- pkgs/by-name/se/servo/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index af6fb95d9585..26bac5cf3487 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -110,6 +110,7 @@ rustPlatform.buildRustPackage { perl pkg-config python3 + rustPlatform.bindgenHook taplo which yasm @@ -142,8 +143,6 @@ rustPlatform.buildRustPackage { --prefix LD_LIBRARY_PATH : ${runtimePaths} ''; - LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; - meta = { description = "The embeddable, independent, memory-safe, modular, parallel web rendering engine"; homepage = "https://servo.org"; From 682cf788e1c70474ea4e15caa87951ea367fcd69 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 30 Nov 2024 08:43:54 -0500 Subject: [PATCH 78/91] scx.rustscheds: use rustPlatform.bindgenHook --- pkgs/os-specific/linux/scx/scx_rustscheds.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/scx/scx_rustscheds.nix b/pkgs/os-specific/linux/scx/scx_rustscheds.nix index a5601cd4fcc1..3600735f31d6 100644 --- a/pkgs/os-specific/linux/scx/scx_rustscheds.nix +++ b/pkgs/os-specific/linux/scx/scx_rustscheds.nix @@ -25,6 +25,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config llvmPackages.clang + rustPlatform.bindgenHook ]; buildInputs = [ elfutils @@ -33,7 +34,6 @@ rustPlatform.buildRustPackage { ]; env = { - LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; BPF_CLANG = lib.getExe llvmPackages.clang; BPF_EXTRA_CFLAGS_PRE_INCL = lib.concatStringsSep " " [ "-I${scx.cscheds.dev}/libbpf/src/usr/include" From f826c0aafaea04387c9dee913149aff5801b479b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 30 Nov 2024 08:51:52 -0500 Subject: [PATCH 79/91] fedimint: drop various darwin workarounds, use new sdk pattern --- pkgs/by-name/fe/fedimint/package.nix | 26 ++------------------------ pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix index 179227a49c12..246375fff66a 100644 --- a/pkgs/by-name/fe/fedimint/package.nix +++ b/pkgs/by-name/fe/fedimint/package.nix @@ -1,28 +1,13 @@ { lib , buildPackages -, clang , fetchFromGitHub -, libclang -, libiconv -, llvmPackages_12 , openssl , pkg-config , protobuf , rustPlatform -, stdenv -, Security -, SystemConfiguration }: -let - # Rust rocksdb bindings have C++ compilation/linking errors on Darwin when using newer clang - # Forcing it to clang 12 fixes the issue. - buildRustPackage = - if stdenv.hostPlatform.isDarwin then - rustPlatform.buildRustPackage.override { stdenv = llvmPackages_12.stdenv; } - else - rustPlatform.buildRustPackage; -in -buildRustPackage rec { + +rustPlatform.buildRustPackage rec { pname = "fedimint"; version = "0.4.4"; @@ -38,18 +23,11 @@ buildRustPackage rec { nativeBuildInputs = [ protobuf pkg-config - clang - (lib.getLib libclang) rustPlatform.bindgenHook ]; buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - libiconv - Security - SystemConfiguration ]; outputs = [ "out" "fedimintCli" "fedimint" "gateway" "gatewayCli" "devimint" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6d18c1a3849..99b261a4a55e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2345,10 +2345,6 @@ with pkgs; fdroidcl = pkgs.callPackage ../development/mobile/fdroidcl { }; - fedimint = callPackage ../by-name/fe/fedimint/package.nix { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; - flowgger = callPackage ../tools/misc/flowgger { inherit (darwin.apple_sdk.frameworks) CoreServices; }; From 1a827e70dc1bf6a86d63893e858a0c8a3e5ee657 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 30 Nov 2024 08:52:29 -0500 Subject: [PATCH 80/91] libkrun: drop clang from nativeBuildInputs --- pkgs/by-name/li/libkrun/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/li/libkrun/package.nix b/pkgs/by-name/li/libkrun/package.nix index 3b84fb6a9847..92a03018ca42 100644 --- a/pkgs/by-name/li/libkrun/package.nix +++ b/pkgs/by-name/li/libkrun/package.nix @@ -11,7 +11,6 @@ , pipewire , virglrenderer , libkrunfw -, llvmPackages , rustc , withGpu ? false , withSound ? false @@ -38,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - llvmPackages.clang rustPlatform.cargoSetupHook rustPlatform.bindgenHook cargo From 23a60b0966dddc90f5b8610efc63055360ae1a94 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 30 Nov 2024 08:52:59 -0500 Subject: [PATCH 81/91] neothesia: drop clang from nativeBuildInputs --- pkgs/by-name/ne/neothesia/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ne/neothesia/package.nix b/pkgs/by-name/ne/neothesia/package.nix index 26f09906f40d..2b918d74cac1 100644 --- a/pkgs/by-name/ne/neothesia/package.nix +++ b/pkgs/by-name/ne/neothesia/package.nix @@ -6,7 +6,6 @@ , alsa-lib , wayland , makeWrapper -, llvmPackages , libxkbcommon , vulkan-loader , xorg @@ -33,7 +32,6 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config - llvmPackages.clang makeWrapper rustPlatform.bindgenHook ]; From 3c352ba05186f705a27c641d73e7a23f4583d271 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 30 Nov 2024 08:53:40 -0500 Subject: [PATCH 82/91] scx.rustscheds: drop clang from nativeBuildInputs --- pkgs/os-specific/linux/scx/scx_rustscheds.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/scx/scx_rustscheds.nix b/pkgs/os-specific/linux/scx/scx_rustscheds.nix index 3600735f31d6..1502f6fbb352 100644 --- a/pkgs/os-specific/linux/scx/scx_rustscheds.nix +++ b/pkgs/os-specific/linux/scx/scx_rustscheds.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config - llvmPackages.clang rustPlatform.bindgenHook ]; buildInputs = [ From 4761b61b1efdedfb14d08f05952a08f9665b5fc2 Mon Sep 17 00:00:00 2001 From: 74k1 Date: Fri, 8 Nov 2024 13:28:46 +0100 Subject: [PATCH 83/91] goodvibes: 0.8.0 -> 0.8.1 Diff: https://gitlab.com/goodvibes/goodvibes/-/compare/v0.8.0...v0.8.1 --- pkgs/by-name/go/goodvibes/package.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/go/goodvibes/package.nix b/pkgs/by-name/go/goodvibes/package.nix index 165bf2b88653..005198ae57bf 100644 --- a/pkgs/by-name/go/goodvibes/package.nix +++ b/pkgs/by-name/go/goodvibes/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , meson , ninja , pkg-config @@ -18,21 +17,14 @@ stdenv.mkDerivation rec { pname = "goodvibes"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-KflLEc6BFA3pBY9HukEm5NluGi2igFNP6joOMdmZ0Ds="; + hash = "sha256-zqJbtCqdwKXy13WWoAwSRYVhAOJsHqOF0DriSDEigbI="; }; - patches = [ - # Fixes a compilation error - (fetchpatch { - url = "https://gitlab.com/goodvibes/goodvibes/-/commit/e332f831b91ee068a1a58846d7607b30ab010116.patch"; - hash = "sha256-PzbTltbD0xWJAytCGg1TAwBLrICP+9QZbCbG1QQ8Qmw="; - }) - ]; nativeBuildInputs = [ meson From b99389f02dbd5336605e6f02701bb8b66124aab5 Mon Sep 17 00:00:00 2001 From: Jan Christoph Ebersbach Date: Sat, 30 Nov 2024 16:25:53 +0100 Subject: [PATCH 84/91] xautocfg: init at 1.2 (#335733) Co-authored-by: Yohann Boniface Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> Co-authored-by: Aleksana --- pkgs/by-name/xa/xautocfg/package.nix | 38 ++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/xa/xautocfg/package.nix diff --git a/pkgs/by-name/xa/xautocfg/package.nix b/pkgs/by-name/xa/xautocfg/package.nix new file mode 100644 index 000000000000..3267374cb50b --- /dev/null +++ b/pkgs/by-name/xa/xautocfg/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libX11, + libXi, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "xautocfg"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "SFTtech"; + repo = "xautocfg"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-NxfuBknNRicmEAPBeMaNb57gpM0y0t+JmNMKpSNzlQM="; + }; + + buildInputs = [ + libX11 + libXi + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "MANPREFIX=${placeholder "out"}" + ]; + + meta = { + homepage = "https://github.com/SFTtech/xautocfg"; + description = "Automatic keyboard repeat rate configuration for new keyboards"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ jceb ]; + mainProgram = "xautocfg"; + platforms = lib.platforms.linux; + }; +}) From 0ce0839bc2f6d94109424f4c09491ceade4243d0 Mon Sep 17 00:00:00 2001 From: aktaboot Date: Sat, 30 Nov 2024 00:04:51 +0100 Subject: [PATCH 85/91] mullvad-vpn add darwin as badPlatform --- pkgs/applications/networking/mullvad-vpn/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 025fe29a45d9..0257ea973c9e 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -138,7 +138,8 @@ stdenv.mkDerivation { changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = platforms.unix ; + badPlatforms = [ lib.systems.inspect.patterns.isDarwin ]; maintainers = with maintainers; [ Br1ght0ne ymarkus ataraxiasjel ]; }; From d6ba42ff017e4fa4ea5aaa99a15083589c4b6019 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 30 Nov 2024 18:16:30 +0100 Subject: [PATCH 86/91] mullvad-vpn: format --- .../networking/mullvad-vpn/default.nix | 87 +++++++++++-------- 1 file changed, 52 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 3ad1de8041ec..cb514b375cb9 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -1,32 +1,33 @@ -{ stdenv -, lib -, fetchurl -, dpkg -, alsa-lib -, atk -, cairo -, cups -, dbus -, expat -, fontconfig -, freetype -, gdk-pixbuf -, glib -, pango -, nspr -, nss -, gtk3 -, mesa -, libGL -, wayland -, xorg -, autoPatchelfHook -, systemd -, libnotify -, libappindicator -, makeWrapper -, coreutils -, gnugrep +{ + stdenv, + lib, + fetchurl, + dpkg, + alsa-lib, + atk, + cairo, + cups, + dbus, + expat, + fontconfig, + freetype, + gdk-pixbuf, + glib, + pango, + nspr, + nss, + gtk3, + mesa, + libGL, + wayland, + xorg, + autoPatchelfHook, + systemd, + libnotify, + libappindicator, + makeWrapper, + coreutils, + gnugrep, }: let @@ -66,7 +67,9 @@ let version = "2024.7"; - selectSystem = attrs: attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + selectSystem = + attrs: + attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); platform = selectSystem { x86_64-linux = "amd64"; @@ -99,7 +102,13 @@ stdenv.mkDerivation { dontBuild = true; dontConfigure = true; - runtimeDependencies = [ (lib.getLib systemd) libGL libnotify libappindicator wayland ]; + runtimeDependencies = [ + (lib.getLib systemd) + libGL + libnotify + libappindicator + wayland + ]; installPhase = '' runHook preInstall @@ -115,7 +124,12 @@ stdenv.mkDerivation { wrapProgram $out/bin/mullvad-vpn \ --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1 \ - --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + ] + } wrapProgram $out/bin/mullvad-daemon \ --set-default MULLVAD_RESOURCE_DIR "$out/share/mullvad/resources" @@ -136,9 +150,12 @@ stdenv.mkDerivation { changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; - platforms = platforms.unix ; + platforms = platforms.unix; badPlatforms = [ lib.systems.inspect.patterns.isDarwin ]; - maintainers = with maintainers; [ Br1ght0ne ymarkus ataraxiasjel ]; + maintainers = with maintainers; [ + Br1ght0ne + ymarkus + ataraxiasjel + ]; }; - } From 5289e5424d00c966041dd4d47cce7a552da8c800 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 30 Nov 2024 18:18:26 +0100 Subject: [PATCH 87/91] mullvad-vpn: move to by-name --- .../default.nix => by-name/mu/mullvad-vpn/package.nix} | 0 .../networking => by-name/mu}/mullvad-vpn/update.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/networking/mullvad-vpn/default.nix => by-name/mu/mullvad-vpn/package.nix} (100%) rename pkgs/{applications/networking => by-name/mu}/mullvad-vpn/update.sh (100%) diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/by-name/mu/mullvad-vpn/package.nix similarity index 100% rename from pkgs/applications/networking/mullvad-vpn/default.nix rename to pkgs/by-name/mu/mullvad-vpn/package.nix diff --git a/pkgs/applications/networking/mullvad-vpn/update.sh b/pkgs/by-name/mu/mullvad-vpn/update.sh similarity index 100% rename from pkgs/applications/networking/mullvad-vpn/update.sh rename to pkgs/by-name/mu/mullvad-vpn/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9da928807c95..7fab584cbec4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11800,8 +11800,6 @@ with pkgs; inherit (callPackage ../applications/networking/mullvad { }) mullvad; - mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; - mullvad-closest = with python3Packages; toPythonApplication mullvad-closest; napalm = with python3Packages; toPythonApplication ( From b8e5253e27391f466a4cc6ed7e816a68e5863d91 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 30 Nov 2024 18:22:59 +0100 Subject: [PATCH 88/91] evcc: 0.131.6 -> 0.131.8 https://github.com/evcc-io/evcc/releases/tag/0.131.7 https://github.com/evcc-io/evcc/releases/tag/0.131.8 --- pkgs/by-name/ev/evcc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 09c71f89046c..6848e68576ba 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -16,20 +16,20 @@ buildGoModule rec { pname = "evcc"; - version = "0.131.6"; + version = "0.131.8"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-r9GaihxC9ZQtTzKqfJ3LLDMzDEXeud7vTFEMOf0whFU="; + hash = "sha256-W04iXqABwp5fDesOZf633mS6caEsGv0lHEyCzqEv1WA="; }; vendorHash = "sha256-x0EWFsR/O2Ztg39DL+yZx2ZDzJHADo2aPAeg/i+5KqM="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-4pQYv5UKoz3Gu5OS0zoYrjrFYD796MDb7ofWbTv3HlU="; + hash = "sha256-MjmqVyIj/foI6FFMydpbZA3wL09qs02eAq7Tk872JKM="; }; nativeBuildInputs = [ From 1fdd4348e4660d8d04ac16f5e53a5372c8989964 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 15 Nov 2024 15:51:19 +0100 Subject: [PATCH 89/91] openssh: add initrd-network-ssh nixos test to passthru.tests openssh updates can break the sshd in initrd, as proven by the update to 9.8p1 (ref #323796). The corresponding test is not a channel blocker, but should at least be looked at by maintainers updating openssh. --- pkgs/tools/networking/openssh/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 16e487e346a1..674fb5f8c238 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -189,6 +189,7 @@ stdenv.mkDerivation (finalAttrs: { tests = { borgbackup-integration = nixosTests.borgbackup; nixosTest = nixosTests.openssh; + initrd-network-openssh = nixosTests.initrd-network-ssh; openssh = finalAttrs.finalPackage.overrideAttrs (previousAttrs: { pname = previousAttrs.pname + "-test"; doCheck = true; From 4829779d1c6e4f8cb56e2177d4b174de21427dbc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 30 Nov 2024 18:40:02 +0100 Subject: [PATCH 90/91] mullvad-vpn: add versionCheckHook --- pkgs/by-name/mu/mullvad-vpn/package.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/mu/mullvad-vpn/package.nix b/pkgs/by-name/mu/mullvad-vpn/package.nix index cb514b375cb9..82e107c66663 100644 --- a/pkgs/by-name/mu/mullvad-vpn/package.nix +++ b/pkgs/by-name/mu/mullvad-vpn/package.nix @@ -28,6 +28,8 @@ makeWrapper, coreutils, gnugrep, + + versionCheckHook, }: let @@ -142,17 +144,23 @@ stdenv.mkDerivation { runHook postInstall ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { homepage = "https://github.com/mullvad/mullvadvpn-app"; description = "Client for Mullvad VPN"; changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.gpl3Only; - platforms = platforms.unix; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; badPlatforms = [ lib.systems.inspect.patterns.isDarwin ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ Br1ght0ne ymarkus ataraxiasjel From 9b3a550e96b95e03585b8dd15e38eb324fedbe8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 13:21:49 +0000 Subject: [PATCH 91/91] gqrx: 2.17.5 -> 2.17.6 --- pkgs/applications/radio/gqrx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 14675124b0ed..5e11d6119bea 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -27,13 +27,13 @@ assert !(pulseaudioSupport && portaudioSupport); gnuradioMinimal.pkgs.mkDerivation rec { pname = "gqrx"; - version = "2.17.5"; + version = "2.17.6"; src = fetchFromGitHub { owner = "gqrx-sdr"; repo = "gqrx"; rev = "v${version}"; - hash = "sha256-9VePsl/vaSTZ1TMyIeaGoZNrZv+O/7BxQ3ubD5S2EjY="; + hash = "sha256-/ykKcwOotu8kn+EpJI+EUeqSkHZ2IrSh+o7lBGeHrZ0="; }; nativeBuildInputs = [