Flake: Added python package deal as dependency

This commit is contained in:
Luis Hebendanz 2023-11-06 17:35:09 +01:00
parent 766a5a2ae7
commit 9cb46bf1cd
4 changed files with 24 additions and 1 deletions

View File

@ -60,6 +60,22 @@
"type": "github" "type": "github"
} }
}, },
"luispkgs": {
"locked": {
"lastModified": 1699286483,
"narHash": "sha256-gzY56MbP3UTztI7Ra69RCNq81fKlsQu79LZ2gGss3Eg=",
"owner": "Luis-Hebendanz",
"repo": "nixpkgs",
"rev": "b59438a5a3b4d50e117081d41ed6f8833f65934d",
"type": "github"
},
"original": {
"owner": "Luis-Hebendanz",
"ref": "fix_python_deal",
"repo": "nixpkgs",
"type": "github"
}
},
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1693701915, "lastModified": 1693701915,
@ -117,6 +133,7 @@
"disko": "disko", "disko": "disko",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"floco": "floco", "floco": "floco",
"luispkgs": "luispkgs",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",

View File

@ -6,6 +6,9 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
#nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
# https://github.com/NixOS/nixpkgs/pull/265872
luispkgs.url = "github:Luis-Hebendanz/nixpkgs/fix_python_deal";
floco.url = "github:aakropotkin/floco"; floco.url = "github:aakropotkin/floco";
floco.inputs.nixpkgs.follows = "nixpkgs"; floco.inputs.nixpkgs.follows = "nixpkgs";
disko.url = "github:nix-community/disko"; disko.url = "github:nix-community/disko";

View File

@ -35,6 +35,7 @@
, e2fsprogs , e2fsprogs
, mypy , mypy
, cntr , cntr
, deal
}: }:
let let
@ -56,6 +57,7 @@ let
git git
gnupg gnupg
stdenv.cc stdenv.cc
deal
]; ];
# Optional dependencies for clan cli, we re-expose them here to make sure they all build. # Optional dependencies for clan cli, we re-expose them here to make sure they all build.

View File

@ -1,6 +1,6 @@
{ inputs, ... }: { inputs, ... }:
{ {
perSystem = { self', pkgs, ... }: { perSystem = { self', pkgs, system, ... }: {
devShells.clan-cli = pkgs.callPackage ./shell.nix { devShells.clan-cli = pkgs.callPackage ./shell.nix {
inherit (self'.packages) clan-cli ui-assets nix-unit; inherit (self'.packages) clan-cli ui-assets nix-unit;
}; };
@ -8,6 +8,7 @@
clan-cli = pkgs.python3.pkgs.callPackage ./default.nix { clan-cli = pkgs.python3.pkgs.callPackage ./default.nix {
inherit (self'.packages) ui-assets; inherit (self'.packages) ui-assets;
inherit (inputs) nixpkgs; inherit (inputs) nixpkgs;
deal = inputs.luispkgs.legacyPackages.${system}.python3Packages.deal;
}; };
inherit (self'.packages.clan-cli) clan-openapi; inherit (self'.packages.clan-cli) clan-openapi;
default = self'.packages.clan-cli; default = self'.packages.clan-cli;