Compare commits

...

6 commits

Author SHA1 Message Date
6d1f571ad4 flake.lock: Update
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=8b37e81374928856d8fd859b95a62c8bf4211901' (2024-08-09)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=4fdc0d55e4b44bb5300679025d2378fb6de0cae4' (2024-08-09)
• Updated input 'lix':
    '346e340cbf.tar.gz?narHash=sha256-XbtSx3sxE6rf/D31fBX9d28CuXnokkbHW6tzOEMVfxw%3D' (2024-08-09)
  → 'c7d97802e4.tar.gz?narHash=sha256-xfvFAMmR7bc2RaD1ehaT0hBE4Kka/wuqxMeW6L8x3MM%3D' (2024-08-09)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/f9b6659b7a856ad5c470ce224a0d69696c6f8c73' (2024-08-09)
  → 'github:nix-community/nixpkgs-wayland/cece0e097e27f583e61ff54f26916c29af7be7af' (2024-08-09)
• Updated input 'roc':
    'github:roc-lang/roc/698bbc3cf1c279baf76b6015754aab58d5ffeffb' (2024-08-07)
  → 'github:roc-lang/roc/0bffd6001c7b27794222db76ba0eb48506935871' (2024-08-09)
• Updated input 'zig-overlay':
    'github:mitchellh/zig-overlay/f4d2e3b5855a66a763e49d8030edbb6b852c4b1a' (2024-08-09)
  → 'github:mitchellh/zig-overlay/d15f6040f95938da639fa7287821799f76dcaef3' (2024-08-10)
2024-08-10 00:33:36 +00:00
afac7e637b
use nix.settings 2024-08-09 14:03:04 -05:00
d93ac9ba6a
use zig-overlay instead of zig2nix 2024-08-09 13:56:36 -05:00
a494d362ed
remove colon 2024-08-09 13:16:15 -05:00
e6e0d1d8b7
don't waste time on old builds 2024-08-09 13:16:15 -05:00
a8ad42cb21
try not to delete git-core data 2024-08-09 13:16:15 -05:00
8 changed files with 55 additions and 102 deletions

View file

