From 543e18bdd44a9eac5dcd50dd08a5254532b50fbc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Nov 2023 18:40:26 +0000 Subject: [PATCH 01/83] icingaweb2: 2.11.4 -> 2.12.1 --- pkgs/servers/icingaweb2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 83d482e251a1..25f1a419e0e3 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2"; - version = "2.11.4"; + version = "2.12.1"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - hash = "sha256-UMC1puEM0PhIu+lJouOj81tI/E6fz1PzPN0FU7TNwTg="; + hash = "sha256-j101HsFvJZrzpK395TF4seztYfCCQKnqrpEpGj5xrtQ="; }; nativeBuildInputs = [ makeWrapper ]; From 200f8bc8527ef8e10e8e72b46d78cc2c24841bd9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Dec 2023 16:20:56 +0000 Subject: [PATCH 02/83] sonic-pi: 4.4.0 -> 4.5.0 --- pkgs/applications/audio/sonic-pi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 74e488e436df..6635cb4784f9 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "sonic-pi"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "sonic-pi-net"; repo = pname; rev = "v${version}"; - hash = "sha256-rXMCaI9zvWIXmT7ZqIArsvZmEkEEbs+5jYDYsSGeCXc="; + hash = "sha256-s9B3OBwiUdCJyxbeQXeidv38pzmvC442Byl+llabqp0="; }; mixFodDeps = beamPackages.fetchMixDeps { @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { pname = "mix-deps-${pname}"; mixEnv = "test"; src = "${src}/app/server/beam/tau"; - hash = "sha256-YbYe+hljnoWFgV72OQ2YaUcnhucEtVb+TCLcMYzqUWU="; + hash = "sha256-7wqFI3f0CRVrXK2IUguqHNANwKMmTak/Xh9nr624TXc="; }; strictDeps = true; From 65e157dcd628fd862f04e3642e70fa04661200dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Dec 2023 13:59:08 +0000 Subject: [PATCH 03/83] eiwd: 2.8-1 -> 2.10-1 --- pkgs/by-name/ei/eiwd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ei/eiwd/package.nix b/pkgs/by-name/ei/eiwd/package.nix index 16a8cd98f30b..8aa11c83e34b 100644 --- a/pkgs/by-name/ei/eiwd/package.nix +++ b/pkgs/by-name/ei/eiwd/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "eiwd"; - version = "2.8-1"; + version = "2.10-1"; src = fetchFromGitHub { owner = "illiliti"; repo = "eiwd"; rev = finalAttrs.version; - hash = "sha256-SD/RJFuGBwFT4G73f93VrWO/6mGKQxjVhmNrpKRA/WY="; + hash = "sha256-AB4NBwfELy0yjzxS0rCcF641CGEdyM9tTB+ZWaM+erg="; fetchSubmodules = true; }; From e5586fef75ffb7a903dc3842fa29ccaeffa67dd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Dec 2023 07:36:29 +0000 Subject: [PATCH 04/83] evilwm: 1.1.1 -> 1.4.2 --- pkgs/applications/window-managers/evilwm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/evilwm/default.nix b/pkgs/applications/window-managers/evilwm/default.nix index 0578be8ed6c7..a0dbb3660d31 100644 --- a/pkgs/applications/window-managers/evilwm/default.nix +++ b/pkgs/applications/window-managers/evilwm/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "evilwm"; - version = "1.1.1"; + version = "1.4.2"; src = fetchurl { url = "http://www.6809.org.uk/evilwm/evilwm-${version}.tar.gz"; - sha256 = "79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a"; + sha256 = "sha256-QhLW2QywBbLMiIFLyFN3NrSVCrWCZLu2W4gHrGO9xLk="; }; buildInputs = [ From 0cdaebb1f1abe385c4a34d4d275e6e417cc8c3c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Dec 2023 20:30:20 +0000 Subject: [PATCH 05/83] icingaweb2-thirdparty: 0.12.0 -> 0.12.1 --- pkgs/servers/icingaweb2/thirdparty.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/icingaweb2/thirdparty.nix b/pkgs/servers/icingaweb2/thirdparty.nix index cc3f2c502ad4..552842967fde 100644 --- a/pkgs/servers/icingaweb2/thirdparty.nix +++ b/pkgs/servers/icingaweb2/thirdparty.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2-thirdparty"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "Icinga"; repo = "icinga-php-thirdparty"; rev = "v${version}"; - sha256 = "sha256-ZKERh8lssN5TF6W2eUY1j+kSslxOmGj72dV45a23o7Q="; + sha256 = "sha256-T67DcsHVf3yDQveNtSPqLoOOPuT4ThkUSCJ9aCSVaIc="; }; installPhase = '' From 303cd408d7ab4d026122f2f2ece5be0bea10785f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Dec 2023 20:31:10 +0000 Subject: [PATCH 06/83] icingaweb2-ipl: 0.13.0 -> 0.13.1 --- pkgs/servers/icingaweb2/ipl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/servers/icingaweb2/ipl.nix index b9623f47c91f..021876fa1d29 100644 --- a/pkgs/servers/icingaweb2/ipl.nix +++ b/pkgs/servers/icingaweb2/ipl.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2-ipl"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "Icinga"; repo = "icinga-php-library"; rev = "v${version}"; - hash = "sha256-U3SzjjYoalejPs5hqZP2QyvlKdgdpWk9o0DkFGtWC2w="; + hash = "sha256-4f0Xx4mnc+M2i97/TFQeg2rZaJUpKkx1SvpbLWmSYNo="; }; installPhase = '' From 5c3fbf08f967219dfa0a0e2e31097abd06dd51e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Dec 2023 04:27:27 +0000 Subject: [PATCH 07/83] apacheHttpdPackages.mod_wsgi3: 4.9.4 -> 5.0.0 --- pkgs/servers/http/apache-modules/mod_wsgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 497cc5b1ea0a..01f953f7c80c 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mod_wsgi"; - version = "4.9.4"; + version = "5.0.0"; src = fetchFromGitHub { owner = "GrahamDumpleton"; repo = "mod_wsgi"; rev = version; - hash = "sha256-6rRHdgdTb94kqIpWJOJOwoIsaXb/c4XY3q331GwQyf0="; + hash = "sha256-/4swm4AYCN3xyz2+OH7XqH/dFC53wqGPZgEAdxZQvbs="; }; buildInputs = [ apacheHttpd python3 ncurses ]; From b378acd188e31866ee5173591e7dc16b541a0b4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Dec 2023 05:50:31 +0000 Subject: [PATCH 08/83] kubernetes-helmPlugins.helm-s3: 0.15.1 -> 0.16.0 --- .../networking/cluster/helm/plugins/helm-s3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix index 0a1f99e1d679..87494186377b 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-s3"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "hypnoglow"; repo = pname; rev = "v${version}"; - hash = "sha256-D79nUIueOV2FC3I2LreHMzl/xOpzNa+OsfL5wcnyY78="; + hash = "sha256-0wx8q93y8goXNh2x/XI3FQEXImVTpONURiDW2dCAi6o="; }; - vendorHash = "sha256-dKKggD/VlBiopt2ygh07+6bTBbRgQfWbiY/1qJSSx/0="; + vendorHash = "sha256-i+rWg0/EUes5soFVRu9M5/iktbtudII7Ly5pcnOU2hU="; # NOTE: Remove the install and upgrade hooks. postPatch = '' From ae8175d702227ef0c8cdc73467ece2690f1d42f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Dec 2023 11:59:24 +0000 Subject: [PATCH 09/83] lidarr: 1.4.5.3639 -> 2.0.7.3849 --- pkgs/servers/lidarr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index daad39ee1cfb..aba1c766ce50 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-qiI6+uiDBwY+UkqWyYqySfdOilJ87GyAojY6a5NrHNY="; - arm64-linux_hash = "sha256-CXbZjVIF8JL+bOzUvnaDzpDn+DK9D1g6HnmdvEDR/S8="; - x64-osx_hash = "sha256-t58xYrootKjavdyZp37KByyQa0CwSkl+DLxZuGYV9qs="; + x64-linux_hash = "sha256-TqwVWV3kfBTqGYf6PT9H0E9YiG/AfLWEViKocVrhZuU="; + arm64-linux_hash = "sha256-aCaUZgnk4rnhEV3hDVZx1Bfz+PteefGeGvEdoKXGxxg="; + x64-osx_hash = "sha256-4O3H2gsH2Q3V9xY1fIMzkaU0qSEg3CF89chnrMdCmdk="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "lidarr"; - version = "1.4.5.3639"; + version = "2.0.7.3849"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz"; From 0173fad4655b078e28f46676038ace61ce50e973 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Dec 2023 16:18:13 +0000 Subject: [PATCH 10/83] python310Packages.sphinxcontrib-confluencebuilder: 2.3.0 -> 2.4.0 --- .../sphinxcontrib-confluencebuilder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index dc7798015cb7..6b282371f22b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sphinxcontrib-confluencebuilder"; - version = "2.3.0"; + version = "2.4.0"; format = "pyproject"; src = fetchPypi { pname = "sphinxcontrib_confluencebuilder"; inherit version; - hash = "sha256-Zpe2n131afnq4IhQEEZtquvSEkkjv/uznXt2tQhGfZA="; + hash = "sha256-q3+GwMVWMRu4eWwbdXcbPQzpBhBXcZEMFTpbEO+teLk="; }; nativeBuildInputs = [ From c9c1b4aa6120cb4f7d6fe184aea4ec997374fb98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 11:36:53 +0000 Subject: [PATCH 11/83] buildah-unwrapped: 1.33.2 -> 1.34.0 --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 81d00d6304e0..f67dba03c365 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.33.2"; + version = "1.34.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-jkUEGaECBNidKreoyezWw7LN38uHqyYo40dOwfuuuI4="; + hash = "sha256-LX7yc2FnCiquHV/tESJV/VkuUYXbRNSxmMzVpSz/F8w="; }; outputs = [ "out" "man" ]; From 680fc7eeed766ad3da6bb2803139c68528d65e38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Dec 2023 06:09:12 +0000 Subject: [PATCH 12/83] netsurf.buildsystem: 1.9 -> 1.10 --- pkgs/applications/networking/browsers/netsurf/buildsystem.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/netsurf/buildsystem.nix b/pkgs/applications/networking/browsers/netsurf/buildsystem.nix index 385deef99fdf..d08ffda76b49 100644 --- a/pkgs/applications/networking/browsers/netsurf/buildsystem.nix +++ b/pkgs/applications/networking/browsers/netsurf/buildsystem.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "netsurf-buildsystem"; - version = "1.9"; + version = "1.10"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${finalAttrs.version}.tar.gz"; - hash = "sha256-k4QeMUpoggmiC4dF8GU5PzqQ8Bvmj0Xpa8jS9KKqmio="; + hash = "sha256-PT451WnkRnfEsXkSm95hTGV5jis+YlMWAjnR/W6uTXk="; }; makeFlags = [ From a280d7fcfb642ecbbb16a42f87fd5a2be5f67dd8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Jan 2024 05:55:08 +0000 Subject: [PATCH 13/83] cglm: 0.9.1 -> 0.9.2 --- pkgs/development/libraries/cglm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix index f9bc0ebb9083..a4fab015db90 100644 --- a/pkgs/development/libraries/cglm/default.nix +++ b/pkgs/development/libraries/cglm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cglm"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "recp"; repo = "cglm"; rev = "v${version}"; - sha256 = "sha256-qOPOJ+h1bq5yKkP3ZNeZnRwiOMSgS7bxTk7s/5tREQw="; + sha256 = "sha256-jaG+XGbSx5SaNhGFWLh+1WTB+ya3c5tBZYs9xKIRafI="; }; nativeBuildInputs = [ cmake ]; From 3434366c2de58cacab57095659ec482db318f2fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jan 2024 01:43:43 +0000 Subject: [PATCH 14/83] super-productivity: 7.14.3 -> 7.17.2 --- pkgs/applications/office/super-productivity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index 1e5852b8cc83..60b7b9ba1129 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "7.14.3"; + version = "7.17.2"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-wW72T1+RfejaI9LxSxa/g0lvIRmAeFa2ZaEa8K9mRcw="; + sha256 = "sha256-CcgjfA0BRfCrRb8N+KIgheUAF+JJK3yIv9Trp+gg+s0="; name = "${pname}-${version}.AppImage"; }; From ab297f4e293046bc17d67135e8f5c361312de54f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jan 2024 04:53:28 +0000 Subject: [PATCH 15/83] gtk-pipe-viewer: 0.4.8 -> 0.4.9 --- pkgs/applications/video/pipe-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/pipe-viewer/default.nix b/pkgs/applications/video/pipe-viewer/default.nix index adf5fcb50487..536b904fd858 100644 --- a/pkgs/applications/video/pipe-viewer/default.nix +++ b/pkgs/applications/video/pipe-viewer/default.nix @@ -38,13 +38,13 @@ let in buildPerlModule rec { pname = "pipe-viewer"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "trizen"; repo = "pipe-viewer"; rev = version; - hash = "sha256-bFbriqpy+Jjwv/s4PZmLdL3hFtM8gfIn+yJjk3fCsnQ="; + hash = "sha256-7l8exCC9robe1hKnQAaIVfnn8L+FuwTOkxaxlwJmpe0="; }; nativeBuildInputs = [ makeWrapper ] From 78b38b91af1cf04064e180e8bc9beb10bd1f9fb4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jan 2024 07:39:11 +0000 Subject: [PATCH 16/83] bngblaster: 0.8.29 -> 0.8.34 --- pkgs/by-name/bn/bngblaster/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix index 6149a049131f..f70182e110c4 100644 --- a/pkgs/by-name/bn/bngblaster/package.nix +++ b/pkgs/by-name/bn/bngblaster/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bngblaster"; - version = "0.8.29"; + version = "0.8.34"; src = fetchFromGitHub { owner = "rtbrick"; repo = "bngblaster"; rev = finalAttrs.version; - hash = "sha256-yuWSGN7wLRksNjgr7c5GiC9JTN4T1PJV4Js1ZOGBKqA="; + hash = "sha256-oxmDg3en7mgTmhnvpkBtBJ6o/iF+GZ3Td3V6jlWMBZc="; }; nativeBuildInputs = [ From eac6fcaf257195f8e493ae7336fd15ade81397c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jan 2024 12:17:59 +0000 Subject: [PATCH 17/83] gdcm: 3.0.22 -> 3.0.23 --- pkgs/development/libraries/gdcm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 2a4fdaca2725..9d6db6fca684 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "gdcm"; - version = "3.0.22"; + version = "3.0.23"; src = fetchFromGitHub { owner = "malaterre"; repo = "GDCM"; rev = "refs/tags/v${version}"; - hash = "sha256-geWNGbBJGKPs5hNO42vtVOj0rOWyM6zmcocvRhWW4s0="; + hash = "sha256-zwIPWcjTrfbdNBzAqwV6lU2l6sx+e4Yi7dprdem6AeE="; }; cmakeFlags = [ From 736b52dcc6211aab07f0ac807b7d3ab571e81775 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 16:25:45 +0000 Subject: [PATCH 18/83] quark-engine: 23.9.1 -> 23.12.1 --- pkgs/tools/security/quark-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/tools/security/quark-engine/default.nix index e67dd3f8b944..9be9dca3a4ca 100644 --- a/pkgs/tools/security/quark-engine/default.nix +++ b/pkgs/tools/security/quark-engine/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "quark-engine"; - version = "23.9.1"; + version = "23.12.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-E9efhgMGN9lvMlFeZqo6xco75TtQsXULOzKX00pjqMM="; + sha256 = "sha256-NeJGkqGpg2uOsz10gEYz/nzh21DhXSU4RgQtI1brASQ="; }; propagatedBuildInputs = with python3.pkgs; [ From b581ad2cf1830772356b549f00886be4a42517c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jan 2024 14:29:09 +0000 Subject: [PATCH 19/83] steamPackages.steam-runtime: 0.20220601.1 -> 0.20231127.68515 --- pkgs/games/steam/runtime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index 593d78afe0cc..8e0492b69af8 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "steam-runtime"; # from https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt - version = "0.20220601.1"; + version = "0.20231127.68515"; src = fetchurl { url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz"; - sha256 = "sha256-uYauNtbUlvrnATGks7hWy1zt4Y7AEeADrCr1eVylPbY="; + sha256 = "sha256-invUOdJGNhrswsj9Vj/bSAkEigWtBQ554sBAyvPf0mk="; name = "scout-runtime-${version}.tar.gz"; }; From 5dfb542d0bb1eaf998ae84745c367b26ebe7cf5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jan 2024 08:47:44 +0000 Subject: [PATCH 20/83] python311Packages.aioquic: 0.9.23 -> 0.9.25 --- pkgs/development/python-modules/aioquic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioquic/default.nix b/pkgs/development/python-modules/aioquic/default.nix index fc0fe63de4e5..156b0cfedcf2 100644 --- a/pkgs/development/python-modules/aioquic/default.nix +++ b/pkgs/development/python-modules/aioquic/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aioquic"; - version = "0.9.23"; + version = "0.9.25"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-UsnaYO0IN/6LimoNfc8N++vsjpoCfhDr9yBPBWnFj6g="; + hash = "sha256-cHlceJBTJthVwq5SQHIjSq5YbHibgSkuJy0CHpsEMKM="; }; nativeBuildInputs = [ From 41cbdb1d705d1f3ca7da26f89d97cde3b1891e88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jan 2024 10:34:02 +0000 Subject: [PATCH 21/83] python311Packages.ansible: 9.0.1 -> 9.1.0 --- pkgs/development/python-modules/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 42f4d0032cfd..957c36b8525e 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -21,7 +21,7 @@ let pname = "ansible"; - version = "9.0.1"; + version = "9.1.0"; in buildPythonPackage { inherit pname version; @@ -31,7 +31,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-zAbCUfFCg3z1QLeXdyRZapTz0P6dqWGRdeneZTnNBwU="; + hash = "sha256-WtlJkfsODlOncKn/zxtoBH9hsigtlIp9JoLs2PuPob8="; }; postPatch = '' From e31a2f99a604bbafd57877f427c2124937aa7795 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jan 2024 10:20:07 +0000 Subject: [PATCH 22/83] python311Packages.fontparts: 0.11.0 -> 0.12.1 --- pkgs/development/python-modules/fontparts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index e3113b8d1fb4..9f042cf1ef46 100644 --- a/pkgs/development/python-modules/fontparts/default.nix +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "fontParts"; - version = "0.11.0"; + version = "0.12.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-He3BAIWxwDIM80ixmYjyAHlwDK9bBe/qS8P4+TVEkEg="; + hash = "sha256-eeU13S1IcC+bsiK3YDlT4rVDeXDGcxx1wY/is8t5pCA="; extension = "zip"; }; From d8ea99bd3572eda27b040c966dea7bce78766873 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jan 2024 10:30:54 +0000 Subject: [PATCH 23/83] python311Packages.fuse: 1.0.5 -> 1.0.7 --- pkgs/development/python-modules/fuse-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix index 87f075460caf..8bcb486a6311 100644 --- a/pkgs/development/python-modules/fuse-python/default.nix +++ b/pkgs/development/python-modules/fuse-python/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "fuse-python"; - version = "1.0.5"; + version = "1.0.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-dOX/szaCu6mlrypaBI9Ht+e0ZOv4QpG/WiWL+60Do6o="; + hash = "sha256-MhiAY2UkCM1HKuu2+S0135LIu0IAk3H4yJJ7s35r3Rs="; }; buildInputs = [ fuse ]; From 386ec18e63042e4740dfa39bb57cfaee4d08585a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jan 2024 11:04:39 +0000 Subject: [PATCH 24/83] python311Packages.glean-parser: 10.0.3 -> 11.0.1 --- pkgs/development/python-modules/glean-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index d85a0771a809..daf8f641f4d2 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "10.0.3"; + version = "11.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-1XNZYp0pX57lcAaKKEaWaJLj/ttyIlnsvNjMN20pm1E="; + hash = "sha256-eeUjtRsP3c6fbGMJ+oxkMou3BrLWyEelP4ipPQFpXkM="; }; postPatch = '' From 9adf8388ba470a32f4991c99992cb274474ff7bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jan 2024 22:07:07 +0000 Subject: [PATCH 25/83] qdirstat: 1.8.1 -> 1.9 --- pkgs/applications/misc/qdirstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index 92949ad4a893..dc112d2d6935 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -4,13 +4,13 @@ let pname = "qdirstat"; - version = "1.8.1"; + version = "1.9"; src = fetchFromGitHub { owner = "shundhammer"; repo = pname; rev = version; - sha256 = "sha256-yWv41iWtdTdlFuvLHKCbwmnSXq7Z5pIJq28GMDltdxM="; + sha256 = "sha256-pwdmltHDNwUMx1FNOoiXl5Pna0zlKqahmicBCN6UVSU="; }; in From 94c2b6ca2fac598280271eb820d7e8935f4c0471 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Jan 2024 19:17:16 +0000 Subject: [PATCH 26/83] pacparser: 1.4.2 -> 1.4.3 --- pkgs/tools/networking/pacparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/tools/networking/pacparser/default.nix index 89fca0a220ba..d4b81928498c 100644 --- a/pkgs/tools/networking/pacparser/default.nix +++ b/pkgs/tools/networking/pacparser/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pacparser"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "manugarg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-p83aAcZ3fGOrokq4HDgF5/VxMl3Q11voSjdaBUUO4S0="; + sha256 = "sha256-qIfzAQ/dJgOZJajNU3XyFudSxu2w4JC0ffHosHXje1o="; }; makeFlags = [ "NO_INTERNET=1" ]; From 3590918e9dee826e0592713859317dbbaf3fc7aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jan 2024 07:08:22 +0000 Subject: [PATCH 27/83] sqlite-web: 0.3.6 -> 0.6.2 --- pkgs/development/tools/database/sqlite-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqlite-web/default.nix b/pkgs/development/tools/database/sqlite-web/default.nix index ee333ac02744..351c5475ea0e 100644 --- a/pkgs/development/tools/database/sqlite-web/default.nix +++ b/pkgs/development/tools/database/sqlite-web/default.nix @@ -5,11 +5,11 @@ python3Packages.buildPythonApplication rec { pname = "sqlite-web"; - version = "0.3.6"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "17pymadm063358nji70xzma64zkfv26c3pai5i1whsfp9ahqzasg"; + sha256 = "sha256-VIbmYN6KjCRpE+kvJyBV75deYmh+zRjcQXZ2/7mseYU="; }; propagatedBuildInputs = with python3Packages; [ flask peewee pygments ]; From 14cf28ccece3fcefcef51eabd3fac2974fd3ac38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jan 2024 12:52:46 +0000 Subject: [PATCH 28/83] cloudsmith-cli: 0.35.2 -> 1.1.1 --- pkgs/development/tools/cloudsmith-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/cloudsmith-cli/default.nix b/pkgs/development/tools/cloudsmith-cli/default.nix index ee3cd5ac33a3..48952c0616fb 100644 --- a/pkgs/development/tools/cloudsmith-cli/default.nix +++ b/pkgs/development/tools/cloudsmith-cli/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "cloudsmith-cli"; - version = "0.35.2"; + version = "1.1.1"; format = "wheel"; src = fetchPypi { pname = "cloudsmith_cli"; inherit format version; - hash = "sha256-+M4CPveS9dltMI291Atm84T/cf4dPOO3wPvPI15E73Y="; + hash = "sha256-evwXXGmGa6V2LhgkmX04E5VvdPxeZzvl4F28auXcSng="; }; propagatedBuildInputs = with python3.pkgs; [ From dcb75ccb68ac910c8de65a0457035ad59d6c7c58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jan 2024 15:13:17 +0000 Subject: [PATCH 29/83] vengi-tools: 0.0.27 -> 0.0.28 --- pkgs/applications/graphics/vengi-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index dd13f8ba4503..23b6f5009ce4 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "vengi-tools"; - version = "0.0.27"; + version = "0.0.28"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${version}"; - hash = "sha256-A37IY66wZZK7Tv0zWsORO6CuRRRj7YmKLnEPSbfAvwI="; + hash = "sha256-UjSm/J/y7MUg3Exmw0P56+bcjiLxXdGS2brocdzgJ+c="; }; nativeBuildInputs = [ From 12e44a4f46a9e3f7f02adcd2771ea0237abd15cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jan 2024 04:05:06 +0000 Subject: [PATCH 30/83] instawow: v3.1.0 -> 3.2.0 --- pkgs/games/instawow/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/instawow/default.nix b/pkgs/games/instawow/default.nix index 36e60d548842..7534f5f892a7 100644 --- a/pkgs/games/instawow/default.nix +++ b/pkgs/games/instawow/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "instawow"; - version = "v3.1.0"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "layday"; repo = pname; - rev = version; - sha256 = "sha256-xJw/tgHBfOlv5JYsWWdEJ8vpel348YtXCQsaLqgp3Z0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-eBpX+ojlrWwRXuMijnmb4lNlxIJ40Q9RUqS6txPBDiM="; }; extras = [ ]; # Disable GUI, most dependencies are not packaged. From a4370eba871e7f080f5906a778867b463172d914 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jan 2024 06:40:31 +0000 Subject: [PATCH 31/83] antora: 3.1.5 -> 3.1.7 --- pkgs/development/tools/documentation/antora/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/documentation/antora/default.nix b/pkgs/development/tools/documentation/antora/default.nix index 9a68837714af..6ac43313e962 100644 --- a/pkgs/development/tools/documentation/antora/default.nix +++ b/pkgs/development/tools/documentation/antora/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "antora"; - version = "3.1.5"; + version = "3.1.7"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-PCtYV5jPGFja26Dv4kXiaw8ITWR4xzVP/9hc45UWHeg="; + hash = "sha256-uGXXp6boS5yYsInSmkI9S0Tn85QGVp/5Fsh1u3G4oPk="; }; - npmDepsHash = "sha256-//426AFUoJy7phqbbLdwkJvhOzcYsIumSaeAKefFsf4="; + npmDepsHash = "sha256-oWLRAuvWDk7w18qlDH14EE4elX5nhLKHSQANa/kXKvw="; # This is to stop tests from being ran, as some of them fail due to trying to query remote repositories postPatch = '' From 73119b4570d422c203cf83a08eb0c1ebc4fa2d61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jan 2024 10:20:23 +0000 Subject: [PATCH 32/83] timeular: 6.6.5 -> 6.6.8 --- pkgs/applications/office/timeular/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index c354f99c55bc..61b9de8029fe 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -5,12 +5,12 @@ }: let - version = "6.6.5"; + version = "6.6.8"; pname = "timeular"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - hash = "sha256-Ok2EnRLKrLxZQfPj5/fGGJS4lW6DBEmSx+f+Z2Y77fM="; + hash = "sha256-giQjcUnhBGt2egRmYLEL8cFZYKjtUu34ozh1filNyiw="; }; appimageContents = appimageTools.extractType2 { From 381f5bdc1f49a949bbc69398e85a88ae03525118 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jan 2024 20:48:24 +0000 Subject: [PATCH 33/83] show-midi: 0.8.0 -> 0.9.0 --- pkgs/by-name/sh/show-midi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sh/show-midi/package.nix b/pkgs/by-name/sh/show-midi/package.nix index e1a433fc8fb4..4e3029921321 100644 --- a/pkgs/by-name/sh/show-midi/package.nix +++ b/pkgs/by-name/sh/show-midi/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "show-midi"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "gbevin"; repo = "ShowMIDI"; rev = finalAttrs.version; - hash = "sha256-BtkfeHZyeSZH6wIojj3dd2nCS5R535dSWsis/hXJbPc="; + hash = "sha256-xt2LpoiaOWAeWM/YzaKM0WGi8aHs4T7pvMw1s/P4Oj0="; fetchSubmodules = true; }; From 729068650f49f013361860529c1961cc0d8a0f12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Jan 2024 01:36:56 +0000 Subject: [PATCH 34/83] entt: 3.12.2 -> 3.13.0 --- pkgs/development/libraries/entt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index 44e0b9ed1f05..ac12b2e5a561 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; - version = "3.12.2"; + version = "3.13.0"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; rev = "v${version}"; - sha256 = "sha256-gzoea3IbmpkIZYrfTZA6YgcnDU5EKdXF5Y7Yz2Uaj4A="; + hash = "sha256-LiQBKpXSr5+zOgtc+8snGqN/Aq3EHhQjlMBuqDOlSz0="; }; nativeBuildInputs = [ cmake ]; From a3ef982fc5e3ce15c0b46e5c74220a991e2ce345 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Jan 2024 14:51:32 +0000 Subject: [PATCH 35/83] icinga2: 2.14.0 -> 2.14.2 --- pkgs/servers/monitoring/icinga2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index b1b00a32b4d6..165e6e186808 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.14.0"; + version = "2.14.2"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - sha256 = "sha256-MrNfkbbmID27Ht2sDSklrPvRvCmewOuOOBIFnHJz1zE="; + sha256 = "sha256-vUtLGkTLGObx3zbfRTboNVsl9AmpAkHc+IhWhnKupSM="; }; patches = [ From b072e2b57af56536fed34e523f025f9c20f1cac6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 22 Jan 2024 23:52:17 +0100 Subject: [PATCH 36/83] python311Packages.aioquic: update dependencies --- pkgs/development/python-modules/aioquic/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/aioquic/default.nix b/pkgs/development/python-modules/aioquic/default.nix index 156b0cfedcf2..0d9801df1f82 100644 --- a/pkgs/development/python-modules/aioquic/default.nix +++ b/pkgs/development/python-modules/aioquic/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , certifi +, cryptography , fetchPypi , openssl , pylsqpack @@ -29,6 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ certifi + cryptography pylsqpack pyopenssl service-identity From ff89453043d0db0534998c1db5ab721210a59d16 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 23 Jan 2024 00:34:22 +0100 Subject: [PATCH 37/83] python311Packages.glean-parser: drop support for python 3.7 --- pkgs/development/python-modules/glean-parser/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index daf8f641f4d2..380ada5d33a6 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { version = "11.0.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "glean_parser"; From 6e05908e13697d06607f1fd6d55c7121962b8d16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jan 2024 02:19:31 +0000 Subject: [PATCH 38/83] afterburn: 5.4.3 -> 5.5.1 --- pkgs/tools/admin/afterburn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/afterburn/default.nix b/pkgs/tools/admin/afterburn/default.nix index 7cd637c28d9e..ddb8d0c9bfd4 100644 --- a/pkgs/tools/admin/afterburn/default.nix +++ b/pkgs/tools/admin/afterburn/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "afterburn"; - version = "5.4.3"; + version = "5.5.1"; src = fetchFromGitHub { owner = "coreos"; repo = "afterburn"; rev = "v${version}"; - sha256 = "sha256-IxAmamWJjM8DAEihH3lYgOLKOcSRvh48GSIX797Nhjo="; + sha256 = "sha256-3+FlW/y8EScJKaFvxa/hOlDF18kEtz2XyMdrDZgcMXs="; }; - cargoHash = "sha256-vQTxqAnnfjg4zFSOPLIcchRjqv0HJ3L2jBSNubpO9DM="; + cargoHash = "sha256-DTFvaXPr21qvx1FA1phueRxTgcrfhGgb9Vktah372Uo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; From 60dde8f90f0845bafd77e6a53393838897bbe8d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jan 2024 20:43:13 +0000 Subject: [PATCH 39/83] gnmic: 0.33.0 -> 0.35.0 --- pkgs/applications/networking/gnmic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gnmic/default.nix b/pkgs/applications/networking/gnmic/default.nix index 3bd4697a6e6e..4fa9ca102bdf 100644 --- a/pkgs/applications/networking/gnmic/default.nix +++ b/pkgs/applications/networking/gnmic/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gnmic"; - version = "0.33.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "openconfig"; repo = pname; rev = "v${version}"; - hash = "sha256-7jykosmVG+oJ6/27x+VtlVVxq/OQIctcjB1Wjs1DcRU="; + hash = "sha256-PGhU8u2dYo9S0yv8/F7YBSHUZWxxFUXIbjQIjsX6AGw="; }; - vendorHash = "sha256-VjeOSnCAdG+RlIg9uIyyQ8wKUqyX5uc2RXG75q84vm4="; + vendorHash = "sha256-HoOjVfpowb5jvAYdQ3cbCQmSl1RJKPDjvOaOGfhe5TY="; ldflags = [ "-s" "-w" From 01f7407f5e9cccf6355b2175558203f07b935aff Mon Sep 17 00:00:00 2001 From: pca006132 Date: Thu, 25 Jan 2024 10:50:36 +0800 Subject: [PATCH 40/83] maintainers: add pca006132 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b3f297a6920e..d30b61f49c32 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14432,6 +14432,12 @@ github = "pbsds"; githubId = 140964; }; + pca006132 = { + name = "pca006132"; + email = "john.lck40@gmail.com"; + github = "pca006132"; + githubId = 12198657; + }; pcarrier = { email = "pc@rrier.ca"; github = "pcarrier"; From 104a44e653840788379754248c4096a7edf60218 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jan 2024 03:56:26 +0000 Subject: [PATCH 41/83] sqlboiler: 4.15.0 -> 4.16.1 --- pkgs/development/tools/sqlboiler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sqlboiler/default.nix b/pkgs/development/tools/sqlboiler/default.nix index 432582dbc46e..eccb479aa5a4 100644 --- a/pkgs/development/tools/sqlboiler/default.nix +++ b/pkgs/development/tools/sqlboiler/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "sqlboiler"; - version = "4.15.0"; + version = "4.16.1"; src = fetchFromGitHub { owner = "volatiletech"; repo = "sqlboiler"; rev = "refs/tags/v${version}"; - hash = "sha256-MT1tjVCDaFB9HfjlGGnf6jTiPdKcrDamgp2nTpIarqY="; + hash = "sha256-MmZ2TZZ06eiz05bkEm6E8tmGRVkInBZJGHbuPN4fMMY="; }; - vendorHash = "sha256-tZ1RQGmeDv4rtdF1WTRQV1K4Xy1AgIatLPPexnHJnkA="; + vendorHash = "sha256-BTrQPWThfJ7gWXi/Y1l/s2BmkW5lVYS/PP0WRwntQxA="; tags = [ "mysql" From 3528c59926fbe0b83113c94c122b867f309fc700 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 25 Jan 2024 22:30:42 +0900 Subject: [PATCH 42/83] oterm: 0.1.18 -> 0.1.21 Diff: https://github.com/ggozad/oterm/compare/refs/tags/0.1.18...0.1.21 Changelog: https://github.com/ggozad/oterm/releases/tag/0.1.21 --- pkgs/by-name/ot/oterm/package.nix | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index 132259eb5fbe..34f79d96d949 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -5,14 +5,19 @@ python3Packages.buildPythonApplication rec { pname = "oterm"; - version = "0.1.18"; + version = "0.1.21"; pyproject = true; src = fetchFromGitHub { owner = "ggozad"; repo = "oterm"; rev = "refs/tags/${version}"; - hash = "sha256-hog0oEiZMxM3lM3xFZ+c15OTOwGXZ97FmG4PpyA94Ys="; + hash = "sha256-S6v7VDIGPu6UDbDe0H3LWF6IN0Z6ENmiCDxz+GuCibI="; }; + + pythonRelaxDeps = [ + "pillow" + ]; + propagatedBuildInputs = with python3Packages; [ textual typer @@ -23,8 +28,18 @@ python3Packages.buildPythonApplication rec { pyperclip packaging rich-pixels + pillow + aiohttp + ]; + + nativeBuildInputs = with python3Packages; [ + poetry-core + pythonRelaxDepsHook + ]; + + pythonImportsCheck = [ + "oterm" ]; - nativeBuildInputs = with python3Packages; [ poetry-core ]; # Tests require a HTTP connection to ollama doCheck = false; From 02250c7bd2b240489f37e8cb5011293f2546c9a2 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 25 Jan 2024 22:45:24 +0900 Subject: [PATCH 43/83] python311Packages.rich-pixels: fix version string --- pkgs/development/python-modules/rich-pixels/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/rich-pixels/default.nix b/pkgs/development/python-modules/rich-pixels/default.nix index a086065725b5..7b77e59b6c9f 100644 --- a/pkgs/development/python-modules/rich-pixels/default.nix +++ b/pkgs/development/python-modules/rich-pixels/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytestCheckHook , syrupy @@ -21,6 +22,14 @@ buildPythonPackage rec { hash = "sha256-fbpnHEfBPWLSYhgETqKbdmmzt7Lu/4oKgetjgNvv04c="; }; + patches = [ + (fetchpatch { + name = "fix-version.patch"; + url = "https://github.com/darrenburns/rich-pixels/commit/ff1cc3fef789321831f29e9bf282ae6b337eddb2.patch"; + hash = "sha256-58ZHBNg1RCuOfuE034qF1SbAgoiWMNlSG3c5pCSLUyI="; + }) + ]; + nativeBuildInputs = [ poetry-core pythonRelaxDepsHook From 3bfd251c0c58ffe0e548157b98c0bf245fc70ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 25 Jan 2024 16:06:08 +0100 Subject: [PATCH 44/83] knot-resolver: add dnstap support Fortunately the closure increases only by 0.5 MB, so that sounds suitable to include in the defaults. Knot Resolver packages for other distros typically do have it. --- pkgs/servers/dns/knot-resolver/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 28fe866dfdcc..d14c7450c8da 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -4,6 +4,7 @@ # build+runtime deps. , knot-dns, luajitPackages, libuv, gnutls, lmdb , jemalloc, systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle +, fstrm, protobufc # more optionals # test-only deps. , cmocka, which, cacert , extraFeatures ? false /* catch-all if defaults aren't enough */ @@ -62,9 +63,10 @@ unwrapped = stdenv.mkDerivation rec { # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ] + ## the rest are optional dependencies ++ optionals stdenv.isLinux [ /*lib*/systemd libcap_ng ] ++ [ jemalloc nghttp2 ] - ## optional dependencies; TODO: dnstap + ++ [ fstrm protobufc ] # dnstap support ; mesonFlags = [ From 68643bd6d1d013aaea7c6e0e7236352e6d75a175 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jan 2024 15:09:13 +0000 Subject: [PATCH 45/83] tui-journal: 0.6.0 -> 0.8.1 --- pkgs/applications/misc/tui-journal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/tui-journal/default.nix b/pkgs/applications/misc/tui-journal/default.nix index 9eb97da95ffa..9460690fbcfb 100644 --- a/pkgs/applications/misc/tui-journal/default.nix +++ b/pkgs/applications/misc/tui-journal/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.6.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-0qedRXjuISJst6cZ7rwz/4a935XsBMSzGN8JrzBKjeQ="; + hash = "sha256-1cCtWhWOzCezi29oQsa0L1LTIb87ITaJk0teDP2xV78="; }; - cargoHash = "sha256-d79NTaW0zs8g62EKqiphWEdgYEnLeRk4NFog0rivr3s="; + cargoHash = "sha256-uWxzJONzRDeZVuilpEj4KprF3PtjRhJk8C9zjs5yCvg="; nativeBuildInputs = [ pkg-config From b1436921351a2234e1e344c6a992b2436da31bd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jan 2024 17:04:42 +0000 Subject: [PATCH 46/83] barman: 3.7.0 -> 3.10.0 --- pkgs/tools/misc/barman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/tools/misc/barman/default.nix index f310b99f811f..b4bf50437218 100644 --- a/pkgs/tools/misc/barman/default.nix +++ b/pkgs/tools/misc/barman/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "barman"; - version = "3.7.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "EnterpriseDB"; repo = pname; rev = "refs/tags/release/${version}"; - hash = "sha256-5mecCg5c+fu6WUgmNEL4BR+JCild02YAuYgLwO1MGnI="; + hash = "sha256-NcDW1SLeP2BVH+TQp1M03Otg75axSFXfwQzlEJ1JOxo="; }; patches = [ From 729f5b69bb2a119e2f89fff8ac69245d2fdf0fb3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jan 2024 21:12:36 +0000 Subject: [PATCH 47/83] python312Packages.seaborn: 0.13.0 -> 0.13.2 --- pkgs/development/python-modules/seaborn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index fef58d973ccf..a296478b176c 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "seaborn"; - version = "0.13.0"; + version = "0.13.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mwaskom"; repo = "seaborn"; rev = "refs/tags/v${version}"; - hash = "sha256-RbtBNKTjUHdCFe1V7IvACgbSNIPhVFMYmtE34GKVIzs="; + hash = "sha256-aGIVcdG/XN999nYBHh3lJqGa3QVt0j8kmzaxdkULznY="; }; nativeBuildInputs = [ From d30dc94d14f9eeab7400c398671e03ad8e480066 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jan 2024 04:12:35 +0000 Subject: [PATCH 48/83] python311Packages.pyformlang: 1.0.4 -> 1.0.6 --- pkgs/development/python-modules/pyformlang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyformlang/default.nix b/pkgs/development/python-modules/pyformlang/default.nix index d4a055d459cd..63bf98a0ea5f 100644 --- a/pkgs/development/python-modules/pyformlang/default.nix +++ b/pkgs/development/python-modules/pyformlang/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pyformlang"; - version = "1.0.4"; + version = "1.0.6"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ysX6c8q26bcQyq6GgKBKxTdp00j+4ypb3mgM2cqCmBs="; + hash = "sha256-LHQM+Vy8YVfTtpWaveYgBlp74AnS/IF3Y1EbgwVku7I="; }; nativeBuildInputs = [ From 73a1d0ddc12a959a3644f204cdbe35707e0d29a3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 26 Jan 2024 14:50:19 +0100 Subject: [PATCH 49/83] ocamlPackages.timedesc: init at 2.0.0 --- .../ocaml-modules/timedesc/default.nix | 36 +++++++++++++++++++ .../ocaml-modules/timedesc/tzdb.nix | 15 ++++++++ .../ocaml-modules/timedesc/tzlocal.nix | 16 +++++++++ pkgs/top-level/ocaml-packages.nix | 4 +++ 4 files changed, 71 insertions(+) create mode 100644 pkgs/development/ocaml-modules/timedesc/default.nix create mode 100644 pkgs/development/ocaml-modules/timedesc/tzdb.nix create mode 100644 pkgs/development/ocaml-modules/timedesc/tzlocal.nix diff --git a/pkgs/development/ocaml-modules/timedesc/default.nix b/pkgs/development/ocaml-modules/timedesc/default.nix new file mode 100644 index 000000000000..b77f5af17b40 --- /dev/null +++ b/pkgs/development/ocaml-modules/timedesc/default.nix @@ -0,0 +1,36 @@ +{ lib +, fetchurl +, buildDunePackage +, angstrom +, ptime +, seq +, timedesc-tzdb +, timedesc-tzlocal +}: + +buildDunePackage rec { + pname = "timedesc"; + version = "2.0.0"; + + src = fetchurl { + url = "https://github.com/daypack-dev/timere/releases/download/timedesc-${version}/timedesc-${version}.tar.gz"; + hash = "sha256-NnnQpWOE1mt/F5lkWRPdDwpqXCUlcNi+Z5GE6YQQLK8="; + }; + + sourceRoot = "."; + + propagatedBuildInputs = [ + angstrom + ptime + seq + timedesc-tzdb + timedesc-tzlocal + ]; + + meta = { + description = "OCaml date time handling library"; + homepage = "https://github.com/daypack-dev/timere"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/timedesc/tzdb.nix b/pkgs/development/ocaml-modules/timedesc/tzdb.nix new file mode 100644 index 000000000000..95fab02d11a0 --- /dev/null +++ b/pkgs/development/ocaml-modules/timedesc/tzdb.nix @@ -0,0 +1,15 @@ +{ lib +, buildDunePackage +, timedesc +}: + +buildDunePackage { + pname = "timedesc-tzdb"; + + inherit (timedesc) version src sourceRoot; + + meta = timedesc.meta // { + description = "Virtual library for Timedesc time zone database backends"; + }; +} + diff --git a/pkgs/development/ocaml-modules/timedesc/tzlocal.nix b/pkgs/development/ocaml-modules/timedesc/tzlocal.nix new file mode 100644 index 000000000000..6dcbfd741075 --- /dev/null +++ b/pkgs/development/ocaml-modules/timedesc/tzlocal.nix @@ -0,0 +1,16 @@ +{ lib +, buildDunePackage +, timedesc +}: + +buildDunePackage { + pname = "timedesc-tzlocal"; + + inherit (timedesc) version src sourceRoot; + + minimalOCamlVersion = "4.08"; + + meta = timedesc.meta // { + description = "Virtual library for Timedesc local time zone detection backends"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7b3aa1c57abd..bd8204ae10cb 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1757,6 +1757,10 @@ let timed = callPackage ../development/ocaml-modules/timed { }; + timedesc = callPackage ../development/ocaml-modules/timedesc { }; + timedesc-tzdb = callPackage ../development/ocaml-modules/timedesc/tzdb.nix { }; + timedesc-tzlocal = callPackage ../development/ocaml-modules/timedesc/tzlocal.nix { }; + tiny_httpd = callPackage ../development/ocaml-modules/tiny_httpd { }; tls = callPackage ../development/ocaml-modules/tls { }; From 8ea7c4c7266a95a81f7c17644d63c8bd6eadf7ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Jan 2024 23:06:03 +0100 Subject: [PATCH 50/83] python311Packages.dissect-cstruct: 3.10 -> 3.12 Diff: https://github.com/fox-it/dissect.cstruct/compare/refs/tags/3.10...3.12 Changelog: https://github.com/fox-it/dissect.cstruct/releases/tag/3.12 --- pkgs/development/python-modules/dissect-cstruct/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index cecc7dffef3f..32e30dbad6a2 100644 --- a/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "dissect-cstruct"; - version = "3.10"; + version = "3.12"; format = "pyproject"; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.cstruct"; rev = "refs/tags/${version}"; - hash = "sha256-cdBojvFI0cN6mEZ98xLa3XldvIoR+Jv1c0/hvVkKVoQ="; + hash = "sha256-67s0Qr/YeQp/K9MZS+btKdp+9J6mIMCwiittIUB9p2w="; }; nativeBuildInputs = [ From 60dcaec1a58acd66b2f7542257b0aa0f4d019731 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Jan 2024 23:06:08 +0100 Subject: [PATCH 51/83] python311Packages.dissect-esedb: 3.10 -> 3.11 Diff: https://github.com/fox-it/dissect.esedb/compare/refs/tags/3.10...3.11 Changelog: https://github.com/fox-it/dissect.esedb/releases/tag/3.11 --- pkgs/development/python-modules/dissect-esedb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-esedb/default.nix b/pkgs/development/python-modules/dissect-esedb/default.nix index 1253b9ebb9c8..b5ddf86dd548 100644 --- a/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/pkgs/development/python-modules/dissect-esedb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-esedb"; - version = "3.10"; + version = "3.11"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.esedb"; rev = "refs/tags/${version}"; - hash = "sha256-RlXnUD+KiBmntM/f7jEzdZ0Tdb8vPGvW0e3XoANaPnk="; + hash = "sha256-ynrZqP3QXe+SXFB0Uz+tdH2jGj+hpHfarbEN2P1+r/8="; }; nativeBuildInputs = [ From 39c4ec72981b92902507057dac43553810f7ec08 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Jan 2024 23:06:45 +0100 Subject: [PATCH 52/83] python311Packages.dissect-extfs: 3.7 -> 3.8 Diff: https://github.com/fox-it/dissect.extfs/compare/refs/tags/3.7...3.8 Changelog: https://github.com/fox-it/dissect.extfs/releases/tag/3.8 --- pkgs/development/python-modules/dissect-extfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-extfs/default.nix b/pkgs/development/python-modules/dissect-extfs/default.nix index 86206ee27ac1..0659372ca5cf 100644 --- a/pkgs/development/python-modules/dissect-extfs/default.nix +++ b/pkgs/development/python-modules/dissect-extfs/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-extfs"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.extfs"; rev = "refs/tags/${version}"; - hash = "sha256-RsAWqtoarn/2sZU5dkQYt794dXGOr5fe68VgMNDBst4="; + hash = "sha256-yM9PTMI4/8oU2bvOCKdh5tT0gw9+6esV1auKSbupL0U="; }; nativeBuildInputs = [ From 4ef7c929fdefafca31dafefcfcc5282ac89c6a81 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Jan 2024 23:06:49 +0100 Subject: [PATCH 53/83] python311Packages.dissect-hypervisor: 3.10 -> 3.11 Diff: https://github.com/fox-it/dissect.hypervisor/compare/refs/tags/3.10...3.11 Changelog: https://github.com/fox-it/dissect.hypervisor/releases/tag/3.11 --- .../development/python-modules/dissect-hypervisor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index 975526db7158..d8ccf0e0d8fb 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dissect-hypervisor"; - version = "3.10"; + version = "3.11"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.hypervisor"; rev = "refs/tags/${version}"; - hash = "sha256-Ml5U7yc4iqqilL6Y9qF3VU+pa0AXnYVQjVas90TpG30="; + hash = "sha256-x7C2h9NZRlkJWAe0+PCmOhOpfHM2/4vc7oEGQqGEPq8="; }; nativeBuildInputs = [ From 14639030cfa5699e45a1ee8127897c4cd6ccedb1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Jan 2024 23:06:52 +0100 Subject: [PATCH 54/83] python311Packages.dissect-ntfs: 3.7 -> 3.8 Diff: https://github.com/fox-it/dissect.ntfs/compare/refs/tags/3.7...3.8 Changelog: https://github.com/fox-it/dissect.ntfs/releases/tag/3.8 --- pkgs/development/python-modules/dissect-ntfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-ntfs/default.nix b/pkgs/development/python-modules/dissect-ntfs/default.nix index 4d69844c9884..97ebe80f18b8 100644 --- a/pkgs/development/python-modules/dissect-ntfs/default.nix +++ b/pkgs/development/python-modules/dissect-ntfs/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-ntfs"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ntfs"; rev = "refs/tags/${version}"; - hash = "sha256-bnFimn5ektIKiX73NZ+1Iz3Uoew138a0nFJgypffC4o="; + hash = "sha256-BmXYnN8B7r/gz+zEWWS7ClOv29QOiHrm7g2ZNZXlnGU="; }; nativeBuildInputs = [ From 239b1da2f767d7dfbf3d6ea239d4d289dac9b26c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Jan 2024 23:06:58 +0100 Subject: [PATCH 55/83] python311Packages.dissect-target: 3.14 -> 3.15 Diff: https://github.com/fox-it/dissect.target/compare/refs/tags/3.14...3.15 Changelog: https://github.com/fox-it/dissect.target/releases/tag/3.15 --- pkgs/development/python-modules/dissect-target/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 90f82426f1c6..5248aa20de68 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.14"; + version = "3.15"; pyproject = true; disabled = pythonOlder "3.9"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.target"; rev = "refs/tags/${version}"; - hash = "sha256-vp1upVwohMXFKxlHy5lWmigdq9MUk1UknSsPpCXt50s="; + hash = "sha256-1uWKlp0t1mVtt3lbjl4U1TMxE2YHN/GzGs8OuoVTRqc="; }; postPatch = '' From 69076e1ff150442cfe1c5094211417ca2390195a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Jan 2024 23:07:01 +0100 Subject: [PATCH 56/83] python311Packages.dissect-util: 3.13 -> 3.14 Diff: https://github.com/fox-it/dissect.util/compare/refs/tags/3.13...3.14 Changelog: https://github.com/fox-it/dissect.util/releases/tag/3.14 --- pkgs/development/python-modules/dissect-util/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix index 495294db9c3f..894b5e35f4e0 100644 --- a/pkgs/development/python-modules/dissect-util/default.nix +++ b/pkgs/development/python-modules/dissect-util/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dissect-util"; - version = "3.13"; + version = "3.14"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.util"; rev = "refs/tags/${version}"; - hash = "sha256-GUDYr3lP0BV7zJaaUen78CplRA7jfn1zYes7kczNGEU="; + hash = "sha256-NzqQW6OFv+CtAxa5J2X/XGS9UCFfhMp4elvgcTrA1Wg="; }; nativeBuildInputs = [ From ae186d8840c3f71ab0208430036a78221c9b1468 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Jan 2024 23:07:04 +0100 Subject: [PATCH 57/83] python311Packages.dissect-volume: 3.7 -> 3.8 Diff: https://github.com/fox-it/dissect.volume/compare/refs/tags/3.7...3.8 Changelog: https://github.com/fox-it/dissect.volume/releases/tag/3.8 --- pkgs/development/python-modules/dissect-volume/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix index 1a2ce1e27355..77f69a83730f 100644 --- a/pkgs/development/python-modules/dissect-volume/default.nix +++ b/pkgs/development/python-modules/dissect-volume/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-volume"; - version = "3.7"; + version = "3.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.volume"; rev = "refs/tags/${version}"; - hash = "sha256-5ZO++l6BWA085U5IkghjCT46YhKc85SB7sNU2h4Fpec="; + hash = "sha256-hEfURO4ITpjSpfHMlYfzO1cG+tjvqBP5QLYzo2uz8yo="; }; nativeBuildInputs = [ From b04e0fe973f2f71185322409a81b3efe6d44f202 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Jan 2024 23:07:07 +0100 Subject: [PATCH 58/83] python311Packages.dissect-xfs: 3.6 -> 3.7 Diff: https://github.com/fox-it/dissect.xfs/compare/refs/tags/3.6...3.7 Changelog: https://github.com/fox-it/dissect.xfs/releases/tag/3.7 --- pkgs/development/python-modules/dissect-xfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-xfs/default.nix b/pkgs/development/python-modules/dissect-xfs/default.nix index 1f46b745edc3..af83a91ec22f 100644 --- a/pkgs/development/python-modules/dissect-xfs/default.nix +++ b/pkgs/development/python-modules/dissect-xfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-xfs"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.xfs"; rev = "refs/tags/${version}"; - hash = "sha256-unrkmhLvjWWKHiqJWCEVEVcUjxWXMznjOytRbDwAxKw="; + hash = "sha256-bqpN4Ho5A9j8oLwErPErMVgkanIkdNTqcT3lkdQiw6M="; }; nativeBuildInputs = [ From 7a8ad2209845cca096300e0b925097312b352d20 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Jan 2024 23:07:11 +0100 Subject: [PATCH 59/83] python311Packages.acquire: 3.11 -> 3.12 Diff: https://github.com/fox-it/acquire/compare/refs/tags/3.11...3.12 Changelog: https://github.com/fox-it/acquire/releases/tag/3.12 --- pkgs/development/python-modules/acquire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index aabd6216c904..c2c4e125e328 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.11"; + version = "3.12"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; rev = "refs/tags/${version}"; - hash = "sha256-0aLPDh9lrKpHo97VFFwCmPXyXXNFGgkdjoppzm3BCTo="; + hash = "sha256-anRNCnLDKHAEfOWi6m1n4R9lvFTlZgw5xxh39exvzH0="; }; nativeBuildInputs = [ From 2a4714a47c263ce19be0cd7d985ac0973a937e8b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Jan 2024 23:07:13 +0100 Subject: [PATCH 60/83] python311Packages.dissect: 3.11 -> 3.12 Diff: https://github.com/fox-it/dissect/compare/refs/tags/3.11...3.12 Changelog: https://github.com/fox-it/dissect/releases/tag/3.12 --- pkgs/development/python-modules/dissect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index eac1ba89fa55..544deeace888 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.11"; + version = "3.12"; pyproject = true; disabled = pythonOlder "3.9"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect"; rev = "refs/tags/${version}"; - hash = "sha256-6y+p+Ulc1Viu5s1AL/ecVtO4YRnmem/ZleY8xC4CJrU="; + hash = "sha256-hy5Yr/yR7CC7cp6pA1JP+GKazu+N4AwPqFKwb7zM+N8="; }; pythonRelaxDeps = true; From ccd069c53df09fa40f5104a0abe445f0da1e8f2d Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 27 Jan 2024 00:55:54 +0100 Subject: [PATCH 61/83] python311Packages.napari-npe2: fix the build `tomli-w` dependency was missing. --- pkgs/development/python-modules/napari-npe2/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/napari-npe2/default.nix b/pkgs/development/python-modules/napari-npe2/default.nix index 64659858258b..95ae7bfb39bb 100644 --- a/pkgs/development/python-modules/napari-npe2/default.nix +++ b/pkgs/development/python-modules/napari-npe2/default.nix @@ -13,6 +13,7 @@ , pyyaml , rich , typer +, tomli-w }: buildPythonPackage rec { @@ -46,6 +47,7 @@ buildPythonPackage rec { pyyaml rich typer + tomli-w ]; pythonImportsCheck = [ From 6bd77a95357adde552f9ba982ae9a8cccfdbfaee Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 27 Jan 2024 04:08:37 +0000 Subject: [PATCH 62/83] mate.atril: 1.26.1 -> 1.26.2 https://github.com/mate-desktop/atril/compare/v1.26.1...v1.26.2 --- pkgs/desktops/mate/atril/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 6c93c5084b4b..29c0e1b824e9 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -6,6 +6,7 @@ , gtk3 , glib , libxml2 +, libarchive , libsecret , poppler , itstool @@ -14,7 +15,7 @@ , mate , wrapGAppsHook , enableEpub ? true -, webkitgtk +, webkitgtk_4_1 , enableDjvu ? true , djvulibre , enablePostScript ? true @@ -27,11 +28,11 @@ stdenv.mkDerivation rec { pname = "atril"; - version = "1.26.1"; + version = "1.26.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "pTphOsuXAaGK1nG/WQJU0c6Da6CuG+LAvYlI/fa0kaQ="; + sha256 = "wwW51fVxP0Jiau4DggkTA0IrPXGlbd1lkyzNsjx86SY="; }; nativeBuildInputs = [ @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { gtk3 glib itstool + libarchive libsecret libxml2 poppler @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { texlive.bin.core # for synctex, used by the pdf back-end ] ++ lib.optionals enableDjvu [ djvulibre ] - ++ lib.optionals enableEpub [ webkitgtk ] + ++ lib.optionals enableEpub [ webkitgtk_4_1 ] ++ lib.optionals enablePostScript [ libspectre ] ++ lib.optionals enableXps [ libgxps ] ; From f5653488f0b0a00ce73b0be109dbbd726e221c4a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 27 Jan 2024 04:20:00 +0000 Subject: [PATCH 63/83] silver-platter: 0.5.12 -> 0.5.20 Diff: https://github.com/jelmer/silver-platter/compare/0.5.12...0.5.20 --- .../silver-platter/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/silver-platter/default.nix b/pkgs/applications/version-management/silver-platter/default.nix index 1e5720f0d0ab..f1653cf10389 100644 --- a/pkgs/applications/version-management/silver-platter/default.nix +++ b/pkgs/applications/version-management/silver-platter/default.nix @@ -1,6 +1,8 @@ { buildPythonApplication , lib +, stdenv , fetchFromGitHub +, pkg-config , setuptools , setuptools-rust , rustPlatform @@ -9,30 +11,37 @@ , breezy , dulwich , jinja2 +, libiconv +, openssl , pyyaml , ruamel-yaml }: buildPythonApplication rec { pname = "silver-platter"; - version = "0.5.12"; + version = "0.5.20"; pyproject = true; src = fetchFromGitHub { owner = "jelmer"; repo = "silver-platter"; rev = version; - hash = "sha256-QkTT9UcJuGDAwpp/CtXobPvfTYQzFakBR72MhF//Bpo="; + hash = "sha256-k+C4jrC4FO/yy9Eb6x4lv1zyyp/eGkpMcDqZ0KoxfBs="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-QLnKu9D23FVp1jCSuxN3odPZ1ToAZ6i/FNS8BkmNuQw="; + hash = "sha256-+EUj6iBnHF4zlOAAfaHy5V/z6CCD/LFksBClE4FaHHc="; }; propagatedBuildInputs = [ setuptools breezy dulwich jinja2 pyyaml ruamel-yaml ]; - nativeBuildInputs = [ setuptools-rust rustPlatform.cargoSetupHook cargo rustc ]; + nativeBuildInputs = [ setuptools-rust rustPlatform.cargoSetupHook cargo rustc ] + ++ lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ libiconv ]; + + pythonImportsCheck = [ "silver_platter" ]; meta = with lib; { description = "Automate the creation of merge proposals for scriptable changes"; From 6e50e3795bd33928cc2a0652b51e07943603b2a4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Jan 2024 13:18:58 +0100 Subject: [PATCH 64/83] aocd-example-parser: init at unstable-2023-12-17 Default implementation of an example parser plugin for advent-of-code-data https://github.com/wimglenn/aocd-example-parser --- .../aocd-example-parser/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/aocd-example-parser/default.nix diff --git a/pkgs/development/python-modules/aocd-example-parser/default.nix b/pkgs/development/python-modules/aocd-example-parser/default.nix new file mode 100644 index 000000000000..c2379aa914e1 --- /dev/null +++ b/pkgs/development/python-modules/aocd-example-parser/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aocd-example-parser"; + version = "unstable-2023-12-17"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "wimglenn"; + repo = "aocd-example-parser"; + rev = "07330183f3e43401444fe17b08d72eb6168504e1"; + hash = "sha256-iOxqzZj29aY/xyigir1KOU6GcBBvnlxEOBLHChEQjf4="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + # Circular dependency with aocd + # pythonImportsCheck = [ + # "aocd_example_parser" + # ]; + + meta = with lib; { + description = "Default implementation of an example parser plugin for advent-of-code-data"; + homepage = "https://github.com/wimglenn/aocd-example-parser"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba9705c80c1f..cacef5469c12 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -617,6 +617,8 @@ self: super: with self; { aocd = callPackage ../development/python-modules/aocd { }; + aocd-example-parser = callPackage ../development/python-modules/aocd-example-parser { }; + apache-beam = callPackage ../development/python-modules/apache-beam { }; apcaccess = callPackage ../development/python-modules/apcaccess { }; From 02cb1b733b2cd54ec0df6250b7d4db8be4f3fe60 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Jan 2024 13:22:04 +0100 Subject: [PATCH 65/83] python311Packages.aocd: refactor --- .../python-modules/aocd/default.nix | 68 ++++++++++--------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/pkgs/development/python-modules/aocd/default.nix b/pkgs/development/python-modules/aocd/default.nix index f1a31ee243b8..1b56736028b8 100644 --- a/pkgs/development/python-modules/aocd/default.nix +++ b/pkgs/development/python-modules/aocd/default.nix @@ -1,32 +1,33 @@ { lib , stdenv +, aocd-example-parser +, beautifulsoup4 , buildPythonPackage , fetchFromGitHub -, requests -, pytestCheckHook -, tzlocal -, pytest-mock +, numpy +, pebble +, pook , pytest-freezegun +, pytest-mock , pytest-raisin , pytest-socket -, requests-mock -, pook -, numpy -, rich -, pebble +, pytestCheckHook , python-dateutil -, termcolor -, beautifulsoup4 -, setuptools , pythonOlder +, requests +, requests-mock +, rich +, setuptools +, termcolor +, tzlocal }: buildPythonPackage rec { pname = "aocd"; version = "2.0.1"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "wimglenn"; @@ -35,15 +36,30 @@ buildPythonPackage rec { hash = "sha256-YZvcR97uHceloqwoP+azaBmj3GLusYNbItLIaeJ3QD0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - python-dateutil - requests - termcolor + aocd-example-parser beautifulsoup4 pebble - tzlocal - setuptools + python-dateutil + requests rich # for example parser aoce. must either be here or checkInputs + termcolor + tzlocal + ]; + + nativeCheckInputs = [ + numpy + pook + pytest-freezegun + pytest-mock + pytest-raisin + pytest-socket + pytestCheckHook + requests-mock ]; # Too many failing tests @@ -85,20 +101,6 @@ buildPythonPackage rec { "test_submit_float_warns" ]; - nativeCheckInputs = [ - pytestCheckHook - pytest-mock - pytest-freezegun - pytest-raisin - pytest-socket - ]; - - checkInputs = [ - pook - numpy - requests-mock - ]; - pythonImportsCheck = [ "aocd" ]; From 3a43e5269a682aa25b26ec16fa027acb35a4e5a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Jan 2024 20:48:43 +0000 Subject: [PATCH 66/83] kicad-testing: 7.0-2024-01-07 -> 7.0-2024-01-27 --- pkgs/applications/science/electronics/kicad/versions.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index ffab1ba75121..d3965325ce4a 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -25,14 +25,14 @@ }; "kicad-testing" = { kicadVersion = { - version = "7.0-2024-01-07"; + version = "7.0-2024-01-27"; src = { - rev = "ace6439758f8d211001235f36f02a60488337e41"; - sha256 = "0z4p2srz9rld7mq6k2y5fipz8mgsdhh2506wam4388nklzzkrccr"; + rev = "13fcb571f7e5bf4bf142d151651fc577aca32053"; + sha256 = "0wvk3wx5lm2jvyip6b96ja464hdzp9klb7b7ng5i3mdldabh0jba"; }; }; libVersion = { - version = "7.0-2024-01-07"; + version = "7.0-2024-01-27"; libSources = { symbols.rev = "eedf6c9ddac2816023e817d4dc91032f9d7390b9"; symbols.sha256 = "0nlgmxf9z1vf4g350dfkxql1dawgmw275wqxkgszsfxmhdfpmi9v"; From b00133a959ac506d56202473eba39962aeb375ac Mon Sep 17 00:00:00 2001 From: Manuel Frischknecht Date: Sat, 27 Jan 2024 23:09:35 +0000 Subject: [PATCH 67/83] djv: fix build issue due to missing `cstdint` include GCC 13 stopped transitively including a couple of headers (including `cstdint`) in various scenarios, which breaks the build of the current release version of `djv`. A fix for this issue has already been merged in master as part of a PR from which Nixpkgs already pulls patches from [1]. As this is the case, I just added the missing commit to the list of patches in order to get the package building again. [1]: https://github.com/darbyjohnston/DJV/pull/477/commits/be0dd90c256f30c0305ff7b180fd932a311e66e5 --- pkgs/applications/graphics/djv/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/graphics/djv/default.nix b/pkgs/applications/graphics/djv/default.nix index 8e36e5b70db1..735807691af7 100644 --- a/pkgs/applications/graphics/djv/default.nix +++ b/pkgs/applications/graphics/djv/default.nix @@ -111,6 +111,11 @@ stdenv.mkDerivation rec { patches = [ # Pull fix ending upstream inclusion for gcc-12+ support: # https://github.com/darbyjohnston/DJV/pull/477 + (fetchpatch { + name = "gcc-13-cstdint-include.patch"; + url = "https://github.com/darbyjohnston/DJV/commit/be0dd90c256f30c0305ff7b180fd932a311e66e5.patch"; + hash = "sha256-x8GAfakhgjBiCKHbfgCukT5iFNad+zqURDJkQr092uk="; + }) (fetchpatch { name = "gcc-11-limits.patch"; url = "https://github.com/darbyjohnston/DJV/commit/0544ffa1a263a6b8e8518b47277de7601b21b4f4.patch"; From cef74fca195c570c2229c020e6866294b94d73b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jan 2024 02:53:56 +0000 Subject: [PATCH 68/83] python311Packages.langchain-core: 0.1.11 -> 0.1.16 --- pkgs/development/python-modules/langchain-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 3268ed2e2275..8e8309874f1e 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.1.11"; + version = "0.1.16"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_core"; inherit version; - hash = "sha256-StS1ltv9vIOTyW1AmDuXrsFlqwumZDC+rnPj2HnBOg0="; + hash = "sha256-jLVG7tMYAJ7hqKOB0QgHTt3wOVrmHrJD2wDXbh4mXok="; }; nativeBuildInputs = [ From 4a49046c3a60d7c1a47af94c4e88d3d21bcddc3a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 28 Jan 2024 04:20:00 +0000 Subject: [PATCH 69/83] esbuild: 0.19.12 -> 0.20.0 Diff: https://github.com/evanw/esbuild/compare/v0.19.12...v0.20.0 Changelog: https://github.com/evanw/esbuild/blob/v0.20.0/CHANGELOG.md --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 2f817c0cd040..75f103dec6cb 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.19.12"; + version = "0.20.0"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-NQ06esCSU6YPvQ4cMsi3DEFGIQGl8Ff6fhdTxUAyGvo="; + hash = "sha256-CJUBjDQAXSUFe37zYGbX6geeEk9goZ/aOalWDHPIZis="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; From c35f02f0539e1d4dea8132de2a2a0f1f757f3439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 27 Jan 2024 20:34:02 -0800 Subject: [PATCH 70/83] tui-journal: fix typo --- pkgs/applications/misc/tui-journal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/tui-journal/default.nix b/pkgs/applications/misc/tui-journal/default.nix index 9460690fbcfb..633351e46e22 100644 --- a/pkgs/applications/misc/tui-journal/default.nix +++ b/pkgs/applications/misc/tui-journal/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - description = "Your journal app if you live in a terminl"; + description = "Your journal app if you live in a terminal"; homepage = "https://github.com/AmmarAbouZor/tui-journal"; changelog = "https://github.com/AmmarAbouZor/tui-journal/blob/${src.rev}/CHANGELOG.ron"; license = licenses.mit; From 7fe75f45f5257ffa684d8801e54aaa730a3c9420 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jan 2024 05:03:32 +0000 Subject: [PATCH 71/83] python311Packages.clarifai-grpc: 10.0.4 -> 10.0.9 --- pkgs/development/python-modules/clarifai-grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index 511605a8ad99..fec7e49c412c 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.0.4"; + version = "10.0.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-jhM+UfyaliVmUH6e3ArZvZokB8lDKS/fx8376cZwlQM="; + hash = "sha256-SDGkAlIUCfz4G1TyGjSd4M5Syl8sw/aeUHT6J5V7RKg="; }; nativeBuildInputs = [ From bcd1c6e48c41a8f26f092f351412c682d659ac2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jan 2024 05:45:57 +0000 Subject: [PATCH 72/83] ibus-engines.typing-booster-unwrapped: 2.24.11 -> 2.24.12 --- .../inputmethods/ibus-engines/ibus-typing-booster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 8a6a7217dea6..96d532db725f 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.24.11"; + version = "2.24.12"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-qksAtEUdvRddkl1tLfDqGhJDGwT605/IJOuIFVxgI0s="; + hash = "sha256-RHmU+wcorC78Pa21DrhOLz3ztv8kByWo5l1i8F/LZO4="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ]; From ab63839a5d26ea665ee88981df5684d89d6f1b94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jan 2024 01:27:31 +0000 Subject: [PATCH 73/83] setools: 4.4.1 -> 4.4.4 --- pkgs/os-specific/linux/setools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 2e554a0241b2..c65268f27d50 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -8,13 +8,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "setools"; - version = "4.4.1"; + version = "4.4.4"; src = fetchFromGitHub { owner = "SELinuxProject"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-4T5FIdnKi35JSm+IoYA2gIBBRV0nN0YLEw9xvDqNcgo="; + hash = "sha256-QCJfFdY4THBurx7G8q/WAzb7b9CwtNNGi5fn9D++BMU="; }; nativeBuildInputs = [ cython ]; From 03e3e91dfb277150a281f89992104550b156ce61 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 28 Jan 2024 07:18:15 +0100 Subject: [PATCH 74/83] setools: fix runtime error --- pkgs/os-specific/linux/setools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index c65268f27d50..0819ae91fc87 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { nativeBuildInputs = [ cython ]; buildInputs = [ libsepol ]; - propagatedBuildInputs = [ enum34 libselinux networkx ] + propagatedBuildInputs = [ enum34 libselinux networkx setuptools ] ++ optionals withGraphics [ pyqt5 ]; nativeCheckInputs = [ tox checkpolicy ]; From 026fe77e3f45c5e6daa5e71aeea94417a231d1c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jan 2024 06:29:23 +0000 Subject: [PATCH 75/83] vdr: 2.6.5 -> 2.6.6 --- pkgs/applications/video/vdr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index 2df646d7578a..c5159fdd61f0 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { pname = "vdr"; - version = "2.6.5"; + version = "2.6.6"; src = fetchgit { url = "git://git.tvdr.de/vdr.git"; rev = version; - hash = "sha256-CKgo1Saj6EkSRNoIh16wzGHmToIMADZtjd8VQ+c1nus="; + hash = "sha256-3om/Q67PHtX/aIG4zMCaJTyD9bZNEcyE5LQTeb+zB+M="; }; enableParallelBuilding = true; From 0e601f4a30982b62274ec4409936788bab37aba5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 28 Jan 2024 08:49:11 +0100 Subject: [PATCH 76/83] quark-engine: fix runtime error --- pkgs/tools/security/quark-engine/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/tools/security/quark-engine/default.nix index 9be9dca3a4ca..f89cb35f3029 100644 --- a/pkgs/tools/security/quark-engine/default.nix +++ b/pkgs/tools/security/quark-engine/default.nix @@ -26,7 +26,9 @@ python3.pkgs.buildPythonApplication rec { plotly prettytable prompt-toolkit + r2pipe rzpipe + setuptools tqdm ]; From c087b72460ea02535a8b775c4f5b5afb1c39d0c3 Mon Sep 17 00:00:00 2001 From: pca006132 Date: Thu, 25 Jan 2024 11:08:11 +0800 Subject: [PATCH 77/83] openscad-unstable: init at 2024-01-22 --- pkgs/by-name/op/openscad-unstable/package.nix | 159 ++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 pkgs/by-name/op/openscad-unstable/package.nix diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix new file mode 100644 index 000000000000..582733035d46 --- /dev/null +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -0,0 +1,159 @@ +{ lib +, clangStdenv +, llvmPackages +, fetchFromGitHub +, cmake +, ninja +, pkg-config +, bison +, boost +, cairo +, cgal_5 +, clipper2 +, double-conversion +, eigen +, flex +, fontconfig +, freetype +, glib +, glm +, gmp +, harfbuzz +, hidapi +, lib3mf +, libGL +, libGLU +, libICE +, libSM +, libsForQt5 +, libspnav +, libzip +, mpfr +, python3 +, tbb_2021_8 +, wayland +, wayland-protocols +}: +let + # get cccl from source to avoid license issues + nvidia-cccl = clangStdenv.mkDerivation { + pname = "nvidia-cccl"; + # note that v2.2.0 has some cmake issues + version = "2.2.0-unstable-2024-01-26"; + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "cccl"; + fetchSubmodules = true; + rev = "0c9d03276206a5f59368e908e3d643610f9fddcd"; + hash = "sha256-f11CNfa8jF9VbzvOoX1vT8zGIJL9cZ/VBpiklUn0YdU="; + }; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ tbb_2021_8 ]; + cmakeFlags = [ + # only enable what we need + "-DCCCL_ENABLE_CUB=OFF" + "-DCCCL_ENABLE_LIBCUDACXX=ON" + "-DCCCL_ENABLE_THRUST=ON" + "-DCCCL_ENABLE_TESTING=OFF" + "-DCCCL_ENABLE_EXAMPLES=OFF" + + "-DTHRUST_DEVICE_SYSTEM=TBB" + "-DTHRUST_HOST_SYSTEM=CPP" + "-DTHRUST_ENABLE_HEADER_TESTING=OFF" + "-DTHRUST_ENABLE_TESTING=OFF" + "-DTHRUST_ENABLE_EXAMPLES=OFF" + + "-DLIBCUDACXX_ENABLE_CUDA=OFF" + "-DLIBCUDACXX_ENABLE_STATIC_LIBRARY=OFF" + "-DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=OFF" + ]; + meta = with lib; { + description = "CUDA C++ Core Libraries"; + homepage = "https://github.com/NVIDIA/cccl"; + license = licenses.asl20; + platforms = platforms.unix; + }; + }; +in +# clang consume much less RAM than GCC +clangStdenv.mkDerivation rec { + pname = "openscad-unstable"; + version = "2024-01-22"; + src = fetchFromGitHub { + owner = "openscad"; + repo = "openscad"; + rev = "88d244aed3c40a76194ff537ed84bd65bc0e1aeb"; + hash = "sha256-qkQNbYhmOxF14zm+eCcwe9asLOEciYBANefUb8+KNEI="; + fetchSubmodules = true; + }; + nativeBuildInputs = [ + pkg-config + cmake + ninja + bison + flex + python3 + libsForQt5.qt5.wrapQtAppsHook + llvmPackages.bintools + ]; + buildInputs = with libsForQt5; with qt5; [ + # manifold dependencies + clipper2 + glm + tbb_2021_8 + nvidia-cccl + + boost + cairo + cgal_5 + double-conversion + eigen + fontconfig + freetype + glib + gmp + harfbuzz + hidapi + lib3mf + libspnav + libzip + mpfr + qscintilla + qtbase + qtmultimedia + ] + ++ lib.optionals clangStdenv.isLinux [ libICE libSM libGLU libGL wayland wayland-protocols qtwayland ] + ++ lib.optional clangStdenv.isDarwin qtmacextras + ; + cmakeFlags = [ + "-DEXPERIMENTAL=ON" # enable experimental options + "-DSNAPSHOT=ON" # nightly icons + "-DUSE_BUILTIN_OPENCSG=ON" # bundled latest opencsg + "-DOPENSCAD_VERSION=\"${builtins.replaceStrings ["-"] ["."] version}\"" + "-DCMAKE_UNITY_BUILD=ON" # faster build + "-DENABLE_TESTS=OFF" # tests do not work for now + # IPO + "-DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld" + "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON" + ]; + meta = with lib; { + description = "3D parametric model compiler (unstable)"; + longDescription = '' + OpenSCAD is a software for creating solid 3D CAD objects. It is free + software and available for Linux/UNIX, MS Windows and macOS. + + Unlike most free software for creating 3D models (such as the famous + application Blender) it does not focus on the artistic aspects of 3D + modelling but instead on the CAD aspects. Thus it might be the + application you are looking for when you are planning to create 3D models of + machine parts but pretty sure is not what you are looking for when you are more + interested in creating computer-animated movies. + ''; + homepage = "https://openscad.org/"; + # note that the *binary license* is gpl3 due to CGAL + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ pca006132 raskin ]; + mainProgram = "openscad"; + }; +} From 63c01a35763bc55b1d39665a07dd898e201743b1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 26 Jan 2024 01:39:25 +0100 Subject: [PATCH 78/83] linux_6_7: fix Rust support with current rustc The 1.75 patch can't be fetched, because it doesn't apply. But git can apply it cleanly, so it must just need to do a three-way merge or something. Regardless, we need to include a version that patch(1) can apply in Nixpkgs. --- pkgs/os-specific/linux/kernel/patches.nix | 14 + pkgs/os-specific/linux/kernel/rust-1.75.patch | 373 ++++++++++++++++++ pkgs/top-level/linux-kernels.nix | 2 + 3 files changed, 389 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/rust-1.75.patch diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 5d4ebc214dc7..a7bf7128f5ef 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,4 +65,18 @@ name = "export-rt-sched-migrate"; patch = ./export-rt-sched-migrate.patch; }; + + rust_1_74 = { + name = "rust-1.74.patch"; + patch = fetchpatch { + name = "rust-1.74.patch"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=80fe9e51510b23472ad0f97175556490549ed714"; + hash = "sha256-yGt7PwqN/G+ZtZSt6eARvVFdkC8tnUiu0Fz4cFCyguM="; + }; + }; + + rust_1_75 = { + name = "rust-1.75.patch"; + patch = ./rust-1.75.patch; + }; } diff --git a/pkgs/os-specific/linux/kernel/rust-1.75.patch b/pkgs/os-specific/linux/kernel/rust-1.75.patch new file mode 100644 index 000000000000..9d6b1a3dcc75 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/rust-1.75.patch @@ -0,0 +1,373 @@ +From 77007eef13d52d0a5df9706d47078c4e1390a0a9 Mon Sep 17 00:00:00 2001 +From: Miguel Ojeda +Date: Sun, 24 Dec 2023 18:21:28 +0100 +Subject: [PATCH] rust: upgrade to Rust 1.75.0 + +This is the next upgrade to the Rust toolchain, from 1.74.1 to 1.75.0 +(i.e. the latest) [1]. + +See the upgrade policy [2] and the comments on the first upgrade in +commit 3ed03f4da06e ("rust: upgrade to Rust 1.68.2"). + +# Unstable features + +The `const_maybe_uninit_zeroed` unstable feature [3] was stabilized in +Rust 1.75.0, which we were using in the PHYLIB abstractions. + +The only unstable features allowed to be used outside the `kernel` crate +are still `new_uninit,offset_of`, though other code to be upstreamed +may increase the list. + +Please see [4] for details. + +# Other improvements + +Rust 1.75.0 stabilized `pointer_byte_offsets` [5] which we could +potentially use as an alternative for `ptr_metadata` in the future. + +# Required changes + +For this upgrade, no changes were required (i.e. on our side). + +# `alloc` upgrade and reviewing + +The vast majority of changes are due to our `alloc` fork being upgraded +at once. + +There are two kinds of changes to be aware of: the ones coming from +upstream, which we should follow as closely as possible, and the updates +needed in our added fallible APIs to keep them matching the newer +infallible APIs coming from upstream. + +Instead of taking a look at the diff of this patch, an alternative +approach is reviewing a diff of the changes between upstream `alloc` and +the kernel's. This allows to easily inspect the kernel additions only, +especially to check if the fallible methods we already have still match +the infallible ones in the new version coming from upstream. + +Another approach is reviewing the changes introduced in the additions in +the kernel fork between the two versions. This is useful to spot +potentially unintended changes to our additions. + +To apply these approaches, one may follow steps similar to the following +to generate a pair of patches that show the differences between upstream +Rust and the kernel (for the subset of `alloc` we use) before and after +applying this patch: + + # Get the difference with respect to the old version. + git -C rust checkout $(linux/scripts/min-tool-version.sh rustc) + git -C linux ls-tree -r --name-only HEAD -- rust/alloc | + cut -d/ -f3- | + grep -Fv README.md | + xargs -IPATH cp rust/library/alloc/src/PATH linux/rust/alloc/PATH + git -C linux diff --patch-with-stat --summary -R > old.patch + git -C linux restore rust/alloc + + # Apply this patch. + git -C linux am rust-upgrade.patch + + # Get the difference with respect to the new version. + git -C rust checkout $(linux/scripts/min-tool-version.sh rustc) + git -C linux ls-tree -r --name-only HEAD -- rust/alloc | + cut -d/ -f3- | + grep -Fv README.md | + xargs -IPATH cp rust/library/alloc/src/PATH linux/rust/alloc/PATH + git -C linux diff --patch-with-stat --summary -R > new.patch + git -C linux restore rust/alloc + +Now one may check the `new.patch` to take a look at the additions (first +approach) or at the difference between those two patches (second +approach). For the latter, a side-by-side tool is recommended. + +Link: https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1750-2023-12-28 [1] +Link: https://rust-for-linux.com/rust-version-policy [2] +Link: https://github.com/rust-lang/rust/issues/91850 [3] +Link: https://github.com/Rust-for-Linux/linux/issues/2 [4] +Link: https://github.com/rust-lang/rust/issues/96283 [5] +Signed-off-by: Miguel Ojeda +Link: https://lore.kernel.org/lkml/20231224172128.271447-1-ojeda@kernel.org/ +Signed-off-by: Alyssa Ross +--- + Documentation/process/changes.rst | 2 +- + rust/alloc/alloc.rs | 9 ++++++++- + rust/alloc/boxed.rs | 20 ++++++++++++-------- + rust/alloc/lib.rs | 7 ++++--- + rust/alloc/raw_vec.rs | 19 +++++++++++++++---- + rust/alloc/vec/mod.rs | 16 ++++++++++------ + scripts/min-tool-version.sh | 2 +- + 7 files changed, 51 insertions(+), 24 deletions(-) + +diff --git a/Documentation/process/changes.rst b/Documentation/process/changes.rst +index 169f67773518..52284fdbaf23 100644 +--- a/Documentation/process/changes.rst ++++ b/Documentation/process/changes.rst +@@ -31,7 +31,7 @@ you probably needn't concern yourself with pcmciautils. + ====================== =============== ======================================== + GNU C 5.1 gcc --version + Clang/LLVM (optional) 11.0.0 clang --version +-Rust (optional) 1.74.1 rustc --version ++Rust (optional) 1.75.0 rustc --version + bindgen (optional) 0.65.1 bindgen --version + GNU make 3.82 make --version + bash 4.2 bash --version +diff --git a/rust/alloc/alloc.rs b/rust/alloc/alloc.rs +index 150e13750ff7..8a6be8c98173 100644 +--- a/rust/alloc/alloc.rs ++++ b/rust/alloc/alloc.rs +@@ -379,13 +379,20 @@ const fn ct_error(_: Layout) -> ! { + panic!("allocation failed"); + } + ++ #[inline] + fn rt_error(layout: Layout) -> ! { + unsafe { + __rust_alloc_error_handler(layout.size(), layout.align()); + } + } + +- unsafe { core::intrinsics::const_eval_select((layout,), ct_error, rt_error) } ++ #[cfg(not(feature = "panic_immediate_abort"))] ++ unsafe { ++ core::intrinsics::const_eval_select((layout,), ct_error, rt_error) ++ } ++ ++ #[cfg(feature = "panic_immediate_abort")] ++ ct_error(layout) + } + + // For alloc test `std::alloc::handle_alloc_error` can be used directly. +diff --git a/rust/alloc/boxed.rs b/rust/alloc/boxed.rs +index 9620eba17268..f5f40778a193 100644 +--- a/rust/alloc/boxed.rs ++++ b/rust/alloc/boxed.rs +@@ -161,7 +161,7 @@ + use core::marker::Unsize; + use core::mem::{self, SizedTypeProperties}; + use core::ops::{ +- CoerceUnsized, Deref, DerefMut, DispatchFromDyn, Generator, GeneratorState, Receiver, ++ CoerceUnsized, Coroutine, CoroutineState, Deref, DerefMut, DispatchFromDyn, Receiver, + }; + use core::pin::Pin; + use core::ptr::{self, NonNull, Unique}; +@@ -211,7 +211,7 @@ impl Box { + /// ``` + /// let five = Box::new(5); + /// ``` +- #[cfg(all(not(no_global_oom_handling)))] ++ #[cfg(not(no_global_oom_handling))] + #[inline(always)] + #[stable(feature = "rust1", since = "1.0.0")] + #[must_use] +@@ -2110,28 +2110,28 @@ fn as_mut(&mut self) -> &mut T { + #[stable(feature = "pin", since = "1.33.0")] + impl Unpin for Box where A: 'static {} + +-#[unstable(feature = "generator_trait", issue = "43122")] +-impl + Unpin, R, A: Allocator> Generator for Box ++#[unstable(feature = "coroutine_trait", issue = "43122")] ++impl + Unpin, R, A: Allocator> Coroutine for Box + where + A: 'static, + { + type Yield = G::Yield; + type Return = G::Return; + +- fn resume(mut self: Pin<&mut Self>, arg: R) -> GeneratorState { ++ fn resume(mut self: Pin<&mut Self>, arg: R) -> CoroutineState { + G::resume(Pin::new(&mut *self), arg) + } + } + +-#[unstable(feature = "generator_trait", issue = "43122")] +-impl, R, A: Allocator> Generator for Pin> ++#[unstable(feature = "coroutine_trait", issue = "43122")] ++impl, R, A: Allocator> Coroutine for Pin> + where + A: 'static, + { + type Yield = G::Yield; + type Return = G::Return; + +- fn resume(mut self: Pin<&mut Self>, arg: R) -> GeneratorState { ++ fn resume(mut self: Pin<&mut Self>, arg: R) -> CoroutineState { + G::resume((*self).as_mut(), arg) + } + } +@@ -2448,4 +2448,8 @@ fn cause(&self) -> Option<&dyn core::error::Error> { + fn source(&self) -> Option<&(dyn core::error::Error + 'static)> { + core::error::Error::source(&**self) + } ++ ++ fn provide<'b>(&'b self, request: &mut core::error::Request<'b>) { ++ core::error::Error::provide(&**self, request); ++ } + } +diff --git a/rust/alloc/lib.rs b/rust/alloc/lib.rs +index 9c7ea73da108..345cf5c9cf92 100644 +--- a/rust/alloc/lib.rs ++++ b/rust/alloc/lib.rs +@@ -80,6 +80,8 @@ + not(no_sync), + target_has_atomic = "ptr" + ))] ++#![cfg_attr(not(bootstrap), doc(rust_logo))] ++#![cfg_attr(not(bootstrap), feature(rustdoc_internals))] + #![no_std] + #![needs_allocator] + // Lints: +@@ -115,7 +117,6 @@ + #![feature(const_eval_select)] + #![feature(const_maybe_uninit_as_mut_ptr)] + #![feature(const_maybe_uninit_write)] +-#![feature(const_maybe_uninit_zeroed)] + #![feature(const_pin)] + #![feature(const_refs_to_cell)] + #![feature(const_size_of_val)] +@@ -141,7 +142,7 @@ + #![feature(maybe_uninit_uninit_array)] + #![feature(maybe_uninit_uninit_array_transpose)] + #![feature(pattern)] +-#![feature(pointer_byte_offsets)] ++#![feature(ptr_addr_eq)] + #![feature(ptr_internals)] + #![feature(ptr_metadata)] + #![feature(ptr_sub_ptr)] +@@ -168,7 +169,7 @@ + // + // Language features: + // tidy-alphabetical-start +-#![cfg_attr(not(test), feature(generator_trait))] ++#![cfg_attr(not(test), feature(coroutine_trait))] + #![cfg_attr(test, feature(panic_update_hook))] + #![cfg_attr(test, feature(test))] + #![feature(allocator_internals)] +diff --git a/rust/alloc/raw_vec.rs b/rust/alloc/raw_vec.rs +index a7425582a323..f1b8cec8cc62 100644 +--- a/rust/alloc/raw_vec.rs ++++ b/rust/alloc/raw_vec.rs +@@ -338,10 +338,13 @@ pub fn reserve_for_push(&mut self, len: usize) { + /// The same as `reserve`, but returns on errors instead of panicking or aborting. + pub fn try_reserve(&mut self, len: usize, additional: usize) -> Result<(), TryReserveError> { + if self.needs_to_grow(len, additional) { +- self.grow_amortized(len, additional) +- } else { +- Ok(()) ++ self.grow_amortized(len, additional)?; + } ++ unsafe { ++ // Inform the optimizer that the reservation has succeeded or wasn't needed ++ core::intrinsics::assume(!self.needs_to_grow(len, additional)); ++ } ++ Ok(()) + } + + /// The same as `reserve_for_push`, but returns on errors instead of panicking or aborting. +@@ -378,7 +381,14 @@ pub fn try_reserve_exact( + len: usize, + additional: usize, + ) -> Result<(), TryReserveError> { +- if self.needs_to_grow(len, additional) { self.grow_exact(len, additional) } else { Ok(()) } ++ if self.needs_to_grow(len, additional) { ++ self.grow_exact(len, additional)?; ++ } ++ unsafe { ++ // Inform the optimizer that the reservation has succeeded or wasn't needed ++ core::intrinsics::assume(!self.needs_to_grow(len, additional)); ++ } ++ Ok(()) + } + + /// Shrinks the buffer down to the specified capacity. If the given amount +@@ -569,6 +579,7 @@ fn alloc_guard(alloc_size: usize) -> Result<(), TryReserveError> { + // ensure that the code generation related to these panics is minimal as there's + // only one location which panics rather than a bunch throughout the module. + #[cfg(not(no_global_oom_handling))] ++#[cfg_attr(not(feature = "panic_immediate_abort"), inline(never))] + fn capacity_overflow() -> ! { + panic!("capacity overflow"); + } +diff --git a/rust/alloc/vec/mod.rs b/rust/alloc/vec/mod.rs +index 41ca71805ef0..0d95fd7ef337 100644 +--- a/rust/alloc/vec/mod.rs ++++ b/rust/alloc/vec/mod.rs +@@ -1376,7 +1376,7 @@ pub fn as_mut_slice(&mut self) -> &mut [T] { + /// [`as_mut_ptr`]: Vec::as_mut_ptr + /// [`as_ptr`]: Vec::as_ptr + #[stable(feature = "vec_as_ptr", since = "1.37.0")] +- #[cfg_attr(not(bootstrap), rustc_never_returns_null_ptr)] ++ #[rustc_never_returns_null_ptr] + #[inline] + pub fn as_ptr(&self) -> *const T { + // We shadow the slice method of the same name to avoid going through +@@ -1436,7 +1436,7 @@ pub fn as_ptr(&self) -> *const T { + /// [`as_mut_ptr`]: Vec::as_mut_ptr + /// [`as_ptr`]: Vec::as_ptr + #[stable(feature = "vec_as_ptr", since = "1.37.0")] +- #[cfg_attr(not(bootstrap), rustc_never_returns_null_ptr)] ++ #[rustc_never_returns_null_ptr] + #[inline] + pub fn as_mut_ptr(&mut self) -> *mut T { + // We shadow the slice method of the same name to avoid going through +@@ -1565,7 +1565,8 @@ pub unsafe fn set_len(&mut self, new_len: usize) { + #[stable(feature = "rust1", since = "1.0.0")] + pub fn swap_remove(&mut self, index: usize) -> T { + #[cold] +- #[inline(never)] ++ #[cfg_attr(not(feature = "panic_immediate_abort"), inline(never))] ++ #[track_caller] + fn assert_failed(index: usize, len: usize) -> ! { + panic!("swap_remove index (is {index}) should be < len (is {len})"); + } +@@ -1606,7 +1607,8 @@ fn assert_failed(index: usize, len: usize) -> ! { + #[stable(feature = "rust1", since = "1.0.0")] + pub fn insert(&mut self, index: usize, element: T) { + #[cold] +- #[inline(never)] ++ #[cfg_attr(not(feature = "panic_immediate_abort"), inline(never))] ++ #[track_caller] + fn assert_failed(index: usize, len: usize) -> ! { + panic!("insertion index (is {index}) should be <= len (is {len})"); + } +@@ -1667,7 +1669,7 @@ fn assert_failed(index: usize, len: usize) -> ! { + #[track_caller] + pub fn remove(&mut self, index: usize) -> T { + #[cold] +- #[inline(never)] ++ #[cfg_attr(not(feature = "panic_immediate_abort"), inline(never))] + #[track_caller] + fn assert_failed(index: usize, len: usize) -> ! { + panic!("removal index (is {index}) should be < len (is {len})"); +@@ -2097,6 +2099,7 @@ pub fn pop(&mut self) -> Option { + } else { + unsafe { + self.len -= 1; ++ core::intrinsics::assume(self.len < self.capacity()); + Some(ptr::read(self.as_ptr().add(self.len()))) + } + } +@@ -2299,7 +2302,8 @@ pub fn split_off(&mut self, at: usize) -> Self + A: Clone, + { + #[cold] +- #[inline(never)] ++ #[cfg_attr(not(feature = "panic_immediate_abort"), inline(never))] ++ #[track_caller] + fn assert_failed(at: usize, len: usize) -> ! { + panic!("`at` split index (is {at}) should be <= len (is {len})"); + } +diff --git a/scripts/min-tool-version.sh b/scripts/min-tool-version.sh +index c62066825f53..bcc7d4247290 100755 +--- a/scripts/min-tool-version.sh ++++ b/scripts/min-tool-version.sh +@@ -31,7 +31,7 @@ llvm) + fi + ;; + rustc) +- echo 1.74.1 ++ echo 1.75.0 + ;; + bindgen) + echo 0.65.1 +-- +2.43.0 + diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 9017edd70126..27bf978e7de2 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -190,6 +190,8 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.rust_1_74 + kernelPatches.rust_1_75 ]; }; From d3a232b6596fba9587177df55374dd543114d27a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 27 Jan 2024 19:00:40 +0100 Subject: [PATCH 79/83] linux_testing: fix Rust support with current rustc This won't build at present, because a fix for the rustc wrapper needs to go through staging. --- pkgs/top-level/linux-kernels.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 27bf978e7de2..88eeef3bc9cb 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -203,6 +203,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.rust_1_75 ]; }; latest = packageAliases.linux_latest.kernel; From 9a9ed628da061820b9039a6795cb233f08816c76 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 27 Jan 2024 13:17:11 +0000 Subject: [PATCH 80/83] qemu: add patch for CVE-2023-6693 --- pkgs/applications/virtualization/qemu/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 3debac4c6fb4..acd956e8fe3f 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -140,6 +140,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.com/qemu-project/qemu/-/commit/9d5b42beb6978dc6219d5dc029c9d453c6b8d503.diff"; sha256 = "sha256-NknkH/gFTsMcdq8/ArwM4+qrpU+ZHd+xVMFUuMJTtf0="; }) + (fetchpatch { + name = "CVE-2023-6693.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/2220e8189fb94068dbad333228659fbac819abb0.patch"; + sha256 = "sha256-uoFFFsVZ8XnsI2GD7xsRFNWghWL7/PSYTc1yhXI6nv4="; + }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; From a136def4f7256146b32e3625e53dcdf7464165f9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 28 Jan 2024 11:54:26 +0100 Subject: [PATCH 81/83] compressFirmwareXz: fix symlink type check The previous version didn't work in the case of relative symlinks in subdirectories. If "foo/bar" was a link to "baz", it would check for a link to "baz" in the root, rather than under "foo". We don't need to dereference the symlink ourselves for [ anyway, as it dereferences its arguments itself, so all we need to do to fix this is to pass it the link. Fixes: 14f83d5c6f98 ("compressFirmwareXz: fix links to directories") --- pkgs/build-support/kernel/compress-firmware-xz.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/kernel/compress-firmware-xz.nix b/pkgs/build-support/kernel/compress-firmware-xz.nix index a69b31bb3bd0..437c89afe184 100644 --- a/pkgs/build-support/kernel/compress-firmware-xz.nix +++ b/pkgs/build-support/kernel/compress-firmware-xz.nix @@ -15,7 +15,7 @@ runCommand "${firmware.name}-xz" args '' sh -c 'xz -9c -T1 -C crc32 --lzma2=dict=2MiB "${firmware}/$1" > "$1.xz"' --) (cd ${firmware} && find lib/firmware -type l) | while read link; do target="$(readlink "${firmware}/$link")" - if [ -f $target ]; then + if [ -f "${firmware}/$link" ]; then ln -vs -- "''${target/^${firmware}/$out}.xz" "$out/$link.xz" else ln -vs -- "''${target/^${firmware}/$out}" "$out/$link" From 24bb06069f1b979f3b516ac10c6d43cbac48db34 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 28 Jan 2024 11:56:36 +0100 Subject: [PATCH 82/83] compressFirmwareXz: fail on broken symlinks This would have caught the last two issues we had with compression. --- pkgs/build-support/kernel/compress-firmware-xz.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/build-support/kernel/compress-firmware-xz.nix b/pkgs/build-support/kernel/compress-firmware-xz.nix index 437c89afe184..2c8e84fdae4d 100644 --- a/pkgs/build-support/kernel/compress-firmware-xz.nix +++ b/pkgs/build-support/kernel/compress-firmware-xz.nix @@ -21,4 +21,7 @@ runCommand "${firmware.name}-xz" args '' ln -vs -- "''${target/^${firmware}/$out}" "$out/$link" fi done + + echo "Checking for broken symlinks:" + find -L $out -type l -print -execdir false -- '{}' '+' '' From 59fca7cb6786e2633f97645245da32e5263527f1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 28 Jan 2024 11:57:06 +0100 Subject: [PATCH 83/83] compressFirmwareXz: don't allow references --- pkgs/build-support/kernel/compress-firmware-xz.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/kernel/compress-firmware-xz.nix b/pkgs/build-support/kernel/compress-firmware-xz.nix index 2c8e84fdae4d..cb9ce7a71338 100644 --- a/pkgs/build-support/kernel/compress-firmware-xz.nix +++ b/pkgs/build-support/kernel/compress-firmware-xz.nix @@ -3,7 +3,9 @@ firmware: let - args = lib.optionalAttrs (firmware ? meta) { inherit (firmware) meta; }; + args = { + allowedRequisites = []; + } // lib.optionalAttrs (firmware ? meta) { inherit (firmware) meta; }; in runCommand "${firmware.name}-xz" args ''