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

Compare commits

base: daylin:e3fa982b9556e1ccecd983c703941a45f23a7952
Branches Tags
daylin:main
daylin:flake-lock
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master
..
compare: daylin:dbb354f4aa03f105f17d9e8ef3c262211e8ec0f7
Branches Tags
daylin:main
daylin:flake-lock
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master

1 commit
e3fa982b95 ... dbb354f4aa

Author SHA1 Message Date
daylin-bot
dbb354f4aa flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=e74efd87e5aa38f9cf84cb3848ee1ab26e5e4bcb' (2024-09-14)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=9e356562446f44c471ae38a80506a9df039305d6' (2024-09-15)
• Updated input 'lix':
    '727258241f.tar.gz?narHash=sha256-SqATcoZoC90sjVXmjBpvXAiksQfTGR08nuZh4h8esY0%3D&rev=727258241fc0b3c02691b72302d2c3092baca275' (2024-09-14)
  → '80202e3ca3.tar.gz?narHash=sha256-OnPGWKN3mJCsbdt4zOCVSTWg8N9QX%2BVTCXDcYviStTk%3D&rev=80202e3ca314c21547c48f3a23d3f629cd9ddb87' (2024-09-15)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/642275444c5a9defce57219c944b3179bf2adaa9' (2024-09-08)
  → 'github:nix-community/nix-index-database/c1b0fa0bec5478185eae2fd3f39b9e906fc83995' (2024-09-16)
• Updated input 'nixos-wsl':
    'github:nix-community/NixOS-WSL/34b95b3962f5b3436d4bae5091d1b2ff7c1eb180' (2024-09-09)
  → 'github:nix-community/NixOS-WSL/20630a560fa658b1f4fc16e6ef2b6b3d6f8539f5' (2024-09-16)
• Updated input 'nixos-wsl/nixpkgs':
    'github:NixOS/nixpkgs/68e7dce0a6532e876980764167ad158174402c6f' (2024-09-07)
  → 'github:NixOS/nixpkgs/8f7492cce28977fbf8bd12c72af08b1f6c7c3e49' (2024-09-14)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/4f807e8940284ad7925ebd0a0993d2a1791acb2f' (2024-09-11)
  → 'github:nixos/nixpkgs/345c263f2f53a3710abe117f28a5cb86d0ba4059' (2024-09-13)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/f7a91cffe777b139d0b4e4e54d480950018ab37b' (2024-09-14)
  → 'github:nix-community/nixpkgs-wayland/cbe4866388730d63d98743cc884062b6374beb41' (2024-09-16)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/3c180ce6583583285ef1b105cbc1667ba00c3e8d' (2024-09-08)
  → 'github:nix-community/lib-aggregate/90b637e33ab9be23e0ba3c57905a1837561923ea' (2024-09-15)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/68584f89dd0eb16fea5d80ae127f3f681f6a5df7' (2024-09-08)
  → 'github:nix-community/nixpkgs.lib/9db4db09d82e4b2207bfa7f1e747a4f49d214555' (2024-09-15)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/4f807e8940284ad7925ebd0a0993d2a1791acb2f' (2024-09-11)
  → 'github:nixos/nixpkgs/345c263f2f53a3710abe117f28a5cb86d0ba4059' (2024-09-13)
• Updated input 'roc':
    'github:roc-lang/roc/1993cd336b95b9b76d22db1e9e7821de68263910' (2024-09-12)
  → 'github:roc-lang/roc/7df11424550bb7955a178190a3b341e34d184a19' (2024-09-15)
• Updated input 'zig-overlay':
    'github:mitchellh/zig-overlay/25f9cfc60ec930a6abb0be1ff89b3e27cda1cb59' (2024-09-14)
  → 'github:mitchellh/zig-overlay/ff9255e02181bad3562f5f24fa27a26036a5f112' (2024-09-16)
