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

Compare commits

base: daylin:792d40b3aba1aa6e4294078aedb35de4648b0afe
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:1c32119e0b48d27058a283021e5db282b44cbe36
Branches Tags
daylin:flake-lock
daylin:main
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master

5 commits
792d40b3ab ... 1c32119e0b

Author SHA1 Message Date
Daylin Morgan
1c32119e0b
add missing newline 2024-09-17 16:09:04 -05:00
Daylin Morgan
477a9cec89
add python to ignore 2024-09-17 16:09:04 -05:00
daylin-bot
18091e6ded flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=9e356562446f44c471ae38a80506a9df039305d6' (2024-09-15)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=3c9716acfd00c6ea1b7bcd1dc63f97b51cc09998' (2024-09-17)
• Updated input 'lix':
    '80202e3ca3.tar.gz?narHash=sha256-OnPGWKN3mJCsbdt4zOCVSTWg8N9QX%2BVTCXDcYviStTk%3D&rev=80202e3ca314c21547c48f3a23d3f629cd9ddb87' (2024-09-15)
  → '8ab5743904.tar.gz?narHash=sha256-CrvIEzBzvvfE7jGIXBv6hSYDxv4eYeHWAwVho5WrF48%3D&rev=8ab5743904a06c78153281bf61b3aa8aa451a489' (2024-09-17)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/345c263f2f53a3710abe117f28a5cb86d0ba4059' (2024-09-13)
  → 'github:nixos/nixpkgs/99dc8785f6a0adac95f5e2ab05cc2e1bf666d172' (2024-09-16)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/cbe4866388730d63d98743cc884062b6374beb41' (2024-09-16)
  → 'github:nix-community/nixpkgs-wayland/e2d0b0171ddf364b687d091ee603d0c3a7079166' (2024-09-17)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/90b637e33ab9be23e0ba3c57905a1837561923ea' (2024-09-15)
  → 'github:nix-community/lib-aggregate/e0cc0b05b0296fdc52fa683d47a3470dfe4f79ea' (2024-09-17)
• Updated input 'nixpkgs-wayland/lib-aggregate/flake-utils':
    'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11)
  → 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)
• Updated input 'nixpkgs-wayland/nix-eval-jobs':
    'github:nix-community/nix-eval-jobs/8802412b8747633e9d80639897e4d58fa6290909' (2024-08-11)
  → 'github:nix-community/nix-eval-jobs/a7cdbbbd9a7755489267dfd1297c613c824a5920' (2024-09-16)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/345c263f2f53a3710abe117f28a5cb86d0ba4059' (2024-09-13)
  → 'github:nixos/nixpkgs/99dc8785f6a0adac95f5e2ab05cc2e1bf666d172' (2024-09-16)
• Updated input 'roc':
    'github:roc-lang/roc/7df11424550bb7955a178190a3b341e34d184a19' (2024-09-15)
  → 'github:roc-lang/roc/3215a8f3d73daf881185e4f7474972f2059754b6' (2024-09-17)
• Updated input 'tsm':
    'github:daylinmorgan/tsm/8c866db5f020cbdbe9ea9123ce4b92478b41ede5?dir=nix' (2024-09-14)
  → 'github:daylinmorgan/tsm/5991d93bcb216c4cd5345296111fee7027be29cf?dir=nix' (2024-09-16)
• Updated input 'zig-overlay':
    'github:mitchellh/zig-overlay/ff9255e02181bad3562f5f24fa27a26036a5f112' (2024-09-16)
  → 'github:mitchellh/zig-overlay/a2f15c93b689b31044d5604fb0cd5bac818daf01' (2024-09-17)
• Updated input 'zls':
    'github:zigtools/zls/956b436a3f302d5dbc7fecfa565da666c1b2df77' (2024-09-15)
  → 'github:zigtools/zls/cf9b49a67b15693d62926ea11d17f53efc60be50' (2024-09-16)
 2024-09-17 20:52:29 +00:00
Daylin Morgan
8f85abc1fc
add debug back 2024-09-17 15:50:18 -05:00
Daylin Morgan
abf883c176
try new remove strategy 2024-09-17 14:17:46 -05:00
5 changed files with 64 additions and 58 deletions
Show stats Expand all files Collapse all files

21
.github/actions/clean-disk/action.yml vendored
View file

