daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-12-22 22:30:44 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:fdfb119fa705a23e01246ae12c26160c6dadbcb1
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:90b369ab7b38bc46d1dfdeca67b0b36c0077b809
Branches Tags
daylin:flake-lock
daylin:main

No commits in common. "fdfb119fa705a23e01246ae12c26160c6dadbcb1" and "90b369ab7b38bc46d1dfdeca67b0b36c0077b809" have entirely different histories.
fdfb119fa7 ... 90b369ab7b

6 changed files with 36 additions and 39 deletions
Show stats Expand all files Collapse all files

54
flake.lock
View file

@ -363,11 +363,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1730373668, "lastModified": 1730330432,
"narHash": "sha256-8p5JTUGFuhnyuF9lD98ioeE3zYaCmsizLWk4Y3KszAI=", "narHash": "sha256-IfwPXZNjQlToqV37RjUhm9dofHaqZD3BTB4J111OmGQ=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "93b4478e70af6ffb08a4a66a6d0364c3296db296", "rev": "7c7a84ff60f8c1e00c6a0de3f7656f0bbd933d56",
"revCount": 5396, "revCount": 5395,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -543,11 +543,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1730412807, "lastModified": 1730328739,
"narHash": "sha256-6wOpwSw1cM5aMg7thaT+uC3mfea+rBIBuKGEKlQAVes=", "narHash": "sha256-qs7u2nCwfEV93SKV1QSikOwRbHDEA1CWYZiVKI9Hhxk=",
"rev": "8005d1736590df482290992afbb8b1a305166f90", "rev": "beb193d1e2121cdbd51e8309572522ee9a841395",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8005d1736590df482290992afbb8b1a305166f90.tar.gz?rev=8005d1736590df482290992afbb8b1a305166f90" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/beb193d1e2121cdbd51e8309572522ee9a841395.tar.gz?rev=beb193d1e2121cdbd51e8309572522ee9a841395"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -681,11 +681,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1730389079, "lastModified": 1728593025,
"narHash": "sha256-g/CJ/KKe5MGsVx1oCBl0F9aCdcNSDeOw8H7e5QDGa2c=", "narHash": "sha256-j/p2ftkP8MXYEK7Vx65jH/Knr2QkEcRSVoDnVOUDe6Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-eval-jobs", "repo": "nix-eval-jobs",
"rev": "7f9159a16584ee86eed077c8a73e845690b7d513", "rev": "a3307ac4b38b6dae769f771c877a6f2c236ee238",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -836,11 +836,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1730410240, "lastModified": 1730337937,
"narHash": "sha256-PL7RGHRo0fyukX4TRKmtYb5fDA6hCL0Wg8jnSbDL0Zk=", "narHash": "sha256-CCjeZD8RpgDUBlVtfwGHwjz6pNZm9287mKy47mIxLlQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "b96564c7722abb8cfff2fae01cef9d6819fca259", "rev": "1bb7ec644d299edf5b88fd2dc67042d14c6638ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -883,11 +883,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1730200266, "lastModified": 1729880355,
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -915,11 +915,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1730200266, "lastModified": 1729880355,
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1245,11 +1245,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1730391705, "lastModified": 1730325917,
"narHash": "sha256-OxFmkw/4WXidYGFU3TZR0qf2HUbwzqqMFShkBgtHjUA=", "narHash": "sha256-Ku8nypKSmPSIpqfubsnjqFDBnF9m5Pw+9sXHMmZbyFY=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "d86dff8360781e4ccd82a0e5a8efdf1ad07e97db", "rev": "aa0dbe4d05b3109b947f8bd0444228a800f55dc6",
"revCount": 20, "revCount": 18,
"type": "git", "type": "git",
"url": "https://git.dayl.in/daylin/utils.git" "url": "https://git.dayl.in/daylin/utils.git"
}, },
@ -1308,11 +1308,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730421185, "lastModified": 1730334608,
"narHash": "sha256-6KovnDOSMKNPRrdmMCIk/FrvomoD5wkt5zRxhbnQklA=", "narHash": "sha256-NT/xmtGvwkiFfDC+FdIThG387OakQS0hnnT3etJbbNE=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "20b4dafc348320f8deefeed627de70e403742c05", "rev": "0802240ae001576ebf9cf0bbc003a8b1291c910b",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
pkgs/nim/nimble/default.nix
View file

