bit/PyDataStorage
1
0
Fork 0
Code Issues Pull Requests Actions Activity

make nix overlay and remove nixpkgs dependency

Browse Source
This commit is contained in:
bit 2025-06-30 20:52:55 +02:00
parent 460f603510
commit af3ced34e9
2 changed files with 29 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
flake.lock generated
View File

@ -1,33 +1,12 @@
{ {
"nodes": { "nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1730785428,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"pydantic-uuid-model": { "pydantic-uuid-model": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1731232726, "lastModified": 1751309415,
"narHash": "sha256-j2kkXkw6KKfGAu7Qd879pWDNupL7ShyininLCupOGFY=", "narHash": "sha256-qKSRotFL6KmztfFiGMP5NTuQh1WXgnJEAgvSeywf5cc=",
"ref": "refs/heads/master", "ref": "refs/heads/main",
"rev": "68803636acdba905d64d34d8986d5f99f07b6d7a", "rev": "746afe85fe0bab5c16c81a321d9c77a34d7b0132",
"revCount": 2, "revCount": 3,
"type": "git", "type": "git",
"url": "https://git.chaosbit.de/bit/pydanticuuidmodel" "url": "https://git.chaosbit.de/bit/pydanticuuidmodel"
}, },
@ -38,7 +17,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs",
"pydantic-uuid-model": "pydantic-uuid-model" "pydantic-uuid-model": "pydantic-uuid-model"
} }
} }

61
flake.nix
View File

@ -1,55 +1,42 @@
{ {
description = "A python data storage backend library"; description = "A python data storage backend library";
inputs = { inputs.pydantic-uuid-model.url = "git+https://git.chaosbit.de/bit/pydanticuuidmodel";
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
pydantic-uuid-model = { outputs = { self, pydantic-uuid-model }: let
url = "git+https://git.chaosbit.de/bit/pydanticuuidmodel";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, pydantic-uuid-model }: let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { inherit system; };
packageName = "pydatastorage"; packageName = "pydatastorage";
version = "0.1.0"; version = "0.1.0";
in { in {
packages."${system}" = { overlays = let
"${packageName}" = pkgs.python3Packages.callPackage ./default.nix { composeExtensions = (
inherit packageName version; f: g: final: prev:
inherit (pydantic-uuid-model.packages."${system}") pydantic-uuid-model; let
}; fApplied = f final prev;
prev' = prev // fApplied;
default = self.packages."${system}"."${packageName}"; in
fApplied // g final prev');
overlay = (final: prev: { in {
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ default = composeExtensions pydantic-uuid-model.overlays.default self.overlays.pydatastorage;
pydatastorage = (pkgs-final: pkgs-prev: {
pythonPackagesExtensions = pkgs-prev.pythonPackagesExtensions ++ [
(final: prev: { (final: prev: {
"${packageName}" = self.packages."${system}".default; "${packageName}" = pkgs-prev.python3Packages.callPackage ./default.nix {
inherit packageName version;
};
}) })
]; ];
}); });
inherit (pydantic-uuid-model.packages."${system}") dependencies;
}; };
devShell."${system}" = let #devShell."${system}" = let
pkgs = import nixpkgs { # pkgs = import nixpkgs {
inherit system; # inherit system;
overlays = [ self.packages."${system}".overlay ]; # overlays = [ self.overlays.default ];
}; # };
# packages = [ (pkgs.python3.withPackages (ps: [ ps."${packageName}" ])) ];
customPython = with pkgs; (pkgs.python3.withPackages (ps: [ #in pkgs.mkShell { inherit packages; };
ps."${packageName}"
]));
packages = [ customPython ] ++ self.packages."${system}".dependencies;
in pkgs.mkShell {
inherit packages;
};
}; };
} }