@ -20,7 +20,7 @@ runs:
- name: Maximize build disk space - name: Maximize build disk space
shell: bash shell: bash
run: | run: |
set -euo pipefail set -xeuo pipefail
shopt -s globstar shopt -s globstar
non_manifest_packages() { non_manifest_packages() {
@ -41,26 +41,23 @@ runs:
sudo rm -rf \ sudo rm -rf \
/var/lib/docker/ \ /var/lib/docker/ \
"$AGENT_TOOLSDIRECTORY" \ "$AGENT_TOOLSDIRECTORY" \
/opt \ /opt &
/usr/local/** &
find /usr/share -maxdepth -m -type d -not -name 'git-core' -delete sudo find /usr/{share,local} \
-mindepth 1 -maxdepth 1 \
-type d \
-not -wholename '/usr/share/git-core' \
-exec rm -rf {} + &
# for f in /usr/share/**/!(git-core); do
# sudo rm -rf $f &
# done
# nix flake update wants to find git-core templates
# /usr/share/git-core/templates
# /usr/share/**
{ {
sudo swapoff -a sudo swapoff -a
sudo rm -f /mnt/swapfile sudo rm -f /mnt/swapfile
} & } &
wait wait
echo "... done" echo "... done"
- name: Disk space report after modification - name: Disk space report after modification
shell: bash shell: bash
run: | run: |

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

@ -130,7 +130,7 @@ jobs:
- run: | - run: |
echo "# System Diff" >> $GITHUB_STEP_SUMMARY echo "# System Diff" >> $GITHUB_STEP_SUMMARY
nix run "nixpkgs#nvd" -- --color always diff ./current ./updated >> summary.md nix run "nixpkgs#nvd" -- --color always diff ./current ./updated >> summary.md
printf '```\n%s```\n' "$(nix run "nixpkgs#nvd" -- diff ./current ./updated)" >> $GITHUB_STEP_SUMMARY printf '```\n%s\n```\n' "$(nix run "nixpkgs#nvd" -- diff ./current ./updated)" >> $GITHUB_STEP_SUMMARY
- run: df -h - run: df -h

76
flake.lock
View file

@ -179,11 +179,11 @@
"systems": "systems_4" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1726560853,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -323,11 +323,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1726430622, "lastModified": 1726580240,
"narHash": "sha256-50vt1snpVwS5lqvvH4p6DHiEWspJUZuJ1kYy1DKtrfM=", "narHash": "sha256-VBXNeRJMaiqbIietRihPYnWA7bFJO2wqqlPg0f9Xfjc=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "9e356562446f44c471ae38a80506a9df039305d6", "rev": "3c9716acfd00c6ea1b7bcd1dc63f97b51cc09998",
"revCount": 5224, "revCount": 5227,
"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": 1726402305, "lastModified": 1726600542,
"narHash": "sha256-Ps21x+17J0rclqg68crak2Vo/P3+1fZStqmV+OI7k6M=", "narHash": "sha256-4ZP8rYtad1Z0LY3vZ1eYSRUzqPd3x7K0j7SpP3vReWc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "90b637e33ab9be23e0ba3c57905a1837561923ea", "rev": "e0cc0b05b0296fdc52fa683d47a3470dfe4f79ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -504,11 +504,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726411950, "lastModified": 1726590994,
"narHash": "sha256-OnPGWKN3mJCsbdt4zOCVSTWg8N9QX+VTCXDcYviStTk=", "narHash": "sha256-CrvIEzBzvvfE7jGIXBv6hSYDxv4eYeHWAwVho5WrF48=",
"rev": "80202e3ca314c21547c48f3a23d3f629cd9ddb87", "rev": "8ab5743904a06c78153281bf61b3aa8aa451a489",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/80202e3ca314c21547c48f3a23d3f629cd9ddb87.tar.gz?rev=80202e3ca314c21547c48f3a23d3f629cd9ddb87" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8ab5743904a06c78153281bf61b3aa8aa451a489.tar.gz?rev=8ab5743904a06c78153281bf61b3aa8aa451a489"
}, },
"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": {
@ -744,11 +744,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1726496380, "lastModified": 1726604396,
"narHash": "sha256-0SPQYespqgqODDBDpdryqWDcwUOObk0NxIMUjRQ7ydY=", "narHash": "sha256-N96NVHAYUxK4L7uaeKi45a+v61VIpimzHyQsKctBpb4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "cbe4866388730d63d98743cc884062b6374beb41", "rev": "e2d0b0171ddf364b687d091ee603d0c3a7079166",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -791,11 +791,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1726243404, "lastModified": 1726463316,
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -823,11 +823,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1726243404, "lastModified": 1726463316,
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -900,11 +900,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1726359326, "lastModified": 1726567229,
"narHash": "sha256-Nt7Ywk1lO6S4jLv9CYg7HN9nOhmgV79uUiSLWXA4fPE=", "narHash": "sha256-5BfrNDZBwiG0dN09V7Skd5Bpr2HwVMCdDWOvneQ2iZ4=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "7df11424550bb7955a178190a3b341e34d184a19", "rev": "3215a8f3d73daf881185e4f7474972f2059754b6",
"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": 1726488713, "lastModified": 1726575046,
"narHash": "sha256-af/hZxM6+AVuap2g0sshCbIr4jr2D734JwMI+RdoVrQ=", "narHash": "sha256-XD2qJ30wTLUz7BOXVz1wY/q+RJBvI7f6ksGJrYMbFAg=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "ff9255e02181bad3562f5f24fa27a26036a5f112", "rev": "a2f15c93b689b31044d5604fb0cd5bac818daf01",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1209,11 +1209,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726435403, "lastModified": 1726516447,
"narHash": "sha256-KB95mT5hMppNqV4uX7det1D1m5Y0rTQotjmGXYnnps0=", "narHash": "sha256-CV6Mr2zm5ZmtW4RnC3taJqA0tZ0U0ERzLBoO6GfzGWA=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "956b436a3f302d5dbc7fecfa565da666c1b2df77", "rev": "cf9b49a67b15693d62926ea11d17f53efc60be50",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
pkgs/oizys-nim/src/oizys/ignored.txt
View file

@ -22,3 +22,4 @@ code
direnv direnv
comma-with-db comma-with-db
nix-index-with-db nix-index-with-db
python

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

@ -147,8 +147,18 @@ proc findSystemPaths(drvs: Table[string, NixDerivation]): seq[string] =
assert len(hosts) == len(result) assert len(hosts) == len(result)
proc filterSeq(
drvs: seq[string],
filter: proc(s: string): bool,
): tuple[yes: seq[string], no: seq[string]] =
for drv in drvs:
if filter(drv): result.yes.add drv
else: result.no.add drv
func isIgnored(drv: string): bool = func isIgnored(drv: string): bool =
const ignoredPackages = (slurp "ignored.txt").splitLines() const ignoredPackages = (slurp "ignored.txt").strip().splitLines()
let name = drv.split("-", 1)[1].replace(".drv","") let name = drv.split("-", 1)[1].replace(".drv","")
result = name in ignoredPackages result = name in ignoredPackages
if not result: if not result:
@ -157,17 +167,15 @@ func isIgnored(drv: string): bool =
return true return true
proc systemPathDrvsToBuild(): seq[string] = proc systemPathDrvsToBuild(): seq[string] =
var inputDrvs, dropped: seq[string]
let toBuild = toBuildNixosConfiguration() let toBuild = toBuildNixosConfiguration()
let drvs = evaluateDerivations(nixosConfigAttrs()) let drvs = evaluateDerivations(nixosConfigAttrs())
let systemPaths = findSystemPaths(drvs) let systemPaths = findSystemPaths(drvs)
var inputDrvs: seq[string]
for p in systemPaths: for p in systemPaths:
inputDrvs &= drvs[p].inputDrvs.keys().toSeq() inputDrvs &= drvs[p].inputDrvs.keys().toSeq()
result = inputDrvs.filterIt(it in toBuild) (result, _) = filterSeq(inputDrvs, (s) => s in toBuild)
let nToBuild = result.len (dropped, result) = filterSeq(result, isIgnored)
result = result.filterIt(not it.isIgnored) debug fmt"ignored {dropped.len} derivations"
let nIgnored = nToBuild - result.len
debug fmt"ignored {nIgnored} derivations"
result = result.mapIt(it & "^*") result = result.mapIt(it & "^*")
func splitDrv(drv: string): tuple[name, hash:string] = func splitDrv(drv: string): tuple[name, hash:string] =