Compare commits

...

2 commits

Author SHA1 Message Date
fe4730b82c
use pixi as package instead of overlay 2024-05-23 12:45:16 -05:00
ac339c6987
noop 2024-05-23 10:34:57 -05:00
7 changed files with 27 additions and 9 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

@ -38,7 +38,7 @@ var rootCmd = &cobra.Command{
Use: "oizys", Use: "oizys",
Short: "nix begat oizys", Short: "nix begat oizys",
PersistentPreRun: func(cmd *cobra.Command, args []string) { PersistentPreRun: func(cmd *cobra.Command, args []string) {
oizys.Update(flake, host, cacheName, verbose) oizys.Set(flake, host, cacheName, verbose)
oizys.CheckFlake() oizys.CheckFlake()
}, },
} }

View file

@ -52,7 +52,7 @@ func (o *Oizys) Output() string {
) )
} }
func (o *Oizys) Update( func (o *Oizys) Set (
flake, host, cache string, flake, host, cache string,
verbose bool, verbose bool,
) { ) {
@ -81,9 +81,9 @@ func terminalSize() (int, int) {
} }
type packages struct { type packages struct {
desc string
names []string names []string
pad int pad int
desc string
} }
func parsePackages(lines []string, desc string) *packages { func parsePackages(lines []string, desc string) *packages {
@ -171,12 +171,14 @@ func (o *Oizys) GitPull() {
os.Exit(1) os.Exit(1)
} }
if cmdOutput, err := o.git("pull").CombinedOutput(); err != nil { cmdOutput, err = o.git("pull").CombinedOutput()
if err != nil {
showFailedOutput(cmdOutput) showFailedOutput(cmdOutput)
log.Fatal(err) log.Fatal(err)
} }
} }
func parseDryRun(buf string) (*packages, *packages) { func parseDryRun(buf string) (*packages, *packages) {
lines := strings.Split(strings.TrimSpace(buf), "\n") lines := strings.Split(strings.TrimSpace(buf), "\n")
var parts [2][]string var parts [2][]string

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 -->