mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-25 04:20:44 -06:00
Compare commits
No commits in common. "7c9c031506688c177ccf2053143092c47d500a60" and "912be37cc031a7724adf298073045cf19e21f389" have entirely different histories.
7c9c031506
...
912be37cc0
9 changed files with 63 additions and 48 deletions
3
.github/workflows/build.yml
vendored
3
.github/workflows/build.yml
vendored
|
@ -36,7 +36,6 @@ jobs:
|
||||||
with:
|
with:
|
||||||
source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
|
source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
|
||||||
extra-conf: |
|
extra-conf: |
|
||||||
experimental-features = pipe-operator
|
|
||||||
accept-flake-config = true
|
accept-flake-config = true
|
||||||
|
|
||||||
- uses: DeterminateSystems/magic-nix-cache-action@v7
|
- uses: DeterminateSystems/magic-nix-cache-action@v7
|
||||||
|
@ -53,7 +52,7 @@ jobs:
|
||||||
git diff
|
git diff
|
||||||
|
|
||||||
- name: Pre-build Oizys
|
- name: Pre-build Oizys
|
||||||
run: nix build . --print-build-logs
|
run: nix build .
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
|
|
59
flake.lock
59
flake.lock
|
@ -539,17 +539,36 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nim2nix": {
|
"nim2nix": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs_3"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1725378873,
|
||||||
|
"narHash": "sha256-FHuKRJbzusZNnGi1nykC5H5hMwyJE4zGqoPXDQWxa/E=",
|
||||||
|
"owner": "daylinmorgan",
|
||||||
|
"repo": "nim2nix",
|
||||||
|
"rev": "c16db19a0809a01189f708848773fbd4c81319db",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "daylinmorgan",
|
||||||
|
"repo": "nim2nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nim2nix_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
"utils",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725465990,
|
"lastModified": 1724878933,
|
||||||
"narHash": "sha256-+KN+E3B5lVxi5K0rrDC41l080n/r04LOpmfxK3ZJ058=",
|
"narHash": "sha256-VP0+Lal3jJJqDH1EzQX73rP9Ue8ZTIyAErJvDz6PQSg=",
|
||||||
"owner": "daylinmorgan",
|
"owner": "daylinmorgan",
|
||||||
"repo": "nim2nix",
|
"repo": "nim2nix",
|
||||||
"rev": "cac4c7106ea09e04b4a555e4f957e38be65dfbb4",
|
"rev": "5153c772e4c6a4f5645efa85ce536fe1c5063ebb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -562,7 +581,7 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
"nix-github-actions": "nix-github-actions",
|
"nix-github-actions": "nix-github-actions",
|
||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_6",
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -650,7 +669,7 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
"flake-utils": "flake-utils_2",
|
"flake-utils": "flake-utils_2",
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725358307,
|
"lastModified": 1725358307,
|
||||||
|
@ -702,7 +721,7 @@
|
||||||
"flake-compat": "flake-compat_2",
|
"flake-compat": "flake-compat_2",
|
||||||
"lib-aggregate": "lib-aggregate",
|
"lib-aggregate": "lib-aggregate",
|
||||||
"nix-eval-jobs": "nix-eval-jobs",
|
"nix-eval-jobs": "nix-eval-jobs",
|
||||||
"nixpkgs": "nixpkgs_6"
|
"nixpkgs": "nixpkgs_7"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725292436,
|
"lastModified": 1725292436,
|
||||||
|
@ -735,6 +754,22 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1724479785,
|
||||||
|
"narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725001927,
|
"lastModified": 1725001927,
|
||||||
"narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
|
"narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
|
||||||
|
@ -750,7 +785,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725194671,
|
"lastModified": 1725194671,
|
||||||
"narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
|
"narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
|
||||||
|
@ -766,7 +801,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_6": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723221148,
|
"lastModified": 1723221148,
|
||||||
"narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
|
"narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
|
||||||
|
@ -782,7 +817,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_6": {
|
"nixpkgs_7": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1724819573,
|
"lastModified": 1724819573,
|
||||||
"narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
|
"narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
|
||||||
|
@ -853,7 +888,7 @@
|
||||||
"nim2nix": "nim2nix",
|
"nim2nix": "nim2nix",
|
||||||
"nix-index-database": "nix-index-database",
|
"nix-index-database": "nix-index-database",
|
||||||
"nixos-wsl": "nixos-wsl",
|
"nixos-wsl": "nixos-wsl",
|
||||||
"nixpkgs": "nixpkgs_4",
|
"nixpkgs": "nixpkgs_5",
|
||||||
"nixpkgs-wayland": "nixpkgs-wayland",
|
"nixpkgs-wayland": "nixpkgs-wayland",
|
||||||
"pixi": "pixi",
|
"pixi": "pixi",
|
||||||
"roc": "roc",
|
"roc": "roc",
|
||||||
|
@ -1056,9 +1091,7 @@
|
||||||
},
|
},
|
||||||
"utils": {
|
"utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nim2nix": [
|
"nim2nix": "nim2nix_2",
|
||||||
"nim2nix"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
|
|
|
@ -33,18 +33,13 @@
|
||||||
hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git";
|
hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git";
|
||||||
utils.url = "git+https://git.dayl.in/daylin/utils.git";
|
utils.url = "git+https://git.dayl.in/daylin/utils.git";
|
||||||
|
|
||||||
utils.inputs = {
|
|
||||||
nixpkgs.follows = "nixpkgs";
|
|
||||||
nim2nix.follows = "nim2nix";
|
|
||||||
};
|
|
||||||
|
|
||||||
nim2nix.inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
hyprman.inputs.nixpkgs.follows = "nixpkgs";
|
hyprman.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
f1multiviewer.inputs.nixpkgs.follows = "nixpkgs";
|
f1multiviewer.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
pixi.inputs.nixpkgs.follows = "nixpkgs";
|
pixi.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
roc.inputs.nixpkgs.follows = "nixpkgs";
|
roc.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
tsm.inputs.nixpkgs.follows = "nixpkgs";
|
tsm.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
utils.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
zls.inputs.nixpkgs.follows = "nixpkgs";
|
zls.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
zls.inputs.zig-overlay.follows = "zig-overlay";
|
zls.inputs.zig-overlay.follows = "zig-overlay";
|
||||||
zig-overlay.inputs.nixpkgs.follows = "nixpkgs";
|
zig-overlay.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
|
@ -9,20 +9,10 @@ let
|
||||||
inherit (import ./generators.nix { inherit lib self inputs; }) mkIso mkSystem;
|
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" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
|
||||||
supportedSystems = [ "x86_64-linux" ];
|
supportedSystems = [ "x86_64-linux" ];
|
||||||
forAllSystems =
|
forAllSystems = f: genAttrs supportedSystems (system: f (import nixpkgs {
|
||||||
f:
|
|
||||||
genAttrs supportedSystems (
|
|
||||||
system:
|
|
||||||
f (
|
|
||||||
import nixpkgs {
|
|
||||||
inherit system;
|
inherit system;
|
||||||
overlays = [
|
overlays = [inputs.nim2nix.overlays.default];
|
||||||
inputs.nim2nix.overlays.default
|
}));
|
||||||
(import ../overlays/nimble { inherit inputs; })
|
|
||||||
];
|
|
||||||
}
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
inheritFlakePkgs =
|
inheritFlakePkgs =
|
||||||
pkgs: flakes:
|
pkgs: flakes:
|
||||||
|
@ -39,9 +29,9 @@ let
|
||||||
packages = forAllSystems (
|
packages = forAllSystems (
|
||||||
pkgs:
|
pkgs:
|
||||||
rec {
|
rec {
|
||||||
default = oizys-nim;
|
default = oizys-cli;
|
||||||
oizys-nim = pkgs.callPackage ../pkgs/oizys-nim { };
|
oizys-nim = pkgs.callPackage ../pkgs/oizys-nim { };
|
||||||
oizys-go = pkgs.callPackage ../pkgs/oizys { };
|
oizys-cli = pkgs.callPackage ../pkgs/oizys { };
|
||||||
iso = mkIso.config.system.build.isoImage;
|
iso = mkIso.config.system.build.isoImage;
|
||||||
roc = (pkgsFromSystem pkgs.system "roc").full;
|
roc = (pkgsFromSystem pkgs.system "roc").full;
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,8 +49,8 @@ let
|
||||||
nixosSystem {
|
nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
../overlays
|
|
||||||
../modules/oizys.nix
|
../modules/oizys.nix
|
||||||
|
../overlays
|
||||||
inputs.lix-module.nixosModules.default
|
inputs.lix-module.nixosModules.default
|
||||||
inputs.hyprland.nixosModules.default
|
inputs.hyprland.nixosModules.default
|
||||||
] ++ (hostFiles hostName);
|
] ++ (hostFiles hostName);
|
||||||
|
|
|
@ -8,5 +8,5 @@ buildNimblePackage {
|
||||||
verions = "unstable";
|
verions = "unstable";
|
||||||
src = lib.cleanSource ./.;
|
src = lib.cleanSource ./.;
|
||||||
nativeBuildInputs = [ openssl ];
|
nativeBuildInputs = [ openssl ];
|
||||||
nimbleDepsHash = "sha256-n+K5hFiS1tEy2jDAoAoSgE75TCiqZK+al/0Mfc1d4kI=";
|
nimbleDepsHash = "sha256-Eheeve4MbB3v1oVj0mB36Mv2Q3vJGLEbbShds1af23g=";
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,7 +85,7 @@ proc setupCligen() =
|
||||||
clCfg.helpAttrOff = {"cmd": "\e[m", "clDescrip": "\e[m", "clDflVal": "\e[m",
|
clCfg.helpAttrOff = {"cmd": "\e[m", "clDescrip": "\e[m", "clDflVal": "\e[m",
|
||||||
"clOptKeys": "\e[m", "clValType": "\e[m", "args": "\e[m"}.toTable()
|
"clOptKeys": "\e[m", "clValType": "\e[m", "args": "\e[m"}.toTable()
|
||||||
# clCfg.use does nothing?
|
# clCfg.use does nothing?
|
||||||
clCfg.useHdr = "\e[1musage\e[m:\n "
|
clCfg.useHdr = "\e[1mUsage\e[m:\n "
|
||||||
|
|
||||||
when isMainModule:
|
when isMainModule:
|
||||||
checkExes()
|
checkExes()
|
||||||
|
|
|
@ -19,11 +19,9 @@ proc postGhApi(url: string, body: JsonNode) =
|
||||||
"Authorization" : fmt"Bearer {ghToken}",
|
"Authorization" : fmt"Bearer {ghToken}",
|
||||||
"X-GitHub-Api-Version": "2022-11-28",
|
"X-GitHub-Api-Version": "2022-11-28",
|
||||||
})
|
})
|
||||||
|
echo $body
|
||||||
let response = client.post(url, body = $body)
|
let response = client.post(url, body = $body)
|
||||||
try:
|
info fmt"Status: {response.status}"
|
||||||
info fmt"Status: {response.code}"
|
|
||||||
except:
|
|
||||||
error "failed to get response code"
|
|
||||||
|
|
||||||
proc createDispatch*(workflowFileName: string, `ref`: string) =
|
proc createDispatch*(workflowFileName: string, `ref`: string) =
|
||||||
## https://docs.github.com/en/rest/actions/workflows?apiVersion=2022-11-28#create-a-workflow-dispatch-event
|
## https://docs.github.com/en/rest/actions/workflows?apiVersion=2022-11-28#create-a-workflow-dispatch-event
|
||||||
|
|
|
@ -66,7 +66,7 @@ proc parseDryRunOutput(err: string): DryRunOutput =
|
||||||
of 1:
|
of 1:
|
||||||
let idx = theseLines[0]
|
let idx = theseLines[0]
|
||||||
let line = lines[idx]
|
let line = lines[idx]
|
||||||
let drvs = lines[idx + 1 .. ^1].toDerivations()
|
let drvs = lines[idx .. ^1].toDerivations()
|
||||||
if line.contains("built:"):
|
if line.contains("built:"):
|
||||||
result.toBuild = drvs
|
result.toBuild = drvs
|
||||||
elif line.contains("will be fetched"):
|
elif line.contains("will be fetched"):
|
||||||
|
|
Loading…
Reference in a new issue