• Updated input 'zls':
    'github:zigtools/zls/dd78968d4c8deefd33addc2b1cc14f60d89ec1a9' (2024-09-08)
  → 'github:zigtools/zls/956b436a3f302d5dbc7fecfa565da666c1b2df77' (2024-09-15)
 2024-09-16 15:11:08 +00:00
7 changed files with 51 additions and 38 deletions
Show stats Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View file

@ -32,14 +32,14 @@ jobs:
# - uses: ./.github/actions/clean-disk # - uses: ./.github/actions/clean-disk
- uses: DeterminateSystems/nix-installer-action@v14 - uses: DeterminateSystems/nix-installer-action@v13
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 experimental-features = pipe-operator
accept-flake-config = true accept-flake-config = true
- uses: DeterminateSystems/magic-nix-cache-action@v8 - uses: DeterminateSystems/magic-nix-cache-action@v7
- uses: cachix/cachix-action@v15 - uses: cachix/cachix-action@v15
with: with:

2
.github/workflows/checks.yml vendored
View file

@ -22,7 +22,7 @@ jobs:
with: with:
extra-conf: | extra-conf: |
accept-flake-config = true accept-flake-config = true
- uses: DeterminateSystems/magic-nix-cache-action@v8 - uses: DeterminateSystems/magic-nix-cache-action@v7
- uses: cachix/cachix-action@v15 - uses: cachix/cachix-action@v15
with: with:

4
.github/workflows/update.yml vendored
View file

@ -24,7 +24,7 @@ jobs:
- run: git checkout -B flake-lock - run: git checkout -B flake-lock
- uses: DeterminateSystems/nix-installer-action@v14 - uses: DeterminateSystems/nix-installer-action@v13
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: |
@ -80,7 +80,7 @@ jobs:
with: with:
fetch-depth: 0 fetch-depth: 0
- uses: DeterminateSystems/nix-installer-action@v14 - uses: DeterminateSystems/nix-installer-action@v13
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: |

34
README.md
View file

@ -55,18 +55,30 @@ nix run "github:daylinmorgan/oizys"
``` ```
nix begat oizys nix begat oizys
Usage:
oizys {SUBCMD} [sub-command options & parameters]
subcommands: Usage:
help print comprehensive or per-cmd help oizys [command]
build nix build
cache build and push to cachix Available Commands:
ci trigger GHA update flow build nix build
dry dry run build cache build and push to cachix
os nixos-rebuild checks nix build checks
output output ci offload build to GHA
update update and run nixos-rebuild dry poor man's nix flake check
help Help about any command
os nixos-rebuild wrapper
output show nixosConfiguration attr
update update and run nixos rebuild
Flags:
--debug show debug output
--flake string path to flake ($OIZYS_DIR or $HOME/oizys)
-h, --help help for oizys
--host string host(s) to build (current host)
--reset-cache set narinfo-cache-negative-ttl to 0
-v, --verbose show verbose output
Use "oizys [command] --help" for more information about a command.
``` ```
## oizys? ## oizys?

36
flake.lock
View file

