mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-23 06:50:45 -06:00
Compare commits
6 commits
dbb354f4aa
...
e3fa982b95
Author | SHA1 | Date | |
---|---|---|---|
e3fa982b95 | |||
d1921985b3 | |||
59c9fe94a5 | |||
719d67b0d0 | |||
|
6ce6c9e29b | ||
|
8472d2089b |
7 changed files with 66 additions and 79 deletions
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
|
@ -32,14 +32,14 @@ jobs:
|
||||||
|
|
||||||
# - uses: ./.github/actions/clean-disk
|
# - uses: ./.github/actions/clean-disk
|
||||||
|
|
||||||
- uses: DeterminateSystems/nix-installer-action@v13
|
- uses: DeterminateSystems/nix-installer-action@v14
|
||||||
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@v7
|
- uses: DeterminateSystems/magic-nix-cache-action@v8
|
||||||
|
|
||||||
- uses: cachix/cachix-action@v15
|
- uses: cachix/cachix-action@v15
|
||||||
with:
|
with:
|
||||||
|
|
2
.github/workflows/checks.yml
vendored
2
.github/workflows/checks.yml
vendored
|
@ -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@v7
|
- uses: DeterminateSystems/magic-nix-cache-action@v8
|
||||||
|
|
||||||
- uses: cachix/cachix-action@v15
|
- uses: cachix/cachix-action@v15
|
||||||
with:
|
with:
|
||||||
|
|
4
.github/workflows/update.yml
vendored
4
.github/workflows/update.yml
vendored
|
@ -24,7 +24,7 @@ jobs:
|
||||||
|
|
||||||
- run: git checkout -B flake-lock
|
- run: git checkout -B flake-lock
|
||||||
|
|
||||||
- uses: DeterminateSystems/nix-installer-action@v13
|
- uses: DeterminateSystems/nix-installer-action@v14
|
||||||
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@v13
|
- uses: DeterminateSystems/nix-installer-action@v14
|
||||||
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: |
|
||||||
|
|
32
README.md
32
README.md
|
@ -55,30 +55,18 @@ nix run "github:daylinmorgan/oizys"
|
||||||
|
|
||||||
```
|
```
|
||||||
nix begat oizys
|
nix begat oizys
|
||||||
|
|
||||||
Usage:
|
Usage:
|
||||||
oizys [command]
|
oizys {SUBCMD} [sub-command options & parameters]
|
||||||
|
|
||||||
Available Commands:
|
subcommands:
|
||||||
build nix build
|
help print comprehensive or per-cmd help
|
||||||
cache build and push to cachix
|
build nix build
|
||||||
checks nix build checks
|
cache build and push to cachix
|
||||||
ci offload build to GHA
|
ci trigger GHA update flow
|
||||||
dry poor man's nix flake check
|
dry dry run build
|
||||||
help Help about any command
|
os nixos-rebuild
|
||||||
os nixos-rebuild wrapper
|
output output
|
||||||
output show nixosConfiguration attr
|
update update and run nixos-rebuild
|
||||||
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?
|
||||||
|
|
94
flake.lock
94
flake.lock
|
@ -323,11 +323,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726353438,
|
"lastModified": 1726430622,
|
||||||
"narHash": "sha256-DLSpQXNt6LLkhREYrnhU+/XrfDNiSN41iD575ua9+yA=",
|
"narHash": "sha256-50vt1snpVwS5lqvvH4p6DHiEWspJUZuJ1kYy1DKtrfM=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "e74efd87e5aa38f9cf84cb3848ee1ab26e5e4bcb",
|
"rev": "9e356562446f44c471ae38a80506a9df039305d6",
|
||||||
"revCount": 5221,
|
"revCount": 5224,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/hyprwm/Hyprland/"
|
"url": "https://github.com/hyprwm/Hyprland/"
|
||||||
|
@ -488,11 +488,11 @@
|
||||||
"nixpkgs-lib": "nixpkgs-lib"
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725797487,
|
"lastModified": 1726402305,
|
||||||
"narHash": "sha256-1NqTS6PePeoLVH8UY6poIoxlNq1Hhgn7RZs+OT8b2wQ=",
|
"narHash": "sha256-Ps21x+17J0rclqg68crak2Vo/P3+1fZStqmV+OI7k6M=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "lib-aggregate",
|
"repo": "lib-aggregate",
|
||||||
"rev": "3c180ce6583583285ef1b105cbc1667ba00c3e8d",
|
"rev": "90b637e33ab9be23e0ba3c57905a1837561923ea",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -504,11 +504,11 @@
|
||||||
"lix": {
|
"lix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726342126,
|
"lastModified": 1726411950,
|
||||||
"narHash": "sha256-SqATcoZoC90sjVXmjBpvXAiksQfTGR08nuZh4h8esY0=",
|
"narHash": "sha256-OnPGWKN3mJCsbdt4zOCVSTWg8N9QX+VTCXDcYviStTk=",
|
||||||
"rev": "727258241fc0b3c02691b72302d2c3092baca275",
|
"rev": "80202e3ca314c21547c48f3a23d3f629cd9ddb87",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/727258241fc0b3c02691b72302d2c3092baca275.tar.gz?rev=727258241fc0b3c02691b72302d2c3092baca275"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/80202e3ca314c21547c48f3a23d3f629cd9ddb87.tar.gz?rev=80202e3ca314c21547c48f3a23d3f629cd9ddb87"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
@ -605,11 +605,11 @@
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723372011,
|
"lastModified": 1726529941,
|
||||||
"narHash": "sha256-zqenoufFiPfobw74idorZMG8AXG3DnFzbHplt/Nkvrg=",
|
"narHash": "sha256-jj7gvddyUQ3xnZxApiGv5xQaa75f1hYKFdtOfvtkcZ0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-eval-jobs",
|
"repo": "nix-eval-jobs",
|
||||||
"rev": "8802412b8747633e9d80639897e4d58fa6290909",
|
"rev": "a7cdbbbd9a7755489267dfd1297c613c824a5920",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -647,11 +647,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725765290,
|
"lastModified": 1726449931,
|
||||||
"narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=",
|
"narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "642275444c5a9defce57219c944b3179bf2adaa9",
|
"rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -692,11 +692,11 @@
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725882169,
|
"lastModified": 1726477654,
|
||||||
"narHash": "sha256-v5L+Dh6KdyycIgcdIc6SQ1fRNNvFJmYz02+fyeptA2o=",
|
"narHash": "sha256-nE34QJfnkLZyZIVOXd73iICyvYROVSOo4h7pVRs0mqg=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NixOS-WSL",
|
"repo": "NixOS-WSL",
|
||||||
"rev": "34b95b3962f5b3436d4bae5091d1b2ff7c1eb180",
|
"rev": "20630a560fa658b1f4fc16e6ef2b6b3d6f8539f5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -723,11 +723,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-lib": {
|
"nixpkgs-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725757153,
|
"lastModified": 1726362065,
|
||||||
"narHash": "sha256-c1a6iLmCVPFI9EUVMrBN8xdmFxFXEjcVwiTSVmqajOs=",
|
"narHash": "sha256-4h15WKdrs9zf6DGaeeV7ntU/pHHGkH6geYt1QBW0CP4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs.lib",
|
"repo": "nixpkgs.lib",
|
||||||
"rev": "68584f89dd0eb16fea5d80ae127f3f681f6a5df7",
|
"rev": "9db4db09d82e4b2207bfa7f1e747a4f49d214555",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -744,11 +744,11 @@
|
||||||
"nixpkgs": "nixpkgs_6"
|
"nixpkgs": "nixpkgs_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726348607,
|
"lastModified": 1726530502,
|
||||||
"narHash": "sha256-9Y3WXlXemlgmyzusDn4igL6UYg0Ye2fi7fcQL/gg6BA=",
|
"narHash": "sha256-ls3VME2/LC1beE63N4KFGCjmUyzMY13evwX9Xi5kJ7A=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs-wayland",
|
"repo": "nixpkgs-wayland",
|
||||||
"rev": "f7a91cffe777b139d0b4e4e54d480950018ab37b",
|
"rev": "6002e05eb85219d1018b3d3f6c8692ac26e2642a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -775,11 +775,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725693463,
|
"lastModified": 1726320982,
|
||||||
"narHash": "sha256-ZPzhebbWBOr0zRWW10FfqfbJlan3G96/h3uqhiFqmwg=",
|
"narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "68e7dce0a6532e876980764167ad158174402c6f",
|
"rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -791,11 +791,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726062873,
|
"lastModified": 1726243404,
|
||||||
"narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
|
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
|
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -823,11 +823,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_6": {
|
"nixpkgs_6": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726062873,
|
"lastModified": 1726243404,
|
||||||
"narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
|
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
|
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -900,11 +900,11 @@
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726146664,
|
"lastModified": 1726501651,
|
||||||
"narHash": "sha256-lDUWuoj+iNGdHec5FnzDemhxs7xQgSAMcBlr+vrbTQk=",
|
"narHash": "sha256-W2az8KESGyK1PZtJ1SIriu0VRzlCmyVfmnHwa0exMK8=",
|
||||||
"owner": "roc-lang",
|
"owner": "roc-lang",
|
||||||
"repo": "roc",
|
"repo": "roc",
|
||||||
"rev": "1993cd336b95b9b76d22db1e9e7821de68263910",
|
"rev": "38674aeb9415c47b5ea1c397a7c7f8378cd5cbaf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1112,11 +1112,11 @@
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "nix",
|
"dir": "nix",
|
||||||
"lastModified": 1726326914,
|
"lastModified": 1726527644,
|
||||||
"narHash": "sha256-QMOS1KxI1tY3Rxtpc8UkG5vLBonybjJTiNT89ENOvo0=",
|
"narHash": "sha256-WAruDParTj7AY16SNjTDPgXf54vJCQRpRAiED3x9FIM=",
|
||||||
"owner": "daylinmorgan",
|
"owner": "daylinmorgan",
|
||||||
"repo": "tsm",
|
"repo": "tsm",
|
||||||
"rev": "8c866db5f020cbdbe9ea9123ce4b92478b41ede5",
|
"rev": "5991d93bcb216c4cd5345296111fee7027be29cf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1184,11 +1184,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726315777,
|
"lastModified": 1726532622,
|
||||||
"narHash": "sha256-lbEfQ3ZWUsmJMeWbrUYDKIIYYas+GUdZVbtgn6txTfU=",
|
"narHash": "sha256-BGaIY1UMGkHbtwlGixSiuzM+g8Nnkvec9fmas3jie/I=",
|
||||||
"owner": "mitchellh",
|
"owner": "mitchellh",
|
||||||
"repo": "zig-overlay",
|
"repo": "zig-overlay",
|
||||||
"rev": "25f9cfc60ec930a6abb0be1ff89b3e27cda1cb59",
|
"rev": "42a7e61fa262d2fe3df7c9544938ef0dd2a2a56a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1209,11 +1209,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725812318,
|
"lastModified": 1726516447,
|
||||||
"narHash": "sha256-kqPJwnlhGByYBE1gqr7WI7O/Em8LmLPTBhPEST8OA8s=",
|
"narHash": "sha256-CV6Mr2zm5ZmtW4RnC3taJqA0tZ0U0ERzLBoO6GfzGWA=",
|
||||||
"owner": "zigtools",
|
"owner": "zigtools",
|
||||||
"repo": "zls",
|
"repo": "zls",
|
||||||
"rev": "dd78968d4c8deefd33addc2b1cc14f60d89ec1a9",
|
"rev": "cf9b49a67b15693d62926ea11d17f53efc60be50",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -95,10 +95,9 @@ proc setupCligen() =
|
||||||
let isColor = getEnv("NO_COLOR") == ""
|
let isColor = getEnv("NO_COLOR") == ""
|
||||||
if clCfg.useMulti == "":
|
if clCfg.useMulti == "":
|
||||||
clCfg.useMulti =
|
clCfg.useMulti =
|
||||||
if isColor:
|
if isColor: "${doc}\e[1mUsage\e[m:\n $command {SUBCMD} [sub-command options & parameters]\n\n\e[1msubcommands\e[m:\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"
|
||||||
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",
|
||||||
|
|
|
@ -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 = result.len - nToBuild
|
let nIgnored = nToBuild - result.len
|
||||||
debug fmt"ignored {nIgnored} derivations"
|
debug fmt"ignored {nIgnored} derivations"
|
||||||
result = result.mapIt(it & "^*")
|
result = result.mapIt(it & "^*")
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue