Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pins.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
core = builtins.fetchGit {
url = "https://github.com/ekala-project/corepkgs.git";
rev = "7f4e2ddd8922722f92f9f13a7eba3e36d2cc0387";
rev = "81e84032efee5ab2863aa356fea6a5286547d23b";
};

lib = builtins.fetchGit {
url = "https://github.com/jonringer/nix-lib.git";
rev = "c19c816e39d14a60dd368d601aa9b389b09d0bbb";
rev = "2c14377c3f3825e2cd5ebf43858ec4aaac5bffde";
};
}
6 changes: 3 additions & 3 deletions pkgs-module.nix
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkgs/dbutils/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

buildPythonPackage rec {
pname = "dbutils";
version = "3.1.1";
version = "3.1.2";
pyproject = true;

src = fetchPypi {
inherit pname version;
hash = "sha256-reefvFeG10ltQThyL7yiQ0DPfHO11m3wUpb2Vv8Ia78=";
hash = "sha256-FgtXiBVPGt7dxhCA2v8VMLTfK6DUWvHDv7rHbbJBhrM=";
};

build-system = [ setuptools ];
Expand Down
14 changes: 14 additions & 0 deletions repos-packages.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{ ... }:
let
pins = import ./pins.nix;
lib = import pins.lib;
pythonOverlay = lib.packageSets.mkAutoCalledPackageDir ./pkgs;
pythonOverrides = import ./python-packages.nix;
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
removeAttrs (builtins.intersectAttrs overlayKeys projected) [ "_internalCallByNamePackageFile" ]