Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
K900
2025-09-06 15:19:49 +03:00
3 changed files with 18 additions and 7 deletions
+5 -5
View File
@@ -2,7 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
unstableGitUpdater,
gitUpdater,
nixosTests,
boost,
cmake,
@@ -31,13 +31,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "miracle-wm";
version = "0.6.2-unstable-2025-08-27";
version = "0.7.0";
src = fetchFromGitHub {
owner = "miracle-wm-org";
repo = "miracle-wm";
rev = "0a55a023adf511b042f922aeba666744805be988";
hash = "sha256-yf7knY1tNFeCwePsfTAMAxIma+ZeZUvqpMJe7ABahEw=";
tag = "v${finalAttrs.version}";
hash = "sha256-SAeQ7nFsr37I8XncV3eMT8JCb74CdM+xPrNBX+qf8Bc=";
};
postPatch = ''
@@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
passthru = {
updateScript = unstableGitUpdater { tagPrefix = "v"; };
updateScript = gitUpdater { rev-prefix = "v"; };
providedSessions = [ "miracle-wm" ];
tests.vm = nixosTests.miracle-wm;
};
@@ -32,6 +32,8 @@
buildPythonPackage rec {
pname = "ansible-core";
# IMPORTANT: When bumping the minor version (2.XX.0 - the XX), please update pinned package in pkgs/top-level/all-packages.nix
# There are pinned packages called ansible_2_XX, create a new one with the previous minor version and then update the version here
version = "2.19.1";
pyproject = true;
+11 -2
View File
@@ -6368,8 +6368,17 @@ with pkgs;
anybadge = with python3Packages; toPythonApplication anybadge;
ansible = ansible_2_18;
ansible_2_18 = python3Packages.toPythonApplication python3Packages.ansible-core;
ansible = ansible_2_19;
ansible_2_19 = python3Packages.toPythonApplication python3Packages.ansible-core;
ansible_2_18 = python3Packages.toPythonApplication (
python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
version = "2.18.8";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-sHZiFalqR845kz0n4emWyivrVM8bOQfHQtNckTsfeM0=";
};
})
);
ansible_2_17 = python3Packages.toPythonApplication (
python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
version = "2.17.8";