@ -7,12 +7,12 @@
}: }:
buildNimPackage (finalAttrs: { buildNimPackage (finalAttrs: {
pname = "nimble"; pname = "nimble";
version = "0.16.2"; version = "0.16.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nim-lang"; owner = "nim-lang";
repo = "nimble"; repo = "nimble";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-MVHf19UbOWk8Zba2scj06PxdYYOJA6OXrVyDQ9Ku6Us="; hash = "sha256-sa0irAZjQRZLduEMBPf7sHlY1FigBJTR/vIH4ihii/w=";
}; };
buildInputs = [ openssl ]; buildInputs = [ openssl ];
lockFile = ./lock.json; lockFile = ./lock.json;

2
pkgs/oizys/default.nix
View file

@ -8,7 +8,7 @@ buildNimblePackage {
verions = "unstable"; verions = "unstable";
src = lib.cleanSource ./.; src = lib.cleanSource ./.;
nativeBuildInputs = [ openssl ]; nativeBuildInputs = [ openssl ];
nimbleDepsHash = "sha256-0F/rKcLUH95vW3ODB2mgMQ2klbN9rjMeP+LUK0Ucj2w="; nimbleDepsHash = "sha256-RceRnhEkei3RfSCTOJsIiw4GSCyhOZhKoEVHNSw/KvA=";
meta = { meta = {
description = "nix begat oizys"; description = "nix begat oizys";

10
pkgs/oizys/nimble.lock
View file

@ -2,23 +2,23 @@
"version": 2, "version": 2,
"packages": { "packages": {
"cligen": { "cligen": {
"version": "1.7.7", "version": "1.7.6",
"vcsRevision": "f50f887eacfe33866e22f8a0d322e29a1c830cf9", "vcsRevision": "54f1da5d63cf7e116625e2392e85ae54c2b70719",
"url": "https://github.com/c-blake/cligen.git", "url": "https://github.com/c-blake/cligen.git",
"downloadMethod": "git", "downloadMethod": "git",
"dependencies": [], "dependencies": [],
"checksums": { "checksums": {
"sha1": "237596b6be88dcf9ee0bd9732a7baaac526f0c07" "sha1": "853785ddace4ee4f3c6c21bdf7f5e9ff0358eb3f"
} }
}, },
"hwylterm": { "hwylterm": {
"version": "0.1.0", "version": "0.1.0",
"vcsRevision": "56bb2bb7c1da402c2c52fb3f7f10620c7c2fca7e", "vcsRevision": "7e82f7ba5a24d816a79b3a5ea49f32b4c7a5ef7e",
"url": "https://github.com/daylinmorgan/hwylterm", "url": "https://github.com/daylinmorgan/hwylterm",
"downloadMethod": "git", "downloadMethod": "git",
"dependencies": [], "dependencies": [],
"checksums": { "checksums": {
"sha1": "8810cf69a74de580e1ab08f0c153afbf33c8a98e" "sha1": "d6d97bdff3fcdfcf4b39b144fa5f27a6b9f9494d"
} }
}, },
"jsony": { "jsony": {

3
pkgs/oizys/src/oizys/logging.nim
View file

@ -31,9 +31,8 @@ proc setupLoggers*(debug: bool) =
if not debug: lvlInfo if not debug: lvlInfo
else: lvlAll else: lvlAll
addHandler( addHandler(
newHwylConsoleLogger( newFancyConsoleLogger(
fmtPrefix = $bb"[b magenta]oizys", fmtPrefix = $bb"[b magenta]oizys",
fmtSuffix = " ",
levelThreshold = logLevel levelThreshold = logLevel
) )
) )

2
pkgs/oizys/src/oizys/nix.nim
View file

@ -246,8 +246,6 @@ proc nixBuildWithCache*(name: string, rest:seq[string], service: string, jobs: i
quit "exiting...", QuitSuccess quit "exiting...", QuitSuccess
var outs: seq[string] var outs: seq[string]
# TODO: add back reporting to GITHUB SUMMARY
# include time to build?
for drv in drvs: for drv in drvs:
var cmd = "nix build" var cmd = "nix build"
cmd.addArg drv cmd.addArg drv