mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-11-12 18:43:15 -06:00
Compare commits
1 commit
e3fa982b95
...
dbb354f4aa
| Author | SHA1 | Date | |
|---|---|---|---|
| dbb354f4aa |
7 changed files with 51 additions and 38 deletions
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
|
|
@ -32,14 +32,14 @@ jobs:
|
|||
|
||||
# - uses: ./.github/actions/clean-disk
|
||||
|
||||
- uses: DeterminateSystems/nix-installer-action@v14
|
||||
- uses: DeterminateSystems/nix-installer-action@v13
|
||||
with:
|
||||
source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
|
||||
extra-conf: |
|
||||
experimental-features = pipe-operator
|
||||
accept-flake-config = true
|
||||
|
||||
- uses: DeterminateSystems/magic-nix-cache-action@v8
|
||||
- uses: DeterminateSystems/magic-nix-cache-action@v7
|
||||
|
||||
- uses: cachix/cachix-action@v15
|
||||
with:
|
||||
|
|
|
|||
2
.github/workflows/checks.yml
vendored
2
.github/workflows/checks.yml
vendored
|
|
@ -22,7 +22,7 @@ jobs:
|
|||
with:
|
||||
extra-conf: |
|
||||
accept-flake-config = true
|
||||
- uses: DeterminateSystems/magic-nix-cache-action@v8
|
||||
- uses: DeterminateSystems/magic-nix-cache-action@v7
|
||||
|
||||
- uses: cachix/cachix-action@v15
|
||||
with:
|
||||
|
|
|
|||
4
.github/workflows/update.yml
vendored
4
.github/workflows/update.yml
vendored
|
|
@ -24,7 +24,7 @@ jobs:
|
|||
|
||||
- run: git checkout -B flake-lock
|
||||
|
||||
- uses: DeterminateSystems/nix-installer-action@v14
|
||||
- uses: DeterminateSystems/nix-installer-action@v13
|
||||
with:
|
||||
source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
|
||||
extra-conf: |
|
||||
|
|
@ -80,7 +80,7 @@ jobs:
|
|||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- uses: DeterminateSystems/nix-installer-action@v14
|
||||
- uses: DeterminateSystems/nix-installer-action@v13
|
||||
with:
|
||||
source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
|
||||
extra-conf: |
|
||||
|
|
|
|||
34
README.md
34
README.md
|
|
@ -55,18 +55,30 @@ nix run "github:daylinmorgan/oizys"
|
|||
|
||||
```
|
||||
nix begat oizys
|
||||
Usage:
|
||||
oizys {SUBCMD} [sub-command options & parameters]
|
||||
|
||||
subcommands:
|
||||
help print comprehensive or per-cmd help
|
||||
build nix build
|
||||
cache build and push to cachix
|
||||
ci trigger GHA update flow
|
||||
dry dry run build
|
||||
os nixos-rebuild
|
||||
output output
|
||||
update update and run nixos-rebuild
|
||||
Usage:
|
||||
oizys [command]
|
||||
|
||||
Available Commands:
|
||||
build nix build
|
||||
cache build and push to cachix
|
||||
checks nix build checks
|
||||
ci offload build to GHA
|
||||
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?
|
||||
|
|
|
|||
36
flake.lock
36
flake.lock
|
|
@ -605,11 +605,11 @@
|
|||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726529941,
|
||||
"narHash": "sha256-jj7gvddyUQ3xnZxApiGv5xQaa75f1hYKFdtOfvtkcZ0=",
|
||||
"lastModified": 1723372011,
|
||||
"narHash": "sha256-zqenoufFiPfobw74idorZMG8AXG3DnFzbHplt/Nkvrg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-eval-jobs",
|
||||
"rev": "a7cdbbbd9a7755489267dfd1297c613c824a5920",
|
||||
"rev": "8802412b8747633e9d80639897e4d58fa6290909",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -744,11 +744,11 @@
|
|||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726530502,
|
||||
"narHash": "sha256-ls3VME2/LC1beE63N4KFGCjmUyzMY13evwX9Xi5kJ7A=",
|
||||
"lastModified": 1726496380,
|
||||
"narHash": "sha256-0SPQYespqgqODDBDpdryqWDcwUOObk0NxIMUjRQ7ydY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "6002e05eb85219d1018b3d3f6c8692ac26e2642a",
|
||||
"rev": "cbe4866388730d63d98743cc884062b6374beb41",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -900,11 +900,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726501651,
|
||||
"narHash": "sha256-W2az8KESGyK1PZtJ1SIriu0VRzlCmyVfmnHwa0exMK8=",
|
||||
"lastModified": 1726359326,
|
||||
"narHash": "sha256-Nt7Ywk1lO6S4jLv9CYg7HN9nOhmgV79uUiSLWXA4fPE=",
|
||||
"owner": "roc-lang",
|
||||
"repo": "roc",
|
||||
"rev": "38674aeb9415c47b5ea1c397a7c7f8378cd5cbaf",
|
||||
"rev": "7df11424550bb7955a178190a3b341e34d184a19",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1112,11 +1112,11 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "nix",
|
||||
"lastModified": 1726527644,
|
||||
"narHash": "sha256-WAruDParTj7AY16SNjTDPgXf54vJCQRpRAiED3x9FIM=",
|
||||
"lastModified": 1726326914,
|
||||
"narHash": "sha256-QMOS1KxI1tY3Rxtpc8UkG5vLBonybjJTiNT89ENOvo0=",
|
||||
"owner": "daylinmorgan",
|
||||
"repo": "tsm",
|
||||
"rev": "5991d93bcb216c4cd5345296111fee7027be29cf",
|
||||
"rev": "8c866db5f020cbdbe9ea9123ce4b92478b41ede5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1184,11 +1184,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726532622,
|
||||
"narHash": "sha256-BGaIY1UMGkHbtwlGixSiuzM+g8Nnkvec9fmas3jie/I=",
|
||||
"lastModified": 1726488713,
|
||||
"narHash": "sha256-af/hZxM6+AVuap2g0sshCbIr4jr2D734JwMI+RdoVrQ=",
|
||||
"owner": "mitchellh",
|
||||
"repo": "zig-overlay",
|
||||
"rev": "42a7e61fa262d2fe3df7c9544938ef0dd2a2a56a",
|
||||
"rev": "ff9255e02181bad3562f5f24fa27a26036a5f112",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1209,11 +1209,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726516447,
|
||||
"narHash": "sha256-CV6Mr2zm5ZmtW4RnC3taJqA0tZ0U0ERzLBoO6GfzGWA=",
|
||||
"lastModified": 1726435403,
|
||||
"narHash": "sha256-KB95mT5hMppNqV4uX7det1D1m5Y0rTQotjmGXYnnps0=",
|
||||
"owner": "zigtools",
|
||||
"repo": "zls",
|
||||
"rev": "cf9b49a67b15693d62926ea11d17f53efc60be50",
|
||||
"rev": "956b436a3f302d5dbc7fecfa565da666c1b2df77",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -95,9 +95,10 @@ proc setupCligen() =
|
|||
let isColor = getEnv("NO_COLOR") == ""
|
||||
if 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"
|
||||
else: "${doc}Usage:\n $command {SUBCMD} [sub-command options & parameters]\n\nsubcommands:\n$subcmds"
|
||||
|
||||
if isColor:
|
||||
"${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 clCfg.helpAttr.len == 0:
|
||||
clCfg.helpAttr = {"cmd": "\e[1;36m", "clDescrip": "", "clDflVal": "\e[33m",
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ proc systemPathDrvsToBuild(): seq[string] =
|
|||
result = inputDrvs.filterIt(it in toBuild)
|
||||
let nToBuild = result.len
|
||||
result = result.filterIt(not it.isIgnored)
|
||||
let nIgnored = nToBuild - result.len
|
||||
let nIgnored = result.len - nToBuild
|
||||
debug fmt"ignored {nIgnored} derivations"
|
||||
result = result.mapIt(it & "^*")
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue