mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-22 14:20:44 -06:00
Compare commits
No commits in common. "946a645f1776298a85572d2790a1d8c59060bcb9" and "ec91979acba7a2f931a2b42ba035488ad34b578e" have entirely different histories.
946a645f17
...
ec91979acb
12 changed files with 43 additions and 259 deletions
8
.github/workflows/build.yml
vendored
8
.github/workflows/build.yml
vendored
|
@ -7,7 +7,8 @@ on:
|
||||||
hosts:
|
hosts:
|
||||||
description: 'list of hosts to build'
|
description: 'list of hosts to build'
|
||||||
required: true
|
required: true
|
||||||
default: ',othalan,algiz'
|
default: 'othalan'
|
||||||
|
# default: ',othalan,algiz'
|
||||||
type: string
|
type: string
|
||||||
lockFile:
|
lockFile:
|
||||||
description: 'flake.lock file'
|
description: 'flake.lock file'
|
||||||
|
@ -17,7 +18,8 @@ on:
|
||||||
inputs:
|
inputs:
|
||||||
hosts:
|
hosts:
|
||||||
description: 'list of hosts to build'
|
description: 'list of hosts to build'
|
||||||
default: ',othalan,algiz'
|
default: 'othalan'
|
||||||
|
# default: ',othalan,algiz'
|
||||||
type: string
|
type: string
|
||||||
|
|
||||||
# concurrency:
|
# concurrency:
|
||||||
|
@ -58,7 +60,7 @@ jobs:
|
||||||
nix run .
|
nix run .
|
||||||
--
|
--
|
||||||
cache
|
cache
|
||||||
--host,="${{ inputs.hosts }}"
|
--host "${{ inputs.hosts }}"
|
||||||
--flake .
|
--flake .
|
||||||
--debug
|
--debug
|
||||||
--
|
--
|
||||||
|
|
71
.github/workflows/update.yml
vendored
71
.github/workflows/update.yml
vendored
|
@ -51,7 +51,7 @@ jobs:
|
||||||
nix run .
|
nix run .
|
||||||
--
|
--
|
||||||
cache
|
cache
|
||||||
--host,=",othalan,algiz"
|
--host "othalan"
|
||||||
--flake .
|
--flake .
|
||||||
--debug
|
--debug
|
||||||
|
|
||||||
|
@ -60,75 +60,6 @@ jobs:
|
||||||
with:
|
with:
|
||||||
push-args: --set-upstream --force origin flake-lock
|
push-args: --set-upstream --force origin flake-lock
|
||||||
|
|
||||||
|
|
||||||
build-full-at-once:
|
|
||||||
needs: build-minimal
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
# needed to access ghostty repo for now
|
|
||||||
- name: Setup SSH
|
|
||||||
uses: MrSquaare/ssh-setup-action@v3
|
|
||||||
with:
|
|
||||||
host: github.com
|
|
||||||
private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
|
||||||
|
|
||||||
- uses: daylin-bot/actions/setup@main
|
|
||||||
- uses: ./.github/actions/nix
|
|
||||||
with:
|
|
||||||
attic_token: ${{ secrets.ATTIC_TOKEN }}
|
|
||||||
clean: true
|
|
||||||
btrfs: true
|
|
||||||
|
|
||||||
- name: Pre-build oizys
|
|
||||||
run: nix build .
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: >
|
|
||||||
nix run .
|
|
||||||
--
|
|
||||||
build
|
|
||||||
"$(nix run . -- output --host,=othalan,algiz,mannaz,naudiz --flake .)"
|
|
||||||
--flake .
|
|
||||||
--debug
|
|
||||||
--
|
|
||||||
--keep-going
|
|
||||||
--out-link current
|
|
||||||
|
|
||||||
- run: git checkout flake-lock
|
|
||||||
|
|
||||||
- name: Pre-build oizys
|
|
||||||
run: nix build .
|
|
||||||
|
|
||||||
- name: Build Updated
|
|
||||||
run: >
|
|
||||||
nix run .
|
|
||||||
--
|
|
||||||
build
|
|
||||||
"$(nix run . -- output --host,=othalan,algiz,mannaz,naudiz --flake .)"
|
|
||||||
--flake .
|
|
||||||
--debug
|
|
||||||
--
|
|
||||||
--keep-going
|
|
||||||
--out-link updated
|
|
||||||
|
|
||||||
- run: ls
|
|
||||||
# - run: |
|
|
||||||
# echo "# System Diff" >> $GITHUB_STEP_SUMMARY
|
|
||||||
# nix run "nixpkgs#nvd" -- --color always diff ./current ./updated >> summary.md
|
|
||||||
# printf '```\n%s\n```\n' "$(nix run "nixpkgs#nvd" -- diff ./current ./updated)" >> $GITHUB_STEP_SUMMARY
|
|
||||||
#
|
|
||||||
- run: df -h
|
|
||||||
|
|
||||||
# - uses: actions/upload-artifact@v4
|
|
||||||
# with:
|
|
||||||
# name: ${{ matrix.host }}-summary
|
|
||||||
# path: summary.md
|
|
||||||
#
|
|
||||||
build-full:
|
build-full:
|
||||||
needs: build-minimal
|
needs: build-minimal
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
44
flake.lock
44
flake.lock
|
@ -165,11 +165,11 @@
|
||||||
"systems": "systems_3"
|
"systems": "systems_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731533236,
|
"lastModified": 1726560853,
|
||||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -240,11 +240,11 @@
|
||||||
"zig": "zig"
|
"zig": "zig"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731971697,
|
"lastModified": 1731947012,
|
||||||
"narHash": "sha256-6JNMcpy0z19yOLBRt3eE4Rk4A96kcEsRv5+ym1hkv1c=",
|
"narHash": "sha256-OL7pQ/dMLC1Ek+rkXHEXpvx+UBO1Pbo1kTVe2kmcYsY=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "29c3a52e964a97dddaed876ce472aeb167774acf",
|
"rev": "e54ae31d1cf1816f5b9fb7e1fb77d6537dabace6",
|
||||||
"revCount": 8021,
|
"revCount": 8018,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://git@github.com/ghostty-org/ghostty"
|
"url": "ssh://git@github.com/ghostty-org/ghostty"
|
||||||
},
|
},
|
||||||
|
@ -318,11 +318,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731978971,
|
"lastModified": 1731945258,
|
||||||
"narHash": "sha256-P9DXCxDvjFt4aMc2x67hvSpNvSqX18X840w6cEVZXoo=",
|
"narHash": "sha256-N7uJSSMqHzwH4uahb+Uw3sADVp3XdLfqkP2T144gnFk=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "67cee430061626ccd73dc6d30eed9db289053608",
|
"rev": "df9ff4489973afa9e29bb94ac47c946db745b460",
|
||||||
"revCount": 5480,
|
"revCount": 5475,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/hyprwm/Hyprland/"
|
"url": "https://github.com/hyprwm/Hyprland/"
|
||||||
|
@ -498,11 +498,11 @@
|
||||||
"lix": {
|
"lix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731992627,
|
"lastModified": 1731683711,
|
||||||
"narHash": "sha256-OjrXEVD8LtZB5X7LtPCdNx4n5iZOQ2nJmpDlM/foEkI=",
|
"narHash": "sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE=",
|
||||||
"rev": "f116608a20430b8484814300cdf22eebeb75a59f",
|
"rev": "c859d03013712b349d82ee6223948d6d03e63a8d",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f116608a20430b8484814300cdf22eebeb75a59f.tar.gz?rev=f116608a20430b8484814300cdf22eebeb75a59f"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c859d03013712b349d82ee6223948d6d03e63a8d.tar.gz?rev=c859d03013712b349d82ee6223948d6d03e63a8d"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
@ -521,11 +521,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731967274,
|
"lastModified": 1731185731,
|
||||||
"narHash": "sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0=",
|
"narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=",
|
||||||
"rev": "aa2846680fa9a2032939d720487942567fd9eb63",
|
"rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/aa2846680fa9a2032939d720487942567fd9eb63.tar.gz?rev=aa2846680fa9a2032939d720487942567fd9eb63"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/691193879d96bdfd1e6ab5ebcca2fadc7604cf34.tar.gz?rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
@ -745,11 +745,11 @@
|
||||||
"nixpkgs": "nixpkgs_6"
|
"nixpkgs": "nixpkgs_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732026056,
|
"lastModified": 1731954473,
|
||||||
"narHash": "sha256-ZXYNxTYD3uWtWrU/SMH43w1QRygDSoX1KEMhpwRrB5Y=",
|
"narHash": "sha256-iNzMvn3P/3tinhRpYQVSVukrFP22qqlQ59a9kKYN7LU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs-wayland",
|
"repo": "nixpkgs-wayland",
|
||||||
"rev": "5181aa924e9e322d2dcb610ec73d8bae73c1286d",
|
"rev": "8cfa4547f95836136691e10493f18155694f198a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -58,8 +58,7 @@ let
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
openssl
|
openssl
|
||||||
nim
|
nim
|
||||||
self.packages.${pkgs.system}.nimble
|
nimble
|
||||||
# nimble
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
flake,
|
flake,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkOizysModule config "hyprland" {
|
mkOizysModule config "hyprland" {
|
||||||
programs.hyprland = enabled;
|
programs.hyprland = enabled;
|
||||||
security.pam.services.swaylock = { };
|
security.pam.services.swaylock = { };
|
||||||
|
@ -41,14 +42,8 @@ mkOizysModule config "hyprland" {
|
||||||
|
|
||||||
# not even clear why I need to add this but ¯\_(ツ)_/¯
|
# not even clear why I need to add this but ¯\_(ツ)_/¯
|
||||||
kdePackages.qtwayland
|
kdePackages.qtwayland
|
||||||
|
|
||||||
])
|
])
|
||||||
++ [
|
++ [ (flake.pkg "hyprman") ]
|
||||||
(flake.pkg "hyprman")
|
|
||||||
((flake.pkgs "self").flameshot.override {
|
|
||||||
enableWlrSupport = true;
|
|
||||||
})
|
|
||||||
]
|
|
||||||
|
|
||||||
# swww-git is broken
|
# swww-git is broken
|
||||||
++ (with (flake.pkgs "nixpkgs-wayland"); [
|
++ (with (flake.pkgs "nixpkgs-wayland"); [
|
||||||
|
@ -64,6 +59,7 @@ mkOizysModule config "hyprland" {
|
||||||
# (overlayFrom "hyprland")
|
# (overlayFrom "hyprland")
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
services.getty = {
|
services.getty = {
|
||||||
extraArgs = [ "--skip-login" ];
|
extraArgs = [ "--skip-login" ];
|
||||||
loginOptions = "-p -- ${config.oizys.user}";
|
loginOptions = "-p -- ${config.oizys.user}";
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
flake,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
|
@ -13,9 +12,8 @@ in
|
||||||
config = mkIfIn "nim" cfg {
|
config = mkIfIn "nim" cfg {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
nim
|
nim
|
||||||
# nimble
|
nimble
|
||||||
nimlangserver
|
nimlangserver
|
||||||
(flake.pkgs "self").nimble
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,17 +1,11 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let
|
let inherit (pkgs) python3Packages;
|
||||||
inherit (pkgs) python3Packages;
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# nph = pkgs.callPackage ./nim/nph { }; # doesn't compile with 2.2.0 :/
|
# nph = pkgs.callPackage ./nim/nph { }; # doesn't compile with 2.2.0 :/
|
||||||
# nimlangserver = pkgs.callPackage ./nim/nimlangserver { };
|
# nimlangserver = pkgs.callPackage ./nim/nimlangserver { };
|
||||||
nimble = pkgs.callPackage ./nim/nimble { };
|
nimble = pkgs.callPackage ./nim/nimble { };
|
||||||
|
|
||||||
distrobox = pkgs.callPackage ./distrobox {};
|
distrobox = pkgs.callPackage ./distrobox {};
|
||||||
|
|
||||||
llm = python3Packages.callPackage ./llm {};
|
llm = python3Packages.callPackage ./llm {};
|
||||||
llm-claude-3 = python3Packages.callPackage ./llm-plugins/llm-claude-3 {};
|
llm-claude-3 = python3Packages.callPackage ./llm-plugins/llm-claude-3 {};
|
||||||
|
|
||||||
flameshot = pkgs.callPackage ./flameshot { };
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,136 +0,0 @@
|
||||||
{
|
|
||||||
stdenv,
|
|
||||||
lib,
|
|
||||||
overrideSDK,
|
|
||||||
fetchFromGitHub,
|
|
||||||
fetchpatch,
|
|
||||||
cmake,
|
|
||||||
imagemagick,
|
|
||||||
libicns,
|
|
||||||
libsForQt5,
|
|
||||||
grim,
|
|
||||||
makeBinaryWrapper,
|
|
||||||
nix-update-script,
|
|
||||||
enableWlrSupport ? false,
|
|
||||||
enableMonochromeIcon ? false,
|
|
||||||
}:
|
|
||||||
|
|
||||||
assert stdenv.hostPlatform.isDarwin -> (!enableWlrSupport);
|
|
||||||
|
|
||||||
let
|
|
||||||
stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv'.mkDerivation {
|
|
||||||
pname = "flameshot";
|
|
||||||
# wlr screenshotting is currently only available on unstable version (>12.1.0)
|
|
||||||
version = "12.1.0-unstable-2024-11-18";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "flameshot-org";
|
|
||||||
repo = "flameshot";
|
|
||||||
rev = "729f494d535356adfbd65dc127a5c82ea218006e";
|
|
||||||
hash = "sha256-hrUPBVWnTYvgcWOSnRQAywr6RG5qMph5Nf0AbnKdpj0=";
|
|
||||||
};
|
|
||||||
|
|
||||||
# is this necessary with newer versions?
|
|
||||||
# patches = [
|
|
||||||
# # https://github.com/flameshot-org/flameshot/pull/3166
|
|
||||||
# # fixes fractional scaling calculations on wayland
|
|
||||||
# (fetchpatch {
|
|
||||||
# name = "10-fix-wayland.patch";
|
|
||||||
# url = "https://github.com/flameshot-org/flameshot/commit/5fea9144501f7024344d6f29c480b000b2dcd5a6.patch";
|
|
||||||
# hash = "sha256-SnjVbFMDKD070vR4vGYrwLw6scZAFaQA4b+MbI+0W9E=";
|
|
||||||
# })
|
|
||||||
# ];
|
|
||||||
|
|
||||||
cmakeFlags =
|
|
||||||
[
|
|
||||||
(lib.cmakeBool "DISABLE_UPDATE_CHECKER" true)
|
|
||||||
(lib.cmakeBool "USE_MONOCHROME_ICON" enableMonochromeIcon)
|
|
||||||
]
|
|
||||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
|
||||||
(lib.cmakeBool "USE_WAYLAND_CLIPBOARD" true)
|
|
||||||
(lib.cmakeBool "USE_WAYLAND_GRIM" enableWlrSupport)
|
|
||||||
]
|
|
||||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
|
||||||
(lib.cmakeFeature "Qt5_DIR" "${libsForQt5.qtbase.dev}/lib/cmake/Qt5")
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs =
|
|
||||||
[
|
|
||||||
cmake
|
|
||||||
libsForQt5.qttools
|
|
||||||
libsForQt5.qtsvg
|
|
||||||
libsForQt5.wrapQtAppsHook
|
|
||||||
makeBinaryWrapper
|
|
||||||
]
|
|
||||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
|
||||||
imagemagick
|
|
||||||
libicns
|
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
libsForQt5.qtbase
|
|
||||||
libsForQt5.kguiaddons
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
|
||||||
# Fix icns generation running concurrently with png generation
|
|
||||||
sed -E -i '/"iconutil -o/i\
|
|
||||||
)\
|
|
||||||
execute_process(\
|
|
||||||
' src/CMakeLists.txt
|
|
||||||
|
|
||||||
# Replace unavailable commands
|
|
||||||
sed -E -i \
|
|
||||||
-e 's/"sips -z ([0-9]+) ([0-9]+) +(.+) --out /"magick \3 -resize \1x\2\! /' \
|
|
||||||
-e 's/"iconutil -o (.+) -c icns (.+)"/"png2icns \1 \2\/*{16,32,128,256,512}.png"/' \
|
|
||||||
src/CMakeLists.txt
|
|
||||||
'';
|
|
||||||
|
|
||||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
|
||||||
mkdir $out/Applications
|
|
||||||
mv $out/bin/flameshot.app $out/Applications
|
|
||||||
|
|
||||||
ln -s $out/Applications/flameshot.app/Contents/MacOS/flameshot $out/bin/flameshot
|
|
||||||
|
|
||||||
rm -r $out/share/applications
|
|
||||||
rm -r $out/share/dbus*
|
|
||||||
rm -r $out/share/icons
|
|
||||||
rm -r $out/share/metainfo
|
|
||||||
'';
|
|
||||||
|
|
||||||
dontWrapQtApps = true;
|
|
||||||
|
|
||||||
postFixup =
|
|
||||||
let
|
|
||||||
binary =
|
|
||||||
if stdenv.hostPlatform.isDarwin then
|
|
||||||
"Applications/flameshot.app/Contents/MacOS/flameshot"
|
|
||||||
else
|
|
||||||
"bin/flameshot";
|
|
||||||
in
|
|
||||||
''
|
|
||||||
wrapProgram $out/${binary} \
|
|
||||||
${lib.optionalString enableWlrSupport "--prefix PATH : ${lib.makeBinPath [ grim ]}"} \
|
|
||||||
''${qtWrapperArgs[@]}
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru = {
|
|
||||||
updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
|
||||||
};
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Powerful yet simple to use screenshot software";
|
|
||||||
homepage = "https://github.com/flameshot-org/flameshot";
|
|
||||||
changelog = "https://github.com/flameshot-org/flameshot/releases";
|
|
||||||
mainProgram = "flameshot";
|
|
||||||
maintainers = with maintainers; [
|
|
||||||
scode
|
|
||||||
oxalica
|
|
||||||
];
|
|
||||||
license = licenses.gpl3Plus;
|
|
||||||
platforms = platforms.linux ++ platforms.darwin;
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -8,7 +8,7 @@ buildNimblePackage {
|
||||||
verions = "unstable";
|
verions = "unstable";
|
||||||
src = lib.cleanSource ./.;
|
src = lib.cleanSource ./.;
|
||||||
nativeBuildInputs = [ openssl ];
|
nativeBuildInputs = [ openssl ];
|
||||||
nimbleDepsHash = "sha256-1YoGvWvoJJSMauDbeH8ZHuK+QQot48Mkye9TeWteT8k=";
|
nimbleDepsHash = "sha256-J/iuDYR5A771zAuRKA94rwXX9L3+KtiodDxQRFO0GEc=";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "nix begat oizys";
|
description = "nix begat oizys";
|
||||||
|
|
|
@ -3,12 +3,12 @@
|
||||||
"packages": {
|
"packages": {
|
||||||
"hwylterm": {
|
"hwylterm": {
|
||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"vcsRevision": "c5f70cec4e40ba396f59162e98c359a1a1ea4fe1",
|
"vcsRevision": "cbeefd675c0884feebad4dc62910092519f8b2ed",
|
||||||
"url": "https://github.com/daylinmorgan/hwylterm",
|
"url": "https://github.com/daylinmorgan/hwylterm",
|
||||||
"downloadMethod": "git",
|
"downloadMethod": "git",
|
||||||
"dependencies": [],
|
"dependencies": [],
|
||||||
"checksums": {
|
"checksums": {
|
||||||
"sha1": "5727969a8e82e29a7581c13cc7cc45996dbca5a1"
|
"sha1": "4d043352ad07388d0181c0fd4cf325317e9306d0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"jsony": {
|
"jsony": {
|
||||||
|
|
|
@ -13,5 +13,5 @@ bin = @["oizys"]
|
||||||
requires "nim >= 2.0.8"
|
requires "nim >= 2.0.8"
|
||||||
requires "jsony"
|
requires "jsony"
|
||||||
requires "zippy"
|
requires "zippy"
|
||||||
requires "https://github.com/daylinmorgan/hwylterm#HEAD"
|
requires "https://github.com/daylinmorgan/hwylterm#cbeefd67"
|
||||||
|
|
||||||
|
|
|
@ -93,7 +93,7 @@ proc getInProgressRun(
|
||||||
while (now() - start) < timeoutDuration:
|
while (now() - start) < timeoutDuration:
|
||||||
let response = getGhApi(fmt"https://api.github.com/repos/daylinmorgan/oizys/actions/workflows/{workflow}/runs")
|
let response = getGhApi(fmt"https://api.github.com/repos/daylinmorgan/oizys/actions/workflows/{workflow}/runs")
|
||||||
let runs = fromJson(response.body, ListGhWorkflowResponse).workflow_runs
|
let runs = fromJson(response.body, ListGhWorkflowResponse).workflow_runs
|
||||||
if runs[0].status in ["in_progress", "queued"]:
|
if runs[0].status == "in_progress":
|
||||||
spinner.stop() # cleanup
|
spinner.stop() # cleanup
|
||||||
return (runs[0], true)
|
return (runs[0], true)
|
||||||
sleep 500
|
sleep 500
|
||||||
|
|
Loading…
Reference in a new issue