From abb0c2434750b268f09c0f21076c4fa10d30b224 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Dec 2023 21:10:06 +0000 Subject: [PATCH 01/24] python310Packages.google-cloud-runtimeconfig: 0.33.3 -> 0.34.0 --- .../python-modules/google-cloud-runtimeconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 781218fa7a20..915f00961bca 100644 --- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.33.3"; + version = "0.34.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4sv5wua03gLd9YqwdD8P/VaKv4LcacB42fK5hUAt2vQ="; + hash = "sha256-hyxvTChxCGC6YjjvYGqaJDvgBbve7EjzfPELl+LB2D8="; }; propagatedBuildInputs = [ From a5077c24aa2eedd57ea2cc5d354506c519a16e09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Jan 2024 05:58:06 +0000 Subject: [PATCH 02/24] cvs-fast-export: 1.62 -> 1.63 --- .../version-management/cvs-fast-export/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index a45d76970664..a58cda543658 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "cvs-fast-export"; - version = "1.62"; + version = "1.63"; src = fetchurl { url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-${version}.tar.gz"; - sha256 = "sha256-ix0fg2wn2yStrgEhAxsSXvLu+C7sb2V5oyVCfhAe/R8="; + sha256 = "sha256-YZF2QebWbvn/N9pLpccudZsFHzocJp/3M0Gx9p7fQ5Y="; }; strictDeps = true; From e3878fa07b2e3edb6b1fe600db3b9bc3fdfc77f6 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Mon, 8 Jan 2024 14:38:13 +1300 Subject: [PATCH 03/24] ldc: 1.35.0 -> 1.36.0 --- pkgs/development/compilers/ldc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 8624e64c658b..6b0761217703 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "1.35.0"; - sha256 = "sha256-bilpk3BsdsCT5gkTmqCz+HBDVfoPN1b2dY141EIm36A="; + version = "1.36.0"; + sha256 = "sha256-oAx5BzEjqIfBf0Rsd4KklVajUSo9Natna31Trhu41u8="; } From 263a28fd7bf34b63f900d68b214dc280c0c9f179 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Mon, 8 Jan 2024 14:38:38 +1300 Subject: [PATCH 04/24] ldc: update to LLVM 17 --- pkgs/development/compilers/ldc/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix index 0d0926aab12e..16598714410f 100644 --- a/pkgs/development/compilers/ldc/generic.nix +++ b/pkgs/development/compilers/ldc/generic.nix @@ -1,5 +1,5 @@ { version, sha256 }: -{ lib, stdenv, fetchurl, cmake, ninja, llvm_16, curl, tzdata +{ lib, stdenv, fetchurl, cmake, ninja, llvm_17, curl, tzdata , libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, runCommand, targetPackages , ldcBootstrap ? callPackage ./bootstrap.nix { } @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - cmake ldcBootstrap lit lit.python llvm_16.dev makeWrapper ninja unzip + cmake ldcBootstrap lit lit.python llvm_17.dev makeWrapper ninja unzip ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation From aa1a145744d462654c7965bb36c0ccdd0f6d1294 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Jan 2024 23:53:15 +0000 Subject: [PATCH 05/24] python310Packages.google-cloud-asset: 3.22.0 -> 3.23.0 --- .../development/python-modules/google-cloud-asset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index ddc78dc7cc57..a2e1e852da70 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.22.0"; + version = "3.23.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-S+rJ80pkphkPlNFUn8e0bxpnkBILRS9Uvoa0vlfrK8M="; + hash = "sha256-ILg5PCstA6KwOsQZYkkE8xvFAbs6na24uUx8B5T7w1M="; }; nativeBuildInputs = [ From 54c0ef42528497d522da809797ea9e1a88242ffa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Jan 2024 00:26:56 +0000 Subject: [PATCH 06/24] python310Packages.google-cloud-texttospeech: 2.15.0 -> 2.15.1 --- .../python-modules/google-cloud-texttospeech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index f039e5870be3..7d89107c0d35 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.15.0"; + version = "2.15.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-d4Y+1U94/NLhlMoRPJzF5+QLhzBszsG6MH5G3PgfBzc="; + hash = "sha256-R4ReOtnO/auvNYlHyxlt3eovqkzfyvhkoBHbghpN6vs="; }; propagatedBuildInputs = [ From f30d03a7061152bbb2ef7864d3ba3af4312e5356 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Jan 2024 01:32:45 +0000 Subject: [PATCH 07/24] python310Packages.hvac: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/hvac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 5f15e359f35e..42f09f7266cc 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hvac"; - version = "2.0.0"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-alHLmg0i/hPoJMsLChzi7qy5zmr2i30bZoniXsG+yvU="; + hash = "sha256-tIvNoRpKsKe2xHIyx7p8h/2jGK4tSnZigAxGWnh0KJQ="; }; nativeBuildInputs = [ From 6f2685e4d9902e6a1d55fadd58698ccc04c8cf9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 08:08:35 +0000 Subject: [PATCH 08/24] nanoflann: 1.5.3 -> 1.5.4 --- pkgs/development/libraries/nanoflann/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix index bfd4b87dc07c..614d6a5b8e9f 100644 --- a/pkgs/development/libraries/nanoflann/default.nix +++ b/pkgs/development/libraries/nanoflann/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.5.3"; + version = "1.5.4"; pname = "nanoflann"; src = fetchFromGitHub { owner = "jlblancoc"; repo = "nanoflann"; rev = "v${finalAttrs.version}"; - hash = "sha256-cTi3Q+SUSNQkSgi2K7nPqfqEQFMkbchbn2+pE2ol9xQ="; + hash = "sha256-7Vt/x9jHRqtVTv0MbHxIwd1/cTUB4aIgOiI+7cz0iu0="; }; nativeBuildInputs = [ cmake ]; From a63a884c0037fb46ee627b9f401544ccdf4afc13 Mon Sep 17 00:00:00 2001 From: Marcel Date: Wed, 17 Jan 2024 20:01:31 +0100 Subject: [PATCH 09/24] nixos/bird2: add option to disable auto reload In a critical setup of bird with many BGP sessions, you want to control the exact time when configuration changes are applied. Therefore, an option was added, to disable automatic reloading the systemd unit, when configuration changes are made. The administrator how has the ability to control how changes are applied. --- nixos/modules/services/networking/bird.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index 9deeb7694d2a..e25f5c7b0379 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -18,6 +18,13 @@ in ''; }; + autoReload = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether bird2 should be automatically reloaded when the configuration changes. + ''; + }; checkConfig = mkOption { type = types.bool; default = true; @@ -68,7 +75,7 @@ in systemd.services.bird2 = { description = "BIRD Internet Routing Daemon"; wantedBy = [ "multi-user.target" ]; - reloadTriggers = [ config.environment.etc."bird/bird2.conf".source ]; + reloadTriggers = lib.optional cfg.autoReload config.environment.etc."bird/bird2.conf".source; serviceConfig = { Type = "forking"; Restart = "on-failure"; From 6a66e91d212f98698d9c108182970640421c9a93 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 19 Jan 2024 08:12:45 +0100 Subject: [PATCH 10/24] nanoflann: rewrite cmakeFlags --- pkgs/development/libraries/nanoflann/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix index 614d6a5b8e9f..b740e83f4c25 100644 --- a/pkgs/development/libraries/nanoflann/default.nix +++ b/pkgs/development/libraries/nanoflann/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBUILD_EXAMPLES=${if buildExamples then "ON" else "OFF"}" + (lib.cmakeBool "BUILD_EXAMPLES" buildExamples) ]; doCheck = true; From 490556c6a99f50ecfea4614f047864b7ba0036c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jan 2024 14:07:14 +0000 Subject: [PATCH 11/24] duckscript: 0.9.2 -> 0.9.3 --- pkgs/development/tools/rust/duckscript/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/duckscript/default.nix b/pkgs/development/tools/rust/duckscript/default.nix index 4b53eacb096c..3b8c27ddbb1a 100644 --- a/pkgs/development/tools/rust/duckscript/default.nix +++ b/pkgs/development/tools/rust/duckscript/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "duckscript_cli"; - version = "0.9.2"; + version = "0.9.3"; src = fetchCrate { inherit pname version; - hash = "sha256-qvocz/7Fx2YkgPcOYQha5iHQmoU40joGamj/SMiYx+4="; + hash = "sha256-2ouEmI7BH9J+PEN7l3rE8nmd0Khe2Bjq1Bg9SgGnB4E="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoHash = "sha256-SW3Q/+EhdMNLbhGQPpiIXuJv3ttyeCpjjvbVCrJzXlY="; + cargoHash = "sha256-bBqcHETEWooMgQeqPOZIK/77DdTtGq1JusBKoRj5K6w="; meta = with lib; { description = "Simple, extendable and embeddable scripting language."; From 8b3edf412a6e581380a9030c9574ac9a4a644fb4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jan 2024 17:20:39 +0000 Subject: [PATCH 12/24] faraday-cli: 2.1.9 -> 2.1.10 --- pkgs/tools/security/faraday-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/faraday-cli/default.nix b/pkgs/tools/security/faraday-cli/default.nix index cebe1540c605..26e39cceea52 100644 --- a/pkgs/tools/security/faraday-cli/default.nix +++ b/pkgs/tools/security/faraday-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "faraday-cli"; - version = "2.1.9"; + version = "2.1.10"; format = "setuptools"; src = fetchFromGitHub { owner = "infobyte"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8D1oYYqf0R41DPYtorcvykZ99p6P6Diwe7PgEN378pU="; + hash = "sha256-7Yg2m0xHpBPZ58gJodSYO8vXaxSlr4GK1Lin63WozOE="; }; propagatedBuildInputs = with python3.pkgs; [ From 222e39efe5d605357dafac694b89ab771058ed2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jan 2024 19:23:00 +0000 Subject: [PATCH 13/24] cnquery: 9.13.0 -> 9.14.0 --- pkgs/tools/security/cnquery/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnquery/default.nix b/pkgs/tools/security/cnquery/default.nix index 158629f1cd10..9c6803ecd840 100644 --- a/pkgs/tools/security/cnquery/default.nix +++ b/pkgs/tools/security/cnquery/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "cnquery"; - version = "9.13.0"; + version = "9.14.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; rev = "v${version}"; - hash = "sha256-jJayS4zGnbQBY/Z7rk4Xx0nHjCdAYCDs/FDYPVBxcqE="; + hash = "sha256-/Lawxl+jMJKSOKi5yxc+d7Gro69rLCB7nyYPmLtNGoU="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-AHVmvmTn2MlL+aVBUQs4PA3k8w9/QQRD57DvSpSq09I="; + vendorHash = "sha256-T7pD88v2sF7w/t5O+sekn1oy/uvA6LytYptLXrd+X4c="; meta = with lib; { description = "cloud-native, graph-based asset inventory"; From 3fec4fd5dcf962f329b1163d644a96ea8e7e2f71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jan 2024 20:46:27 +0000 Subject: [PATCH 14/24] bilibili: 1.12.5-2 -> 1.13.0-2 --- pkgs/applications/video/bilibili/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/bilibili/default.nix b/pkgs/applications/video/bilibili/default.nix index 7c9bbc4cfadf..72c4f7bdbf3f 100644 --- a/pkgs/applications/video/bilibili/default.nix +++ b/pkgs/applications/video/bilibili/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { pname = "bilibili"; - version = "1.12.5-2"; + version = "1.13.0-2"; src = fetchurl { url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; - hash = "sha256-oaQvJQVHXm7I+3rjt0DPMwGOXLhwgJP6wWu2bhaA1s4="; + hash = "sha256-svTD8YZBFj0K9/3ggojiH+8cMRkCxHr/hHTC24NL2tE="; }; unpackPhase = '' From f0cd0a8158b1a6d54301dbbcd6c7c83a0cc4f501 Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 10 Jan 2024 01:14:45 -0500 Subject: [PATCH 15/24] vesktop: add withSystemVencord --- pkgs/by-name/ve/vesktop/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 3882a23a5a15..e29007a1876c 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -19,6 +19,9 @@ , nodePackages , speechd , withTTS ? true + # Enables the use of vencord from nixpkgs instead of + # letting vesktop manage it's own version +, withSystemVencord ? true }: stdenv.mkDerivation (finalAttrs: { pname = "vesktop"; @@ -86,9 +89,8 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - (substituteAll { inherit vencord; src = ./use_system_vencord.patch; }) ./disable_update_checking.patch - ]; + ] ++ lib.optional withSystemVencord (substituteAll { inherit vencord; src = ./use_system_vencord.patch; }); ELECTRON_SKIP_BINARY_DOWNLOAD = 1; From f0116875ede56582f26f063922395eb48519db8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Jan 2024 11:45:47 +0000 Subject: [PATCH 16/24] snac2: 2.44 -> 2.45 --- pkgs/servers/snac2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix index 11276aa3e216..d0d8e3434722 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/servers/snac2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "snac2"; - version = "2.44"; + version = "2.45"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = pname; rev = version; - hash = "sha256-0bsXL6b41CchWrNZhQyPsj3JEjCLLdaOIi07icF6roQ="; + hash = "sha256-zSmzG/Ws7/6rXBNqAtKqnWcsPA9jy/TidXlklwGhArc="; }; buildInputs = [ curl openssl ]; From 28f44879c5203d54af14b6f77d614c75cc25926a Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sun, 21 Jan 2024 15:56:27 +0100 Subject: [PATCH 17/24] paperless-ngx: 2.3.3 -> 2.4.0 --- pkgs/applications/office/paperless-ngx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index ce4383c3cc96..ebd70eac7ea9 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -21,13 +21,13 @@ }: let - version = "2.3.3"; + version = "2.4.0"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-2XnOap37ZQjT0qx2ygxXo7n1HJcIEoc5TrMI1JIk4G8="; + hash = "sha256-bIiUG5yLpKOoxByef2Wm7MmSoL5zAYE9x6/zZywG9aE="; }; python = python3; @@ -52,7 +52,7 @@ let cd src-ui ''; - npmDepsHash = "sha256-BFfbRrpF8p0AfEdl/KDWWG7qN+F9edvTW3j9jgvLIrc="; + npmDepsHash = "sha256-4PIslsmbcET/kKLZ/gijwEyBB9zgZR6vMU9h9enzScE="; nativeBuildInputs = [ pkg-config From acdd3a362cb8840b0fc17cafa5b6d282377caa9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Jan 2024 21:29:29 +0100 Subject: [PATCH 18/24] python311Packages.msprime: 1.2.0 -> 1.3.0 Changelog: https://github.com/tskit-dev/msprime/blob/1.3.0/CHANGELOG.md --- .../python-modules/msprime/default.nix | 41 ++++++++----------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/msprime/default.nix b/pkgs/development/python-modules/msprime/default.nix index 2ec32c255dfa..cf0f8abb22be 100644 --- a/pkgs/development/python-modules/msprime/default.nix +++ b/pkgs/development/python-modules/msprime/default.nix @@ -1,42 +1,32 @@ { lib , buildPythonPackage -, fetchPypi -, fetchpatch -, oldest-supported-numpy -, setuptools-scm -, wheel -, pythonOlder -, gsl -, numpy -, newick -, tskit , demes -, pytestCheckHook +, fetchPypi +, gsl +, newick +, numpy +, oldest-supported-numpy , pytest-xdist +, pytestCheckHook +, pythonOlder , scipy +, setuptools-scm +, tskit +, wheel }: buildPythonPackage rec { pname = "msprime"; - version = "1.2.0"; - format = "pyproject"; + version = "1.3.0"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-YAJa2f0w2CenKubnYLbP8HodDhabLB2hAkyw/CPkp6o="; + hash = "sha256-eYjGHvlJXDZ+gu/J+52AI8PbKiB6ZEXUORlTrzxCbCk="; }; - patches = [ - # upstream patch fixes 2 failing unittests. remove on update - (fetchpatch { - name = "python311.patch"; - url = "https://github.com/tskit-dev/msprime/commit/639125ec942cb898cf4a80638f229e11ce393fbc.patch"; - hash = "sha256-peli4tdu8Bv21xIa5H8SRdfjQnTMO72IPFqybmSBSO8="; - includes = [ "tests/test_ancestry.py" ]; - }) - ]; - nativeBuildInputs = [ gsl oldest-supported-numpy @@ -60,10 +50,12 @@ buildPythonPackage rec { pytest-xdist scipy ]; + disabledTests = [ "tests/test_ancestry.py::TestSimulator::test_debug_logging" "tests/test_ancestry.py::TestSimulator::test_debug_logging_dtw" ]; + disabledTestPaths = [ "tests/test_demography.py" "tests/test_algorithms.py" @@ -86,6 +78,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simulate genealogical trees and genomic sequence data using population genetic models"; homepage = "https://github.com/tskit-dev/msprime"; + changelog = "https://github.com/tskit-dev/msprime/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ alxsimon ]; }; From d473d84e3865cd32c1464fa2f1a5ad12fa071545 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Jan 2024 23:44:38 +0100 Subject: [PATCH 19/24] faraday-cli: refactor --- pkgs/tools/security/faraday-cli/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/faraday-cli/default.nix b/pkgs/tools/security/faraday-cli/default.nix index 26e39cceea52..b0ee2015555c 100644 --- a/pkgs/tools/security/faraday-cli/default.nix +++ b/pkgs/tools/security/faraday-cli/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "faraday-cli"; version = "2.1.10"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "infobyte"; @@ -15,6 +15,10 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-7Yg2m0xHpBPZ58gJodSYO8vXaxSlr4GK1Lin63WozOE="; }; + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + propagatedBuildInputs = with python3.pkgs; [ arrow click From 39e427f8caaa8778fc322d526e3826a206265e57 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Jan 2024 00:11:52 +0100 Subject: [PATCH 20/24] python311Packages.ytmusicapi: 1.4.2 -> 1.5.0 Diff: https://github.com/sigma67/ytmusicapi/compare/refs/tags/1.4.2...1.5.0 Changelog: https://github.com/sigma67/ytmusicapi/releases/tag/1.5.0 --- pkgs/development/python-modules/ytmusicapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index d0aebbc5138c..56cc67ec5c06 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.4.2"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sigma67"; repo = "ytmusicapi"; rev = "refs/tags/${version}"; - hash = "sha256-Ho8JEARmw9Pd7A/sYM6Fkp3gfYx4bXbFIvh9pSE7f5c="; + hash = "sha256-TlTCW9KeW9O00FzDiH8BXW/3795hsEUW1VXUy5qOk3w="; }; nativeBuildInputs = [ From 01d482f26acd2cad1974d6f52115929da226fdae Mon Sep 17 00:00:00 2001 From: D3vil0p3r Date: Sun, 31 Dec 2023 17:50:46 +0100 Subject: [PATCH 21/24] bulk_extractor: init at 2.0.6 To be checked in https://github.com/NixOS/nixpkgs/issues/81418 --- pkgs/by-name/bu/bulk_extractor/package.nix | 62 ++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 pkgs/by-name/bu/bulk_extractor/package.nix diff --git a/pkgs/by-name/bu/bulk_extractor/package.nix b/pkgs/by-name/bu/bulk_extractor/package.nix new file mode 100644 index 000000000000..d15f4eaeedb1 --- /dev/null +++ b/pkgs/by-name/bu/bulk_extractor/package.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, exiv2 +, flex +, libewf +, libxml2 +, openssl +, tre +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bulk_extractor"; + version = "2.0.6"; + + src = fetchFromGitHub { + owner = "simsong"; + repo = "bulk_extractor"; + rev = "v${finalAttrs.version}"; + hash = "sha256-LNdRN4pEA0rVEyKiBKGJgTKA4veVvsuP3ufiolHTk/s="; + fetchSubmodules = true; + }; + + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ + exiv2 + flex + libewf + libxml2 + openssl + tre + zlib + ]; + + meta = with lib; { + description = "A digital forensics tool for extracting information from file systems"; + longDescription = '' + bulk_extractor is a C++ program that scans a disk image, a file, or a + directory of files and extracts useful information without parsing + the file system or file system structures. The results are stored in + feature files that can be easily inspected, parsed, or processed with + automated tools. + ''; + mainProgram = "bulk_extractor"; + homepage = "https://github.com/simsong/bulk_extractor"; + downloadPage = "http://downloads.digitalcorpora.org/downloads/bulk_extractor/"; + changelog = "https://github.com/simsong/bulk_extractor/blob/${finalAttrs.src.rev}/ChangeLog"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = with platforms; unix ++ windows; + license = with licenses; [ + mit + cpl10 + gpl3Only + lgpl21Only + lgpl3Only + licenses.openssl + ]; + }; +}) From 4a73b35dd424bd1fb1e18675c91988fd29bdf8f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Jan 2024 23:34:21 +0000 Subject: [PATCH 22/24] editorconfig-checker: 2.7.2 -> 2.8.0 --- .../development/tools/misc/editorconfig-checker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index 57e7e79dfd3d..699f6c91978c 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "2.7.2"; + version = "2.8.0"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; rev = version; - hash = "sha256-ktZeBj5feJMf4XR4hybKdNrNCIrQD6KPetZffAZjwqI="; + hash = "sha256-CVstdtFPt/OlvJE27O+CqqDpUqp9bQl18IGyf8nputM="; }; - vendorHash = "sha256-dhvRZ+AYSmSzHsf3yOYBSvZbw7dfwQiILu+VSUX8N3s="; + vendorHash = "sha256-t2h9jtGfips+cpN1ckVhVgpg4egIYVXd89ahyDzV060="; doCheck = false; From d2c68a27f3656b75c153f07461f83541c1b3eb8a Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 22 Jan 2024 02:41:21 +0100 Subject: [PATCH 23/24] CODEOWNERS: add h7x4 to libconfig --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d2d2bbc9ae7f..3a76bb3e5b7f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -51,7 +51,7 @@ /pkgs/build-support/setup-hooks/auto-patchelf.py @layus /pkgs/pkgs-lib @infinisil ## Format generators/serializers -/pkgs/pkgs-lib/formats/libconfig @ckiee +/pkgs/pkgs-lib/formats/libconfig @ckiee @h7x4 # pkgs/by-name /pkgs/test/nixpkgs-check-by-name @infinisil From effd2e8a6e88a36ae27d2c33cfa19505e93ad354 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 17 Jan 2024 04:22:53 +0100 Subject: [PATCH 24/24] ikos: fix build with GCC 13 --- pkgs/development/tools/analysis/ikos/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/ikos/default.nix b/pkgs/development/tools/analysis/ikos/default.nix index 65d5f0e91bd8..50f4f552e0ff 100644 --- a/pkgs/development/tools/analysis/ikos/default.nix +++ b/pkgs/development/tools/analysis/ikos/default.nix @@ -20,10 +20,18 @@ stdenv.mkDerivation rec { hash = "sha256-scaFkUhCkIi41iR6CGPbEndzXkgqTKMb3PDNvhgVbCE="; }; - patches = fetchpatch { + patches = [ (fetchpatch { url = "https://github.com/NASA-SW-VnV/ikos/commit/2e647432427b3f0dbb639e0371d976ab6406f290.patch"; hash = "sha256-ffzjlqEp4qp76Kwl5zpyQlg/xUMt8aLDSSP4XA4ndS8="; - }; + }) + # Fix build with GCC 13 + # https://github.com/NASA-SW-VnV/ikos/pull/262 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/NASA-SW-VnV/ikos/commit/73c816641fb9780f0d3b5e448510363a3cf21ce2.patch"; + hash = "sha256-bkeSAtxrL+z+6QNiGOWSg7kN8XiZqMxlJiu5Dquhca0="; + }) + ]; nativeBuildInputs = [ cmake ]; buildInputs = [ boost tbb gmp clang llvm sqlite python