flake.lock: Update

Flake lock file updates: • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=4b4971c06fb02df00a2bd20b6b47b5d0e7d799a7' (2024-08-08) → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=8b37e81374928856d8fd859b95a62c8bf4211901' (2024-08-09) • Updated input 'lix': 'e03cd8b3a6.tar.gz?narHash=sha256-WRt4kYvg6cpnatF5zUCIUeurU67M7b4dk3oYdZ0cu9M%3D' (2024-08-08) → '346e340cbf.tar.gz?narHash=sha256-XbtSx3sxE6rf/D31fBX9d28CuXnokkbHW6tzOEMVfxw%3D' (2024-08-09) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/f5129fb42b9c262318130a97b47516946da3e7d7' (2024-08-07) → 'github:nixos/nixpkgs/13fe00cb6c75461901f072ae62b5805baef9f8b2' (2024-08-08) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/b412353cee03010813974408d5ae63f7422b176d' (2024-08-08) → 'github:nix-community/nixpkgs-wayland/f9b6659b7a856ad5c470ce224a0d69696c6f8c73' (2024-08-09) • Updated input 'pixi': 'github:daylinmorgan/pixi-flake/7a3e2a90d0f35170c1a95cc194a3ba81acd5b63d' (2024-08-07) → 'github:daylinmorgan/pixi-flake/df14d187eb1cb453f0d6b83c9cdf8441017b9c20' (2024-08-09) • Updated input 'pixi/pixi-source': 'github:prefix-dev/pixi/608a65d977b9d87bae71c747f77989ad01c76ada' (2024-08-07) → 'github:prefix-dev/pixi/55741aede8e87f176fd6d99eb26bfd3d026c2b7e' (2024-08-09) • Updated input 'zig2nix': 'github:Cloudef/zig2nix/7320da37a4d45afb0aa94d22861a0fe07152c038' (2024-08-08) → 'github:Cloudef/zig2nix/8d9b9e0134659665937b60ece972cc8108960e3c' (2024-08-09)
improve oizys ci output
2024-12-23 11:00:44 -06:00 · 2024-08-09 17:52:21 +00:00 · 2024-08-09 12:41:18 -05:00 · 2024-08-09 11:57:06 -05:00 · 2024-08-09 11:57:03 -05:00 · 2024-08-09 10:42:36 -05:00
7 changed files with 96 additions and 53 deletions
--- a/flake.lock
+++ b/flake.lock
@ -341,11 +341,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1723143710,
-        "narHash": "sha256-qbjodK+UgnQ2YdtKmuI1XEG84SZlid39rQo6Ap9NTqI=",
+        "lastModified": 1723224800,
+        "narHash": "sha256-2b+cECwR+3FL/ikuZnXE94H8bXdlnYUbhmi1KNpD/tc=",
        "ref": "refs/heads/main",