@ -605,11 +605,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1726529941, "lastModified": 1723372011,
"narHash": "sha256-jj7gvddyUQ3xnZxApiGv5xQaa75f1hYKFdtOfvtkcZ0=", "narHash": "sha256-zqenoufFiPfobw74idorZMG8AXG3DnFzbHplt/Nkvrg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-eval-jobs", "repo": "nix-eval-jobs",
"rev": "a7cdbbbd9a7755489267dfd1297c613c824a5920", "rev": "8802412b8747633e9d80639897e4d58fa6290909",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -744,11 +744,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1726530502, "lastModified": 1726496380,
"narHash": "sha256-ls3VME2/LC1beE63N4KFGCjmUyzMY13evwX9Xi5kJ7A=", "narHash": "sha256-0SPQYespqgqODDBDpdryqWDcwUOObk0NxIMUjRQ7ydY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "6002e05eb85219d1018b3d3f6c8692ac26e2642a", "rev": "cbe4866388730d63d98743cc884062b6374beb41",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -900,11 +900,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1726501651, "lastModified": 1726359326,
"narHash": "sha256-W2az8KESGyK1PZtJ1SIriu0VRzlCmyVfmnHwa0exMK8=", "narHash": "sha256-Nt7Ywk1lO6S4jLv9CYg7HN9nOhmgV79uUiSLWXA4fPE=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "38674aeb9415c47b5ea1c397a7c7f8378cd5cbaf", "rev": "7df11424550bb7955a178190a3b341e34d184a19",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1112,11 +1112,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1726527644, "lastModified": 1726326914,
"narHash": "sha256-WAruDParTj7AY16SNjTDPgXf54vJCQRpRAiED3x9FIM=", "narHash": "sha256-QMOS1KxI1tY3Rxtpc8UkG5vLBonybjJTiNT89ENOvo0=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "tsm", "repo": "tsm",
"rev": "5991d93bcb216c4cd5345296111fee7027be29cf", "rev": "8c866db5f020cbdbe9ea9123ce4b92478b41ede5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1184,11 +1184,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726532622, "lastModified": 1726488713,
"narHash": "sha256-BGaIY1UMGkHbtwlGixSiuzM+g8Nnkvec9fmas3jie/I=", "narHash": "sha256-af/hZxM6+AVuap2g0sshCbIr4jr2D734JwMI+RdoVrQ=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "42a7e61fa262d2fe3df7c9544938ef0dd2a2a56a", "rev": "ff9255e02181bad3562f5f24fa27a26036a5f112",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1209,11 +1209,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726516447, "lastModified": 1726435403,
"narHash": "sha256-CV6Mr2zm5ZmtW4RnC3taJqA0tZ0U0ERzLBoO6GfzGWA=", "narHash": "sha256-KB95mT5hMppNqV4uX7det1D1m5Y0rTQotjmGXYnnps0=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "cf9b49a67b15693d62926ea11d17f53efc60be50", "rev": "956b436a3f302d5dbc7fecfa565da666c1b2df77",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
pkgs/oizys-nim/src/oizys.nim
View file

@ -95,9 +95,10 @@ proc setupCligen() =
let isColor = getEnv("NO_COLOR") == "" let isColor = getEnv("NO_COLOR") == ""
if clCfg.useMulti == "": if clCfg.useMulti == "":
clCfg.useMulti = clCfg.useMulti =
if isColor: "${doc}\e[1mUsage\e[m:\n $command {SUBCMD} [sub-command options & parameters]\n\n\e[1msubcommands\e[m:\n$subcmds" if isColor:
else: "${doc}Usage:\n $command {SUBCMD} [sub-command options & parameters]\n\nsubcommands:\n$subcmds" "${doc}\e[1mUsage\e[m:\n $command {SUBCMD} [sub-command options & parameters]\n\n\e[1msubcommands\e[m:\n$subcmds"
else:
"${doc}Usage:\n $command {SUBCMD} [sub-command options & parameters]\n\nsubcommands:\n$subcmds"
if not isColor: return if not isColor: return
if clCfg.helpAttr.len == 0: if clCfg.helpAttr.len == 0:
clCfg.helpAttr = {"cmd": "\e[1;36m", "clDescrip": "", "clDflVal": "\e[33m", clCfg.helpAttr = {"cmd": "\e[1;36m", "clDescrip": "", "clDflVal": "\e[33m",

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

@ -162,7 +162,7 @@ proc systemPathDrvsToBuild(): seq[string] =
result = inputDrvs.filterIt(it in toBuild) result = inputDrvs.filterIt(it in toBuild)
let nToBuild = result.len let nToBuild = result.len
result = result.filterIt(not it.isIgnored) result = result.filterIt(not it.isIgnored)
let nIgnored = nToBuild - result.len let nIgnored = result.len - nToBuild
debug fmt"ignored {nIgnored} derivations" debug fmt"ignored {nIgnored} derivations"
result = result.mapIt(it & "^*") result = result.mapIt(it & "^*")