rename luispkgs to nixpkgs-for-deal
This commit is contained in:
parent
c0be813a4c
commit
c8e1acac2b
34
flake.lock
34
flake.lock
|
@ -60,22 +60,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"luispkgs": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1699470058,
|
|
||||||
"narHash": "sha256-//c1SEENoNFEDtp8x5lokNxsU9lZjyNkEf5k3OJADTs=",
|
|
||||||
"owner": "Luis-Hebendanz",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "842a157b727ad9712d41a80d1e1564e4e6bbe697",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "Luis-Hebendanz",
|
|
||||||
"ref": "fix_python_deal",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixlib": {
|
"nixlib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1693701915,
|
"lastModified": 1693701915,
|
||||||
|
@ -128,14 +112,30 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-for-deal": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1699470058,
|
||||||
|
"narHash": "sha256-//c1SEENoNFEDtp8x5lokNxsU9lZjyNkEf5k3OJADTs=",
|
||||||
|
"owner": "Luis-Hebendanz",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "842a157b727ad9712d41a80d1e1564e4e6bbe697",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "Luis-Hebendanz",
|
||||||
|
"ref": "fix_python_deal",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"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",
|
||||||
|
"nixpkgs-for-deal": "nixpkgs-for-deal",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
|
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
|
# https://github.com/NixOS/nixpkgs/pull/265872
|
||||||
luispkgs.url = "github:Luis-Hebendanz/nixpkgs/fix_python_deal";
|
nixpkgs-for-deal.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";
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
{
|
{
|
||||||
perSystem = { self', pkgs, system, ... }:
|
perSystem = { self', pkgs, system, ... }:
|
||||||
let
|
let
|
||||||
luisPythonPkgs = inputs.luispkgs.legacyPackages.${system}.python3Packages;
|
|
||||||
flakeLock = lib.importJSON (self + /flake.lock);
|
flakeLock = lib.importJSON (self + /flake.lock);
|
||||||
flakeInputs = (builtins.removeAttrs inputs [ "self" ]);
|
flakeInputs = (builtins.removeAttrs inputs [ "self" ]);
|
||||||
flakeLockVendoredDeps = flakeLock // {
|
flakeLockVendoredDeps = flakeLock // {
|
||||||
|
@ -37,8 +36,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 = luisPythonPkgs.deal;
|
inherit (inputs.nixpkgs-for-deal.legacyPackages.${system}.python3Packages) deal schemathesis;
|
||||||
schemathesis = luisPythonPkgs.schemathesis;
|
|
||||||
clan-core-path = clanCoreWithVendoredDeps;
|
clan-core-path = clanCoreWithVendoredDeps;
|
||||||
};
|
};
|
||||||
inherit (self'.packages.clan-cli) clan-openapi;
|
inherit (self'.packages.clan-cli) clan-openapi;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user