use pixi as package instead of overlay

This commit is contained in:
Daylin Morgan 2024-05-23 12:45:16 -05:00
parent ac339c6987
commit fe4730b82c
Signed by: daylin
GPG key ID: 950D13E9719334AD
5 changed files with 21 additions and 5 deletions

View file

@ -625,11 +625,25 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": {
"locked": {
"lastModified": 1716330097,
"narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"pixi": { "pixi": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs_8",
"nixpkgs"
],
"pixi-source": "pixi-source" "pixi-source": "pixi-source"
}, },
"locked": { "locked": {

View file

@ -35,7 +35,6 @@
f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake"; f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake";
pixi.url = "github:daylinmorgan/pixi-flake"; pixi.url = "github:daylinmorgan/pixi-flake";
pixi.inputs.nixpkgs.follows = "nixpkgs";
}; };
nixConfig = { nixConfig = {

View file

@ -1,4 +1,5 @@
{ {
inputs,
config, config,
lib, lib,
pkgs, pkgs,
@ -13,6 +14,7 @@ in
environment.systemPackages = environment.systemPackages =
let let
python = pkgs.python3.withPackages (ps: with ps; [ pip ]); python = pkgs.python3.withPackages (ps: with ps; [ pip ]);
pixi = inputs.pixi.packages.${pkgs.system}.default;
in in
with pkgs; with pkgs;
[ [

View file

@ -11,7 +11,6 @@ let
in in
{ {
nixpkgs.overlays = defaultOverlays ++ [ nixpkgs.overlays = defaultOverlays ++ [
inputs.pixi.overlays.default
(final: _prev: { (final: _prev: {
stable = import inputs.stable { stable = import inputs.stable {
system = final.system; system = final.system;

View file

@ -10,4 +10,6 @@
- [ ] make desktop application file for win10 vm - [ ] make desktop application file for win10 vm
- [ ] find out why pixi on GHA is different from local (possibly from the fetch git step?)
<!-- generated with <3 by daylinmorgan/todo --> <!-- generated with <3 by daylinmorgan/todo -->