@ -41,11 +41,13 @@ runs:
$(non_manifest_packages) # > /dev/null $(non_manifest_packages) # > /dev/null
fi fi
sudo rm -rf /opt & GLOBIGNORE="/usr/share/git-core/**/*"
sudo rm -rf "$AGENT_TOOLSDIRECTORY" & sudo rm -rf \
/var/lib/docker/ \
"$AGENT_TOOLSDIRECTORY" \
/opt \
/usr/{local,share} &
sudo rm -rf /var/lib/docker &
sudo rm -rf /usr/{local,share} &
{ {
sudo swapoff -a sudo swapoff -a
sudo rm -f /mnt/swapfile sudo rm -f /mnt/swapfile

View file

@ -8,6 +8,10 @@ on:
permissions: permissions:
contents: write contents: write
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs: jobs:
build-minimal: build-minimal:
runs-on: ubuntu-latest runs-on: ubuntu-latest

View file

@ -215,11 +215,11 @@
"systems": "systems_6" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1705309234,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -246,24 +246,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_7": {
"inputs": {
"systems": "systems_8"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": { "flakey-profile": {
"locked": { "locked": {
"lastModified": 1712898590, "lastModified": 1712898590,
@ -341,11 +323,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1723224800, "lastModified": 1723241066,
"narHash": "sha256-2b+cECwR+3FL/ikuZnXE94H8bXdlnYUbhmi1KNpD/tc=", "narHash": "sha256-et+BwLETF5e/9jBHK2GnVh6WGjRztRBThtllMezCvcM=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "8b37e81374928856d8fd859b95a62c8bf4211901", "rev": "4fdc0d55e4b44bb5300679025d2378fb6de0cae4",
"revCount": 5073, "revCount": 5074,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -534,11 +516,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723213513, "lastModified": 1723233557,
"narHash": "sha256-XbtSx3sxE6rf/D31fBX9d28CuXnokkbHW6tzOEMVfxw=", "narHash": "sha256-xfvFAMmR7bc2RaD1ehaT0hBE4Kka/wuqxMeW6L8x3MM=",
"rev": "346e340cbfe450df3709cf5d51e26ba247a2c1ad", "rev": "c7d97802e4f59b8621e67cf62275d6a7fde8fe62",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/346e340cbfe450df3709cf5d51e26ba247a2c1ad.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c7d97802e4f59b8621e67cf62275d6a7fde8fe62.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -715,11 +697,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1723206805, "lastModified": 1723234766,
"narHash": "sha256-C75q+dsWnjObUKukRsFj2VKNRtULvZw/XszfGu97PyY=", "narHash": "sha256-p7VFHo/YlNcdlQCpcTq/ygmgnzZmgeaAgEx88dKHnfQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "f9b6659b7a856ad5c470ce224a0d69696c6f8c73", "rev": "cece0e097e27f583e61ff54f26916c29af7be7af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -857,11 +839,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1723012587, "lastModified": 1723239681,
"narHash": "sha256-IxV/7YKqeFoBFc1SXgUPdnWi34JkBieSzWM+gP8YzWI=", "narHash": "sha256-1UPtz+CsXFr4LbM2AijSqnzSZLBuZtfURE4ZPtlS3NI=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "698bbc3cf1c279baf76b6015754aab58d5ffeffb", "rev": "0bffd6001c7b27794222db76ba0eb48506935871",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -886,7 +868,7 @@
"roc": "roc", "roc": "roc",
"stable": "stable", "stable": "stable",
"tsm": "tsm", "tsm": "tsm",
"zig2nix": "zig2nix", "zig-overlay": "zig-overlay",
"zls": "zls" "zls": "zls"
} }
}, },
@ -1036,21 +1018,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_8": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -1128,44 +1095,22 @@
"zig-overlay": { "zig-overlay": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_7",
"nixpkgs": [
"zls",
"nixpkgs"
]
},
"locked": {
"lastModified": 1722600600,
"narHash": "sha256-bRpvmyAvt4OFbQJlmAURyW1To8nlRjNcQJdbOyI1MLE=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "4c95bb8378ca31cc06eba0a9ee0c04851221c193",
"type": "github"
},
"original": {
"owner": "mitchellh",
"repo": "zig-overlay",
"type": "github"
}
},
"zig2nix": {
"inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_5",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1723166646, "lastModified": 1723249552,
"narHash": "sha256-brh8KVKQOcwyc9v+nG/QixMuH+yra2+GLvzd3aKhkGo=", "narHash": "sha256-4nQBvZQOOiI3kr+Ch0XH9ZIhajpLooqGbrcUNMI1Hmw=",
"owner": "Cloudef", "owner": "mitchellh",
"repo": "zig2nix", "repo": "zig-overlay",
"rev": "8d9b9e0134659665937b60ece972cc8108960e3c", "rev": "d15f6040f95938da639fa7287821799f76dcaef3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Cloudef", "owner": "mitchellh",
"repo": "zig2nix", "repo": "zig-overlay",
"type": "github" "type": "github"
} }
}, },
@ -1177,7 +1122,9 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"zig-overlay": "zig-overlay" "zig-overlay": [
"zig-overlay"
]
}, },
"locked": { "locked": {
"lastModified": 1722987529, "lastModified": 1722987529,

View file

@ -21,7 +21,7 @@
hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1"; hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";
hyprland-contrib.url = "github:hyprwm/contrib"; hyprland-contrib.url = "github:hyprwm/contrib";
roc.url = "github:roc-lang/roc"; roc.url = "github:roc-lang/roc";
zig2nix.url = "github:Cloudef/zig2nix"; zig-overlay.url = "github:mitchellh/zig-overlay";
zls.url = "github:zigtools/zls"; zls.url = "github:zigtools/zls";
pixi.url = "github:daylinmorgan/pixi-flake"; pixi.url = "github:daylinmorgan/pixi-flake";
@ -36,7 +36,8 @@
roc.inputs.nixpkgs.follows = "nixpkgs"; roc.inputs.nixpkgs.follows = "nixpkgs";
tsm.inputs.nixpkgs.follows = "nixpkgs"; tsm.inputs.nixpkgs.follows = "nixpkgs";
zls.inputs.nixpkgs.follows = "nixpkgs"; zls.inputs.nixpkgs.follows = "nixpkgs";
zig2nix.inputs.nixpkgs.follows = "nixpkgs"; zls.inputs.zig-overlay.follows = "zig-overlay";
zig-overlay.inputs.nixpkgs.follows = "nixpkgs";
}; };
nixConfig = { nixConfig = {

View file

@ -22,23 +22,24 @@ let
xdg-desktop-portal-hyprland xdg-desktop-portal-hyprland
]; ];
# TODO: start using pipes once support lands in nixd
# selfPackages = self.packages.${pkgs.system} |> attrValues;
selfPackages = (attrValues self.packages.${pkgs.system}); selfPackages = (attrValues self.packages.${pkgs.system});
in in
# selfPackages = self.packages.${pkgs.system} |> attrValues;
{ {
makePackages = makePackages =
pkgs.runCommandLocal "build-third-party" pkgs.runCommandLocal "build-third-party"
{ {
src = ./.;
nativeBuildInputs = nativeBuildInputs =
# packages from overlays # packages from overlays
(with pkgs; [ (with pkgs; [
swww swww
nixVersions.stable # nixVersions.git
]) ])
++ [ ++ [
(flake.pkgs "roc").full (flake.pkgs "roc").full
(flake.pkgs "zig2nix").zig.master.bin (flake.pkgs "zig-overlay").master
(flake.pkg "zls")
] ]
++ hyprPackages ++ hyprPackages
++ selfPackages; ++ selfPackages;

View file

@ -7,14 +7,12 @@
let let
inherit (lib) mkIfIn; inherit (lib) mkIfIn;
cfg = config.oizys.languages; cfg = config.oizys.languages;
zig = (flake.pkgs "zig2nix").zig.master.bin;
zls = (flake.pkg "zls").overrideAttrs { nativeBuildInputs = [ zig ]; };
in in
{ {
config = mkIfIn "zig" cfg { config = mkIfIn "zig" cfg {
environment.systemPackages = [ environment.systemPackages = [
zig (flake.pkgs "zig-overlay").master
zls (flake.pkg "zls")
]; ];
}; };
} }

View file

@ -3,7 +3,7 @@
pkgs, pkgs,
lib, lib,
enabled, enabled,
flake, self,
... ...
}: }:
let let
@ -15,10 +15,10 @@ in
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
# nix.package = pkgs.nixVersions.latest; # nix.package = pkgs.nixVersions.latest;
nix = { nix = {
extraOptions = '' settings = {
experimental-features = nix-command flakes pipe-operator experimental-features = [ "nix-command" "flakes" "pipe-operator"];
use-xdg-base-directories = true use-xdg-base-directories = true;
''; };
optimise.automatic = true; optimise.automatic = true;
gc = { gc = {
@ -42,7 +42,7 @@ in
pkgs.nixfmt-rfc-style pkgs.nixfmt-rfc-style
pkgs.nix-output-monitor pkgs.nix-output-monitor
(flake.pkg "self") self.packages.${pkgs.system}.default
]; ];
programs.nix-index-database.comma = enabled; programs.nix-index-database.comma = enabled;

View file

@ -266,7 +266,7 @@ func writeDervationsToStepSummary(drvs []string) {
} }
o.writeToGithubStepSummary( o.writeToGithubStepSummary(
fmt.Sprintf(`# Building Derivations: fmt.Sprintf(`# Building Derivations
| derivation | hash | | derivation | hash |
|---|---| |---|---|
%s %s