-        "rev": "4b4971c06fb02df00a2bd20b6b47b5d0e7d799a7",
-        "revCount": 5071,
+        "rev": "8b37e81374928856d8fd859b95a62c8bf4211901",
+        "revCount": 5073,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland/"
@ -534,11 +534,11 @@
    "lix": {
      "flake": false,
      "locked": {
-        "lastModified": 1723140921,
-        "narHash": "sha256-WRt4kYvg6cpnatF5zUCIUeurU67M7b4dk3oYdZ0cu9M=",
-        "rev": "e03cd8b3a6f70c60f359fd683c2b25f8eba4da0d",
+        "lastModified": 1723213513,
+        "narHash": "sha256-XbtSx3sxE6rf/D31fBX9d28CuXnokkbHW6tzOEMVfxw=",
+        "rev": "346e340cbfe450df3709cf5d51e26ba247a2c1ad",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e03cd8b3a6f70c60f359fd683c2b25f8eba4da0d.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/346e340cbfe450df3709cf5d51e26ba247a2c1ad.tar.gz"
      },
      "original": {
        "type": "tarball",
@ -715,11 +715,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1723137378,
-        "narHash": "sha256-+MkYW9iZwi0D0hLeS5S1Ov3VNJ3twdTlHW7dRKeiCBY=",
+        "lastModified": 1723206805,
+        "narHash": "sha256-C75q+dsWnjObUKukRsFj2VKNRtULvZw/XszfGu97PyY=",
        "owner": "nix-community",
        "repo": "nixpkgs-wayland",
-        "rev": "b412353cee03010813974408d5ae63f7422b176d",
+        "rev": "f9b6659b7a856ad5c470ce224a0d69696c6f8c73",
        "type": "github"
      },
      "original": {
@ -762,11 +762,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1723019560,
-        "narHash": "sha256-O/kxmybNecC3Efr6ITOdtCzFv90/B2Iiedavj5aRWt0=",
+        "lastModified": 1723151389,
+        "narHash": "sha256-9AVY0ReCmSGXHrlx78+1RrqcDgVSRhHUKDVV1LLBy28=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "f5129fb42b9c262318130a97b47516946da3e7d7",
+        "rev": "13fe00cb6c75461901f072ae62b5805baef9f8b2",
        "type": "github"
      },
      "original": {
@ -816,11 +816,11 @@
        "pixi-source": "pixi-source"
      },
      "locked": {
-        "lastModified": 1723049033,
-        "narHash": "sha256-JMVvLQX+oJ5Gfck419poXJCIKOxWsZGRC23ize6hT6Y=",
+        "lastModified": 1723219928,
+        "narHash": "sha256-QtO96opBSkBNNOdyWhBVIu447rkUqOZAwrYoOy/Jczw=",
        "owner": "daylinmorgan",
        "repo": "pixi-flake",
-        "rev": "7a3e2a90d0f35170c1a95cc194a3ba81acd5b63d",
+        "rev": "df14d187eb1cb453f0d6b83c9cdf8441017b9c20",
        "type": "github"
      },
      "original": {
@ -832,16 +832,16 @@
    "pixi-source": {
      "flake": false,
      "locked": {
-        "lastModified": 1723023748,
-        "narHash": "sha256-m1qlDxZBEDUMNV+gRX2bbEdvBRp4lJv7C2ZZlEUA5Dg=",
+        "lastModified": 1723208538,
+        "narHash": "sha256-37zVmPKAWCw58xA5lUb+WVAW8rRwPF7DZVXUZ8bwP5E=",
        "owner": "prefix-dev",
        "repo": "pixi",
-        "rev": "608a65d977b9d87bae71c747f77989ad01c76ada",
+        "rev": "55741aede8e87f176fd6d99eb26bfd3d026c2b7e",
        "type": "github"
      },
      "original": {
        "owner": "prefix-dev",
-        "ref": "v0.27.0",
+        "ref": "v0.27.1",
        "repo": "pixi",
        "type": "github"
      }
@ -1156,11 +1156,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723080195,
-        "narHash": "sha256-0g2ljOHZZtEZZG9GKusKiNx1+VKm+MEKzCOL2KdkLRg=",
+        "lastModified": 1723166646,
+        "narHash": "sha256-brh8KVKQOcwyc9v+nG/QixMuH+yra2+GLvzd3aKhkGo=",
        "owner": "Cloudef",
        "repo": "zig2nix",
-        "rev": "7320da37a4d45afb0aa94d22861a0fe07152c038",
+        "rev": "8d9b9e0134659665937b60ece972cc8108960e3c",
        "type": "github"
      },
      "original": {
--- a/lib/checks.nix
+++ b/lib/checks.nix
@ -2,10 +2,10 @@
  inputs,
  system,
  lib,
+  self,
 }:
 let
-  inherit (builtins) map;
-  inherit (lib) flakeFromSystem;
+  inherit (lib) flakeFromSystem attrValues;

  flake = flakeFromSystem system;
  pkgs = import inputs.nixpkgs {
@ -16,25 +16,23 @@ let
      (flake.overlay "nixpkgs-wayland")
    ];
  };
-  myPackages = map [
-    "tsm"
-    "hyprman"
-    "zls"
-  ] flake.pkg;

  hyprPackages = with (flake.pkgs "hyprland"); [
    default
    xdg-desktop-portal-hyprland
  ];
+
+  selfPackages = (attrValues self.packages.${pkgs.system});
 in
+# selfPackages = self.packages.${pkgs.system} |> attrValues;
 {
  makePackages =
    pkgs.runCommandLocal "build-third-party"
      {
        src = ./.;
        nativeBuildInputs =
+          # packages from overlays
          (with pkgs; [
-            pixi
            swww
            nixVersions.stable
          ])
@ -42,9 +40,8 @@ in
            (flake.pkgs "roc").full
            (flake.pkgs "zig2nix").zig.master.bin
          ]
-          ++ myPackages
-          ++ hyprPackages;
-
+          ++ hyprPackages
+          ++ selfPackages;
      }
      ''
        mkdir "$out"
--- a/lib/default.nix
+++ b/lib/default.nix
@ -3,22 +3,40 @@ let
  lib = nixpkgs.lib.extend (import ./extended.nix inputs);

  inherit (builtins) mapAttrs readDir listToAttrs;
-  inherit (lib) genAttrs;
+  inherit (lib) genAttrs pkgFromSystem pkgsFromSystem;

  inherit (import ./find-modules.nix { inherit lib; }) findModulesList;
  inherit (import ./generators.nix { inherit lib self inputs; }) mkIso mkSystem;
  #supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
  supportedSystems = [ "x86_64-linux" ];
  forAllSystems = f: genAttrs supportedSystems (system: f (import nixpkgs { inherit system; }));
+  inheritFlakePkgs =
+    pkgs: flakes:
+    listToAttrs (
+      map (name: {
+        inherit name;
+        value = pkgFromSystem pkgs.system name;
+      }) flakes
+    );

  oizysFlake = {
    nixosModules = listToAttrs (findModulesList ../modules);
    nixosConfigurations = mapAttrs (name: _: mkSystem name) (readDir ../hosts);
-    packages = forAllSystems (pkgs: rec {
-      iso = mkIso.config.system.build.isoImage;
-      oizys-go = pkgs.callPackage ../pkgs/oizys { };
-      default = oizys-go;
-    });
+    packages = forAllSystems (
+      pkgs:
+      rec {
+        default = oizys-cli;
+        oizys-cli = pkgs.callPackage ../pkgs/oizys { };
+        iso = mkIso.config.system.build.isoImage;
+        roc = (pkgsFromSystem pkgs.system "roc").full;
+      }
+      // (inheritFlakePkgs pkgs [
+        "pixi"
+        "f1multiviewer"
+        "tsm"
+      ])
+    );
+
    devShells = forAllSystems (pkgs: {
      default = pkgs.mkShell {
        packages = with pkgs; [
@ -30,7 +48,7 @@ let
    checks = forAllSystems (
      pkgs:
      import ./checks.nix {
-        inherit inputs lib;
+        inherit inputs lib self;
        system = pkgs.system;
      }
    );
--- a/modules/languages/nushell.nix
+++ b/modules/languages/nushell.nix
@ -9,9 +9,5 @@ let
  cfg = config.oizys.languages;
 in
 {
-  config = mkIfIn "nushell" cfg {
-    environment.systemPackages = with pkgs; [
-      nushell
-    ];
-  };
+  config = mkIfIn "nushell" cfg { environment.systemPackages = with pkgs; [ nushell ]; };
 }
--- a/modules/nix.nix
+++ b/modules/nix.nix
@ -16,7 +16,7 @@ in
  # nix.package = pkgs.nixVersions.latest;
  nix = {
    extraOptions = ''
-      experimental-features = nix-command flakes
+      experimental-features = nix-command flakes pipe-operator
      use-xdg-base-directories = true
    '';

--- a/pkgs/oizys/default.nix
+++ b/pkgs/oizys/default.nix
@ -24,5 +24,7 @@ buildGoModule {
    installShellCompletion --cmd oizys \
      --zsh <(OIZYS_SKIP_CHECK=true $out/bin/oizys completion zsh)
  '';
-
+  meta = {
+    description = "nix begat oizys";
+  };
 }
--- a/pkgs/oizys/internal/oizys/main.go
+++ b/pkgs/oizys/internal/oizys/main.go
@ -56,7 +56,10 @@ func New() *Oizys {
 		o.flake = oizysDir
 	}
 	o.githubSummary = os.Getenv("GITHUB_STEP_SUMMARY")
-	o.inCI = o.githubSummary != ""
+	if o.githubSummary != "" {
+		o.inCI = true
+		log.Debug("running oizys in CI mode")
+	}
 	o.githubToken = os.Getenv("GITHUB_TOKEN")
 	o.repo = git.NewRepo(o.flake)
 	return o
@ -244,6 +247,35 @@ func NixosRebuild(subcmd string, rest ...string) {
 	e.ExitWithCommand(cmd)
 }

+func splitDrv(drv string) (string, string) {
+	s := strings.SplitN(drv, "-", 2)
+	ss := strings.Split(s[0], "/")
+	hash := ss[len(ss)-1]
+	drvName := strings.Replace(s[1], ".drv^*", "", 1)
+	return drvName, hash
+}
+
+func writeDervationsToStepSummary(drvs []string) {
+	tableRows := make([]string, len(drvs))
+	for i, drv := range drvs {
+		name, hash := splitDrv(drv)
+		tableRows[i] = fmt.Sprintf(
+			"| %s | %s |",
+			name, hash,
+		)
+	}
+
+	o.writeToGithubStepSummary(
+		fmt.Sprintf(`# Building Derivations:
+| derivation | hash |
+|---|---|
+%s
+`,
+			strings.Join(tableRows, "\n"),
+		),
+	)
+}
+
 func NixBuild(minimal bool, rest ...string) {
 	cmd := exec.Command("nix", "build")
 	if o.resetCache {
@ -257,9 +289,7 @@ func NixBuild(minimal bool, rest ...string) {
 			os.Exit(0)
 		}
 		if o.inCI {
-			o.writeToGithubStepSummary("# Building Derivations:\n")
-      // TODO: write as a markdown table with hash + name (without .drv)
-			o.writeToGithubStepSummary(strings.Join(drvs, "\n"))
+			writeDervationsToStepSummary(drvs)
 		}
 		cmd.Args = append(cmd.Args, append(drvs, "--no-link")...)
 	}
Author	SHA1	Message	Date
daylin-bot	ef83435bed	flake.lock: Update Flake lock file updates: • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=4b4971c06fb02df00a2bd20b6b47b5d0e7d799a7' (2024-08-08) → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=8b37e81374928856d8fd859b95a62c8bf4211901' (2024-08-09) • Updated input 'lix': '`e03cd8b3a6`.tar.gz?narHash=sha256-WRt4kYvg6cpnatF5zUCIUeurU67M7b4dk3oYdZ0cu9M%3D' (2024-08-08) → '`346e340cbf`.tar.gz?narHash=sha256-XbtSx3sxE6rf/D31fBX9d28CuXnokkbHW6tzOEMVfxw%3D' (2024-08-09) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/f5129fb42b9c262318130a97b47516946da3e7d7' (2024-08-07) → 'github:nixos/nixpkgs/13fe00cb6c75461901f072ae62b5805baef9f8b2' (2024-08-08) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/b412353cee03010813974408d5ae63f7422b176d' (2024-08-08) → 'github:nix-community/nixpkgs-wayland/f9b6659b7a856ad5c470ce224a0d69696c6f8c73' (2024-08-09) • Updated input 'pixi': 'github:daylinmorgan/pixi-flake/7a3e2a90d0f35170c1a95cc194a3ba81acd5b63d' (2024-08-07) → 'github:daylinmorgan/pixi-flake/df14d187eb1cb453f0d6b83c9cdf8441017b9c20' (2024-08-09) • Updated input 'pixi/pixi-source': 'github:prefix-dev/pixi/608a65d977b9d87bae71c747f77989ad01c76ada' (2024-08-07) → 'github:prefix-dev/pixi/55741aede8e87f176fd6d99eb26bfd3d026c2b7e' (2024-08-09) • Updated input 'zig2nix': 'github:Cloudef/zig2nix/7320da37a4d45afb0aa94d22861a0fe07152c038' (2024-08-08) → 'github:Cloudef/zig2nix/8d9b9e0134659665937b60ece972cc8108960e3c' (2024-08-09)	2024-08-09 17:52:21 +00:00
Daylin Morgan	b8dc12e3ce	improve oizys ci output	2024-08-09 12:41:18 -05:00
Daylin Morgan	65664246a5	formatting	2024-08-09 11:57:06 -05:00
Daylin Morgan	df15bc9621	more silly refactors	2024-08-09 11:57:03 -05:00
Daylin Morgan	8c1f72b605	will be better once nixd has support	2024-08-09 10:42:36 -05:00