From df2adb97c31d5aa1cf9eed69f2f662a8949a7b87 Mon Sep 17 00:00:00 2001 From: Alexander Nikolaev Date: Fri, 31 Jan 2025 11:41:13 +0200 Subject: [PATCH 1/2] Bump nixpkgs to 24.11 release Signed-off-by: Alexander Nikolaev --- flake.lock | 10 +++++----- flake.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0326b7a4..652f1658 100644 --- a/flake.lock +++ b/flake.lock @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702233072, - "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=", + "lastModified": 1738163270, + "narHash": "sha256-B/7Y1v4y+msFFBW1JAdFjNvVthvNdJKiN6EGRPnqfno=", "owner": "nixos", "repo": "nixpkgs", - "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348", + "rev": "59e618d90c065f55ae48446f307e8c09565d5ab0", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -58,4 +58,4 @@ }, "root": "root", "version": 7 -} \ No newline at end of file +} diff --git a/flake.nix b/flake.nix index fee447a1..ea7f1c7d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "A flake for for running Robot Framework tests"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; flake-utils.url = "github:numtide/flake-utils"; }; From 400fe66af941ed21f70052f8fe84ffbf48818724 Mon Sep 17 00:00:00 2001 From: Alexander Nikolaev Date: Fri, 31 Jan 2025 11:42:12 +0200 Subject: [PATCH 2/2] Fix missing source for asyncclick by upgrading it Signed-off-by: Alexander Nikolaev --- flake.nix | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index ea7f1c7d..e8420aa8 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,31 @@ ]; in flake-utils.lib.eachSystem systems (system: let - pkgs = nixpkgs.legacyPackages.${system}; + pkgs = nixpkgs.legacyPackages.${system}.appendOverlays [ + (self: super: { + python3 = let + python = let + packageOverrides = pyself: pysuper: { + asyncclick = pysuper.asyncclick.overridePythonAttrs (old: { + version = "8.1.8.0-async"; + src = self.fetchFromGitHub { + owner = "python-trio"; + repo = "asyncclick"; + rev = "995a2ff3e31826c87cc419fa26e5c019bd115927"; # Matching $version tag, I used commit hash instead tag, because they tends to delete tags (avnik) + sha256 = "sha256-J294pYuNOSm7v2BbwDpzn3uelAnZ3ip2U1gWuchhOtA="; + }; + nativeBuildInputs = with pysuper; [flit-core] ++ (old.nativeBuildInputs or []); + }); + }; + in + super.python3.override { + inherit packageOverrides; + self = python; + }; + in + python; + }) + ]; in { packages = rec { ghaf-robot = pkgs.callPackage ./pkgs/ghaf-robot {