From 54a716824eac59bd3e50f41af8301b1efd5349c0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 23 Jul 2026 22:51:59 -0700 Subject: [PATCH 1/4] pins: update core --- pins.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pins.nix b/pins.nix index 71d3b467d..33559d679 100644 --- a/pins.nix +++ b/pins.nix @@ -1,7 +1,7 @@ { core = builtins.fetchGit { url = "https://github.com/ekala-project/corepkgs.git"; - rev = "7f4e2ddd8922722f92f9f13a7eba3e36d2cc0387"; + rev = "81e84032efee5ab2863aa356fea6a5286547d23b"; }; lib = builtins.fetchGit { From e5938774f590f0e7de4272b42637ce617838b737 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 23 Jul 2026 22:52:11 -0700 Subject: [PATCH 2/4] repos-packages.nix: init --- repos-packages.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 repos-packages.nix diff --git a/repos-packages.nix b/repos-packages.nix new file mode 100644 index 000000000..b4e44747a --- /dev/null +++ b/repos-packages.nix @@ -0,0 +1,10 @@ +let + pins = import ./pins.nix; + lib = import pins.lib; + pythonOverlay = lib.mkAutoCalledPackageDir ./pkgs; + pythonOverrides = import ./python-packages.nix; + pkgs = import pins.core { }; + mkProjection = overlay: pkgs: lib.fix (lib.flip overlay pkgs); + combinedOverlay = lib.composeManyExtensions [ pythonOverlay pythonOverrides ]; +in + mkProjection combinedOverlay pkgs.python3Packages From b8112c231448cbeff1fa561372c61d45d60ea734 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 23 Jul 2026 23:07:11 -0700 Subject: [PATCH 3/4] repos-packages.nix: use intersectAttrs --- pins.nix | 2 +- pkgs-module.nix | 6 +++--- repos-packages.nix | 12 ++++++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pins.nix b/pins.nix index 33559d679..223ca2248 100644 --- a/pins.nix +++ b/pins.nix @@ -6,6 +6,6 @@ lib = builtins.fetchGit { url = "https://github.com/jonringer/nix-lib.git"; - rev = "c19c816e39d14a60dd368d601aa9b389b09d0bbb"; + rev = "2c14377c3f3825e2cd5ebf43858ec4aaac5bffde"; }; } diff --git a/pkgs-module.nix b/pkgs-module.nix index bb5de0751..669a11192 100644 --- a/pkgs-module.nix +++ b/pkgs-module.nix @@ -1,7 +1,7 @@ +{ lib, ... }: + let - pins = import ./pins.nix; - lib = import pins.lib; - pythonOverlay = lib.mkAutoCalledPackageDir ./pkgs; + pythonOverlay = lib.packageSets.mkAutoCalledPackageDir ./pkgs; pythonOverrides = import ./python-packages.nix; pkgsOverlay = import ./top-level.nix; in diff --git a/repos-packages.nix b/repos-packages.nix index b4e44747a..bbba34527 100644 --- a/repos-packages.nix +++ b/repos-packages.nix @@ -1,10 +1,14 @@ +{ ... }: let pins = import ./pins.nix; lib = import pins.lib; - pythonOverlay = lib.mkAutoCalledPackageDir ./pkgs; + pythonOverlay = lib.packageSets.mkAutoCalledPackageDir ./pkgs; pythonOverrides = import ./python-packages.nix; - pkgs = import pins.core { }; - mkProjection = overlay: pkgs: lib.fix (lib.flip overlay pkgs); + pkgs = import pins.core { modules = [ (import ./pkgs-module.nix) ]; }; + mkProjection = overlay: base: lib.fix (self: base // overlay self base); combinedOverlay = lib.composeManyExtensions [ pythonOverlay pythonOverrides ]; + projected = mkProjection combinedOverlay pkgs.python3Packages; + # Only expose attrs defined by the overlay, not the full base set + overlayKeys = lib.composeManyExtensions [ pythonOverlay pythonOverrides ] (_: _: { }) { }; in - mkProjection combinedOverlay pkgs.python3Packages + removeAttrs (builtins.intersectAttrs overlayKeys projected) [ "_internalCallByNamePackageFile" ] From 4209185bdf1264813d99989365acf1a5096dc860 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 23 Jul 2026 23:26:55 -0700 Subject: [PATCH 4/4] Update aenum from 3.1.16 to 3.1.17 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🤖 Generated with ekapkgs-update Co-Authored-By: ekapkgs-update --- pkgs/aenum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/aenum/default.nix b/pkgs/aenum/default.nix index cd28a2799..ec28d47c1 100644 --- a/pkgs/aenum/default.nix +++ b/pkgs/aenum/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "aenum"; - version = "3.1.16"; + version = "3.1.17"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-v6+Vib20GO46mG2FdQxzGNnSg5wbGh1v6PxT7CAc8UA="; + hash = "sha256-qWmkUWsZSJXecsh17ONV8XwNJyFG9/2jRu90+Tz01bo="; }; nativeBuildInputs = [ setuptools ];