From 4c53299bc3b8706b36b8660b67d7b2811b417a1a Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sun, 11 Aug 2024 20:18:55 -0400 Subject: [PATCH 01/19] rmpc: 0.2.1 -> 0.4.0 --- pkgs/by-name/rm/rmpc/Cargo.lock.patch | 28 --------------------------- pkgs/by-name/rm/rmpc/package.nix | 24 +++++------------------ 2 files changed, 5 insertions(+), 47 deletions(-) delete mode 100644 pkgs/by-name/rm/rmpc/Cargo.lock.patch diff --git a/pkgs/by-name/rm/rmpc/Cargo.lock.patch b/pkgs/by-name/rm/rmpc/Cargo.lock.patch deleted file mode 100644 index 404baea3e165..000000000000 --- a/pkgs/by-name/rm/rmpc/Cargo.lock.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index e4e2d1a..72839b4 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -198,9 +198,9 @@ dependencies = [ - - [[package]] - name = "bitstream-io" --version = "2.5.0" -+version = "2.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499" -+checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" - - [[package]] - name = "built" -@@ -1376,9 +1376,9 @@ dependencies = [ - - [[package]] - name = "ravif" --version = "0.11.8" -+version = "0.11.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c6ba61c28ba24c0cf8406e025cb29a742637e3f70776e61c27a8a8b72a042d12" -+checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" - dependencies = [ - "avif-serialize", - "imgref", diff --git a/pkgs/by-name/rm/rmpc/package.nix b/pkgs/by-name/rm/rmpc/package.nix index 4ac072cb81c7..c2589c50fd4b 100644 --- a/pkgs/by-name/rm/rmpc/package.nix +++ b/pkgs/by-name/rm/rmpc/package.nix @@ -2,44 +2,30 @@ lib, rustPlatform, fetchFromGitHub, - fetchpatch, pkg-config, cmake, }: rustPlatform.buildRustPackage rec { pname = "rmpc"; - version = "0.2.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "mierak"; repo = "rmpc"; rev = "v${version}"; - hash = "sha256-g+yzW0DfaBhJKTikYZ8eqe4pX8nJvbpJ1xaZ3W/O/bo="; + hash = "sha256-eWscMWOjTGmFCNGwf/6lMU0JbULC7/AFCPbznGQYRQI="; }; - cargoHash = "sha256-wFrHgB4wYGeXvfdGf4SJAAL8fE6dAKDLL51Ohmn+1HQ="; - - cargoPatches = [ - # Patch Cargo.lock to make rmpc compile with older versions of rustc - # Remove when Rust 1.79.0 is in master - ./Cargo.lock.patch - ]; - - patches = [ - # Fix release mode tests compilation issues - # Remove when next rmpc version comes out - (fetchpatch { - url = "https://github.com/mierak/rmpc/commit/f12be6f606f5319523f41576e7c463b6008b9069.patch"; - hash = "sha256-4L/MrdC/ydTqnkt3qd5H8hLZimiqct6sOkEq8rJN0F4="; - }) - ]; + cargoHash = "sha256-PieGA8/C7d8Q5rdu7oRdVuCLNhwGp5LZYz/rM4agqng="; nativeBuildInputs = [ pkg-config cmake ]; + env.VERGEN_GIT_DESCRIBE = version; + meta = { changelog = "https://github.com/mierak/rmpc/releases/tag/${src.rev}"; description = "TUI music player client for MPD with album art support via kitty image protocol"; From 0af00aa52d95183014ccaff619fa06eeb9601f83 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sun, 11 Aug 2024 20:19:16 -0400 Subject: [PATCH 02/19] rmpc: install man pages and shell completions --- pkgs/by-name/rm/rmpc/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/rm/rmpc/package.nix b/pkgs/by-name/rm/rmpc/package.nix index c2589c50fd4b..0ef3703801d3 100644 --- a/pkgs/by-name/rm/rmpc/package.nix +++ b/pkgs/by-name/rm/rmpc/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchFromGitHub, + installShellFiles, pkg-config, cmake, }: @@ -20,12 +21,22 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-PieGA8/C7d8Q5rdu7oRdVuCLNhwGp5LZYz/rM4agqng="; nativeBuildInputs = [ + installShellFiles pkg-config cmake ]; env.VERGEN_GIT_DESCRIBE = version; + postInstall = '' + installManPage target/man/rmpc.1 + + installShellCompletion --cmd rmpc \ + --bash target/completions/rmpc.bash \ + --fish target/completions/rmpc.fish \ + --zsh target/completions/_rmpc + ''; + meta = { changelog = "https://github.com/mierak/rmpc/releases/tag/${src.rev}"; description = "TUI music player client for MPD with album art support via kitty image protocol"; From 8e4df946ebc307f8fc3e5897ffe8354dceff2610 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Aug 2024 01:25:54 +0000 Subject: [PATCH 03/19] python312Packages.graphrag: 0.3.1 -> 0.3.2 --- pkgs/development/python-modules/graphrag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graphrag/default.nix b/pkgs/development/python-modules/graphrag/default.nix index 487ed13ca83f..efd595a42efd 100644 --- a/pkgs/development/python-modules/graphrag/default.nix +++ b/pkgs/development/python-modules/graphrag/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "graphrag"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "graphrag"; rev = "refs/tags/v${version}"; - hash = "sha256-97X9a3ietWDc5UgdgQ2ZSc7DPDEi96LxfO5aVZMNOfg="; + hash = "sha256-tfncCFQTeGpTBns+Gt/O7JnFVF5OcpWOwplD0hLWVvc="; }; build-system = [ From a9f3349fe63c276d2870684068d74c1f59d57f11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Aug 2024 02:17:10 +0000 Subject: [PATCH 04/19] python312Packages.notebook: 7.2.1 -> 7.2.2 --- pkgs/development/python-modules/notebook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 7718611df06c..9e796f6bf537 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "notebook"; - version = "7.2.1"; + version = "7.2.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Qoe22ll0CzIXPQHWQfdj0pL0nDDnpRuJxGuoRzEmNB4="; + hash = "sha256-LvB9QiBCFiOtP+iBGNaHvARQBVVwzdFggUpZzzocUW4="; }; postPatch = '' From bf364e5b5203017d0bdcff52be10b72bbbc02a6e Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Thu, 29 Aug 2024 11:09:39 -0700 Subject: [PATCH 05/19] python312Packages.openai: 1.42.0 -> 1.43.0 Diff: https://github.com/openai/openai-python/compare/refs/tags/v1.42.0...v1.43.0 Changelog: https://github.com/openai/openai-python/releases/tag/v1.43.0 --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 9c6b66fdd20d..9ac534aea72b 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.42.0"; + version = "1.43.0"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Pj4MmylUB6JGTlueOgtAd9RgOxn3QoPe2Xf1hYnOZ9c="; + hash = "sha256-cB+ToAFWRy5oaHVHYdmTcr0MRddg+xvZQglheX2hCdE="; }; build-system = [ From 8f08255905ffe78438a19ccd5df8626c42761a38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Aug 2024 16:38:51 +0000 Subject: [PATCH 06/19] python312Packages.pycrdt-websocket: 0.14.1 -> 0.14.2 --- .../pycrdt-websocket/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pycrdt-websocket/default.nix b/pkgs/development/python-modules/pycrdt-websocket/default.nix index 9f69727808a1..3d7d3d45a19e 100644 --- a/pkgs/development/python-modules/pycrdt-websocket/default.nix +++ b/pkgs/development/python-modules/pycrdt-websocket/default.nix @@ -1,17 +1,25 @@ { lib, buildPythonPackage, - fetchFromGitHub, pythonOlder, + fetchFromGitHub, + + # build-system hatchling, + + # dependencies anyio, + pycrdt, + sqlite-anyio, + + # optional-dependencies channels, + + # tests httpx-ws, hypercorn, - pycrdt, pytest-asyncio, pytestCheckHook, - sqlite-anyio, trio, uvicorn, websockets, @@ -19,7 +27,7 @@ buildPythonPackage rec { pname = "pycrdt-websocket"; - version = "0.14.1"; + version = "0.14.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +36,7 @@ buildPythonPackage rec { owner = "jupyter-server"; repo = "pycrdt-websocket"; rev = "refs/tags/v${version}"; - hash = "sha256-lQ8ZYzFKdVvIEp38WztOWFpJhi4LtA8ODpAFgSZVpU8="; + hash = "sha256-YsAeEUFxCwu7KA2d83J/rb1IlZTQZZecHJAewh+TqWs="; }; build-system = [ hatchling ]; @@ -62,11 +70,11 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "WebSocket Connector for pycrdt"; homepage = "https://github.com/jupyter-server/pycrdt-websocket"; changelog = "https://github.com/jupyter-server/pycrdt-websocket/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = teams.jupyter.members; + license = lib.licenses.mit; + maintainers = lib.teams.jupyter.members; }; } From ebc238913402b1a3e3964beb7415486d077468f2 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 29 Aug 2024 22:43:47 -0400 Subject: [PATCH 07/19] treewide: remove `refs/tags/` from github release `meta.changelog` urls diff of `jq Date: Fri, 30 Aug 2024 02:46:52 +0000 Subject: [PATCH 08/19] python312Packages.rns: 0.7.5 -> 0.7.6 --- pkgs/development/python-modules/rns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index bc7f88d5dc59..59812728f119 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.7.5"; + version = "0.7.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-TWaDRJQ695kjoKjWQeAO+uxSZGgQiHoWYIsS+XnYVOQ="; + hash = "sha256-YSaabiCsSoG3BZ/0gM/fRIKQKdQ9MRtlHe+tPnzFJSw="; }; build-system = [ setuptools ]; From c64adeba858d10465343cf973a2228770b814bc0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Aug 2024 14:26:40 +0000 Subject: [PATCH 09/19] python312Packages.mkdocs: 1.6.0 -> 1.6.1 --- pkgs/development/python-modules/mkdocs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index fc3b7fd4d8a9..654991775885 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "mkdocs"; - version = "1.6.0"; + version = "1.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tpDKomHFoGYPLz7rcohkU9w7G/5+YkJ5Y6wJJRyMecI="; + hash = "sha256-JQSOgV12iYE6FubxdoJpWy9EHKFxyKoxrm/7arCn9Ak="; }; build-system = [ hatchling ]; From 15b7a76c427a9fd5787da96f5728fb98e5449236 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Aug 2024 04:52:27 +0000 Subject: [PATCH 10/19] python312Packages.libmambapy: 2024.03.25 -> 2024.08.31 --- pkgs/development/python-modules/libmambapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libmambapy/default.nix b/pkgs/development/python-modules/libmambapy/default.nix index 5f5725a6a8ce..37ed199cd8a9 100644 --- a/pkgs/development/python-modules/libmambapy/default.nix +++ b/pkgs/development/python-modules/libmambapy/default.nix @@ -22,14 +22,14 @@ }: buildPythonPackage rec { pname = "libmambapy"; - version = "2024.03.25"; + version = "2024.08.31"; pyproject = true; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = "refs/tags/${version}"; - hash = "sha256-sxZDlMFoMLq2EAzwBVO++xvU1C30JoIoZXEX/sqkXS0="; + hash = "sha256-RRHu0JM1okFprNIrQLLIYN7xZdZ+A6OuCZM5E1oPoFg="; }; nativeBuildInputs = [ From 457cd6b5e732bbeb9ee28621e829385eb7508af1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Aug 2024 05:00:58 +0000 Subject: [PATCH 11/19] python312Packages.ihm: 1.3 -> 1.4 --- pkgs/development/python-modules/ihm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix index ff87abcfa20a..fe73c3ece177 100644 --- a/pkgs/development/python-modules/ihm/default.nix +++ b/pkgs/development/python-modules/ihm/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ihm"; - version = "1.3"; + version = "1.4"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-ihm"; rev = "refs/tags/${version}"; - hash = "sha256-ywZdhumFFeImODeFn8VYD0CR1DZMlAg52wMNRjEItec="; + hash = "sha256-Ls0o/PkJlHt9kx0IvR2Tpwo2QgXxug+Y+LVziTXXDpY="; }; nativeBuildInputs = [ From 4fb3297389c0c8d036dcef4f6af47b94d652eda3 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sat, 31 Aug 2024 08:40:57 -0400 Subject: [PATCH 12/19] rmpc: set meta.platforms to linux --- pkgs/by-name/rm/rmpc/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/rm/rmpc/package.nix b/pkgs/by-name/rm/rmpc/package.nix index 0ef3703801d3..6efe7b07a43a 100644 --- a/pkgs/by-name/rm/rmpc/package.nix +++ b/pkgs/by-name/rm/rmpc/package.nix @@ -50,5 +50,6 @@ rustPlatform.buildRustPackage rec { ''; maintainers = with lib.maintainers; [ donovanglover ]; mainProgram = "rmpc"; + platforms = lib.platforms.linux; }; } From 4ce2599a98eeacf582b7c055c3101a4537e03d4c Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sat, 31 Aug 2024 21:26:17 +0200 Subject: [PATCH 13/19] acpica-tools: Move package definition into by-name directory Signed-off-by: Felix Singer --- .../default.nix => by-name/ac/acpica-tools/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/system/acpica-tools/default.nix => by-name/ac/acpica-tools/package.nix} (100%) diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/by-name/ac/acpica-tools/package.nix similarity index 100% rename from pkgs/tools/system/acpica-tools/default.nix rename to pkgs/by-name/ac/acpica-tools/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b005d902b096..1352af0af5c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1484,8 +1484,6 @@ with pkgs; alsaequal = callPackage ../tools/audio/alsaequal { }; - acpica-tools = callPackage ../tools/system/acpica-tools { }; - amdgpu_top = callPackage ../tools/system/amdgpu_top { }; acquire = with python3Packages; toPythonApplication acquire; From 81c8a86e2a862c75df322987e77096762111ba1d Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sat, 31 Aug 2024 21:27:07 +0200 Subject: [PATCH 14/19] acpica-tools: Add Felix Singer as maintainer Signed-off-by: Felix Singer --- pkgs/by-name/ac/acpica-tools/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ac/acpica-tools/package.nix b/pkgs/by-name/ac/acpica-tools/package.nix index a6df3468cd8c..b11e95be6edc 100644 --- a/pkgs/by-name/ac/acpica-tools/package.nix +++ b/pkgs/by-name/ac/acpica-tools/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { homepage = "https://www.acpica.org/"; description = "ACPICA Tools"; license = with licenses; [ iasl gpl2Only bsd3 ]; - maintainers = with maintainers; [ tadfisher ]; + maintainers = with maintainers; [ tadfisher felixsinger ]; platforms = platforms.linux ++ platforms.darwin; }; } From 3e1ad65c9845929d755e60d1c0b9503e4e96dce2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Aug 2024 19:55:50 +0000 Subject: [PATCH 15/19] colloid-icon-theme: 2024-02-28 -> 2024-08-31 --- pkgs/data/icons/colloid-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/colloid-icon-theme/default.nix b/pkgs/data/icons/colloid-icon-theme/default.nix index 17debd4132a4..4fbfeb0fcc39 100644 --- a/pkgs/data/icons/colloid-icon-theme/default.nix +++ b/pkgs/data/icons/colloid-icon-theme/default.nix @@ -18,13 +18,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red" stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-02-28"; + version = "2024-08-31"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-bTN6x3t88yBL4WsPfOJIiNGWTywdIVi7E2VJKgMzEso="; + hash = "sha256-/eUlc+fnmQZ61qE/JWZDiR0mMPntLOec0nmevJa7lrc="; }; nativeBuildInputs = [ From 506d9f0416f06fb6afe265f6d260a86dbcaf7cc7 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Sun, 1 Sep 2024 00:15:26 +0300 Subject: [PATCH 16/19] nixos/tests/plotinus: fix build - change tested app from gnome-calculator to gnome-pomodoro as plotinus only works on gtk3 apps - change screenshot result to one that shows popup from plotinus instead of preferences window - add 2 minute timeouts waiting for windows - add 10 minute timeout for full test --- nixos/tests/plotinus.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/nixos/tests/plotinus.nix b/nixos/tests/plotinus.nix index 5c52abf9c720..2bb2b705eb7e 100644 --- a/nixos/tests/plotinus.nix +++ b/nixos/tests/plotinus.nix @@ -2,6 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "plotinus"; meta = { maintainers = pkgs.plotinus.meta.maintainers; + timeout = 600; }; nodes.machine = @@ -9,20 +10,23 @@ import ./make-test-python.nix ({ pkgs, ... }: { { imports = [ ./common/x11.nix ]; programs.plotinus.enable = true; - environment.systemPackages = [ pkgs.gnome-calculator pkgs.xdotool ]; + environment.systemPackages = [ + pkgs.gnome-pomodoro + pkgs.xdotool + ]; }; testScript = '' machine.wait_for_x() - machine.succeed("gnome-calculator >&2 &") - machine.wait_for_window("gnome-calculator") + machine.succeed("gnome-pomodoro >&2 &") + machine.wait_for_window("Pomodoro", timeout=120) machine.succeed( - "xdotool search --sync --onlyvisible --class gnome-calculator " + "xdotool search --sync --onlyvisible --class gnome-pomodoro " + "windowfocus --sync key --clearmodifiers --delay 1 'ctrl+shift+p'" ) machine.sleep(5) # wait for the popup + machine.screenshot("popup") machine.succeed("xdotool key --delay 100 p r e f e r e n c e s Return") - machine.wait_for_window("Preferences") - machine.screenshot("screen") + machine.wait_for_window("Preferences", timeout=120) ''; }) From d6de00150e2669c0938767f3e7b5fd3b4f44574a Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 24 Jun 2024 21:02:39 +0000 Subject: [PATCH 17/19] doc/languages-frameworks/python: fix typos --- doc/languages-frameworks/python.section.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 8992d36fb25b..4c8d72c17e5e 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -214,9 +214,6 @@ because their behaviour is different: paths included in this list. Items listed in `install_requires` go here. * `optional-dependencies ? { }`: Optional feature flagged dependencies. Items listed in `extras_requires` go here. -Aside from propagating dependencies, - `buildPythonPackage` also injects code into and wraps executables with the - paths included in this list. Items listed in `extras_requires` go here. ##### Overriding Python packages {#overriding-python-packages} @@ -2033,8 +2030,8 @@ no maintainer, so maintenance falls back to the package set maintainers. ### Updating packages in bulk {#python-package-bulk-updates} -There is a tool to update alot of python libraries in bulk, it exists at -`maintainers/scripts/update-python-libraries` with this repository. +A tool to bulk-update numerous Python libraries is available in the +repository at `maintainers/scripts/update-python-libraries`. It can quickly update minor or major versions for all packages selected and create update commits, and supports the `fetchPypi`, `fetchurl` and From 4276cd74750bd4e0be987f7e7aa9e54191476395 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Sep 2024 01:00:15 +0000 Subject: [PATCH 18/19] flashmq: 1.17.0 -> 1.17.1 --- pkgs/by-name/fl/flashmq/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flashmq/package.nix b/pkgs/by-name/fl/flashmq/package.nix index 35bc3f18ca56..d282c2f02483 100644 --- a/pkgs/by-name/fl/flashmq/package.nix +++ b/pkgs/by-name/fl/flashmq/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flashmq"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "halfgaar"; repo = "FlashMQ"; rev = "v${version}"; - hash = "sha256-HcpNPkG1gd5Gb5z//DrU8Rxf+dZWKMwHtj62k4N1S3U="; + hash = "sha256-T9ecw+UHe/DM8TSDda140lxG3oaf/wf+TEySOz6tboA="; }; nativeBuildInputs = [ cmake installShellFiles ]; From d786b908176a2489a3c0446a4dd61ff81505d7fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Sep 2024 02:39:13 +0000 Subject: [PATCH 19/19] systemfd: 0.4.2 -> 0.4.3 --- pkgs/development/tools/systemfd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/systemfd/default.nix b/pkgs/development/tools/systemfd/default.nix index c6a784f98d5b..f0e23b0ced47 100644 --- a/pkgs/development/tools/systemfd/default.nix +++ b/pkgs/development/tools/systemfd/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.4.2"; + version = "0.4.3"; in rustPlatform.buildRustPackage { @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage { repo = "systemfd"; owner = "mitsuhiko"; rev = version; - sha256 = "sha256-MASpQJkqmKpHZzMxHqAsuVO50dHHTv74Rnbv1gLapTU="; + sha256 = "sha256-Ypt9/dqDrurhiEhahVk8gG3QxP2ZKTeL7F0IVUGE8Kw="; }; - cargoHash = "sha256-zgRbaZchdqzr+E6gqltSte9dGMnjbrM7/7t0BiNn4kA="; + cargoHash = "sha256-1t+yYqPDMEI39kieGkm+EUVzDBsTlDWQ7iGyjepjc7s="; meta = { description = "Convenient helper for passing sockets into another process";