daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-09-19 10:27:18 -05:00
Code Issues Projects Releases Packages Wiki Activity

use zig-overlay instead of zig2nix

Browse source
This commit is contained in:
Daylin Morgan 2024-08-09 13:56:36 -05:00
parent a494d362ed
commit d93ac9ba6a
Signed by: daylin
GPG key ID: 950D13E9719334AD
4 changed files with 24 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
flake.lock
View file

@ -215,11 +215,11 @@
"systems": "systems_6"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
@ -246,24 +246,6 @@
"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": {
"locked": {
"lastModified": 1712898590,
@ -886,7 +868,7 @@
"roc": "roc",
"stable": "stable",
"tsm": "tsm",
"zig2nix": "zig2nix",
"zig-overlay": "zig-overlay",
"zls": "zls"
}
},
@ -1036,21 +1018,6 @@
"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": {
"inputs": {
"nixpkgs": [
@ -1128,44 +1095,22 @@
"zig-overlay": {
"inputs": {
"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",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1723166646,
"narHash": "sha256-brh8KVKQOcwyc9v+nG/QixMuH+yra2+GLvzd3aKhkGo=",
"owner": "Cloudef",
"repo": "zig2nix",
"rev": "8d9b9e0134659665937b60ece972cc8108960e3c",
"lastModified": 1723205416,
"narHash": "sha256-VF5o0Ogk2PyQSs22aQijjqIC0U3Z4mzjTcrsnhSfQ9U=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "f4d2e3b5855a66a763e49d8030edbb6b852c4b1a",
"type": "github"
},
"original": {
"owner": "Cloudef",
"repo": "zig2nix",
"owner": "mitchellh",
"repo": "zig-overlay",
"type": "github"
}
},
@ -1177,7 +1122,9 @@
"nixpkgs": [
"nixpkgs"
],
"zig-overlay": "zig-overlay"
"zig-overlay": [
"zig-overlay"
]
},
"locked": {
"lastModified": 1722987529,

5
flake.nix
View file

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

9
lib/checks.nix
View file

@ -22,23 +22,24 @@ let
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});
in
# selfPackages = self.packages.${pkgs.system} |> attrValues;
{
makePackages =
pkgs.runCommandLocal "build-third-party"
{
src = ./.;
nativeBuildInputs =
# packages from overlays
(with pkgs; [
swww
nixVersions.stable
# nixVersions.git
])
++ [
(flake.pkgs "roc").full
(flake.pkgs "zig2nix").zig.master.bin
(flake.pkgs "zig-overlay").master
(flake.pkg "zls")
]
++ hyprPackages
++ selfPackages;

6
modules/languages/zig.nix
View file

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