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

Compare commits

base: daylin:e78ec9619318948745273c233bd79c29f49af2ca
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:3c730fb6f10a79adede40295554fb2badb9829a9
Branches Tags
daylin:flake-lock
daylin:main

3 commits
e78ec96193 ... 3c730fb6f1

Author SHA1 Message Date
Daylin Morgan
3c730fb6f1
rework cache build 2024-10-30 17:12:52 -05:00
Daylin Morgan
4a5cae6ee1
not sure how to convince nix so I'll just suffer 2024-10-30 16:03:25 -05:00
daylin-bot
7d8caeb48b flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=f0e023bff2f2a25ffe5ed3166f55f7274d17c6bc' (2024-10-25)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=5f721dce36651232ae245d872c17dfa3aae5cc6c' (2024-10-30)
• Updated input 'hyprman':
    'git+https://git.dayl.in/daylin/hyprman.git?ref=refs/heads/main&rev=952d79d368862d74b4ad233df57883fdd1974c4c' (2024-10-25)
  → 'git+https://git.dayl.in/daylin/hyprman.git?ref=refs/heads/main&rev=8a866a8082a8debb356b257df1af6ce3becbd1a6' (2024-10-30)
• Updated input 'lix':
    '2734a9cf94.tar.gz?narHash=sha256-XME7TzBvjK6GEmZqPLK%2B2%2BWk0qnwc7DCwYH434hMcOM%3D&rev=2734a9cf94debc6baef4e7d4d9fa28cc28f5b31d' (2024-10-23)
  → '8b2f8d538b.tar.gz?narHash=sha256-NbqHiXQW8IMUPME49Z2pjSqTW8t%2BFoEWMmXSZNubfeQ%3D&rev=8b2f8d538b0e5702fc48e8b60c2952aff847b9f1' (2024-10-30)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/04f8a11f247ba00263b060fbcdc95484fd046104' (2024-10-20)
  → 'github:nix-community/nix-index-database/0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f' (2024-10-27)
• Updated input 'nixos-wsl':
    'github:nix-community/NixOS-WSL/5a965cb108fb1f30b29a26dbc29b473f49e80b41' (2024-10-23)
  → 'github:nix-community/NixOS-WSL/b124084667fb4c912fda68fdd9d05f59e18b6ef7' (2024-10-28)
• Updated input 'nixos-wsl/nixpkgs':
    'github:NixOS/nixpkgs/4eb33fe664af7b41a4c446f87d20c9a0a6321fa3' (2024-10-17)
  → 'github:NixOS/nixpkgs/cd3e8833d70618c4eea8df06f95b364b016d4950' (2024-10-26)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/2768c7d042a37de65bb1b5b3268fc987e534c49d' (2024-10-23)
  → 'github:nixos/nixpkgs/18536bf04cd71abd345f9579158841376fdd0c5a' (2024-10-25)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/833950fe76340407ce9d9fc409994b11476cd22e' (2024-10-25)
  → 'github:nix-community/nixpkgs-wayland/d3bb51e62dd4a31c7cfea0f1ad511e53774a79fe' (2024-10-29)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/736c43de3c953104e1610183d56e90b419c6344e' (2024-10-20)
  → 'github:nix-community/lib-aggregate/7d235f23a84b54c39b1579b68b13e1ff83f5b1ad' (2024-10-27)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/cce4521b6df014e79a7b7afc58c703ed683c916e' (2024-10-20)
  → 'github:nix-community/nixpkgs.lib/7d68864343650322045894951602d6e82b5296d7' (2024-10-27)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/2768c7d042a37de65bb1b5b3268fc987e534c49d' (2024-10-23)
  → 'github:nixos/nixpkgs/18536bf04cd71abd345f9579158841376fdd0c5a' (2024-10-25)
• Updated input 'roc':
    'github:roc-lang/roc/e1183e58e55397fe07b08981937c4f626ca7db42' (2024-10-25)
  → 'github:roc-lang/roc/69dd8d77f3127cb21eaa34f8c7533930e30b923a' (2024-10-30)
• Updated input 'zig-overlay':
    'github:mitchellh/zig-overlay/71a0618a10c2fb8d6c60b3498bcdb5dc4573e403' (2024-10-25)
  → 'github:mitchellh/zig-overlay/8abb78710aa4f1cd468953ded410d0711379fada' (2024-10-30)
• Updated input 'zls':
    'github:zigtools/zls/5acc06679321aeff5f6d2f05ebb52520f734a8b8' (2024-10-24)
  → 'github:zigtools/zls/b2e89dfe92850cf02cbd4b73004aaaecd5cf1739' (2024-10-27)
 2024-10-30 14:59:40 +00:00
4 changed files with 72 additions and 65 deletions
Show stats Expand all files Collapse all files

88
flake.lock
View file

@ -363,11 +363,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1729852008, "lastModified": 1730282458,
"narHash": "sha256-Rw5fexgBeZ96EPs557mDW3pyTzFm3tVGHWPgPlPSQk8=", "narHash": "sha256-J7DTSBuWRtcWy8ivmj8fXl5ovQLCH3t+Y6o+EQkRk5U=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "f0e023bff2f2a25ffe5ed3166f55f7274d17c6bc", "rev": "5f721dce36651232ae245d872c17dfa3aae5cc6c",
"revCount": 5373, "revCount": 5391,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -458,11 +458,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729867383, "lastModified": 1730299948,
"narHash": "sha256-LlSUVwL4Q7OHxemZFTBOdr+N6+SzaRA/giCePHZmI6I=", "narHash": "sha256-RGP06zJWKK7D3E9xrK0DnW4gzcmITy6U7RuePxVX0jI=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "952d79d368862d74b4ad233df57883fdd1974c4c", "rev": "8a866a8082a8debb356b257df1af6ce3becbd1a6",
"revCount": 15, "revCount": 16,
"type": "git", "type": "git",
"url": "https://git.dayl.in/daylin/hyprman.git" "url": "https://git.dayl.in/daylin/hyprman.git"
}, },
@ -527,11 +527,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1729426412, "lastModified": 1730031145,
"narHash": "sha256-VGbpECf35W4LtWLfx2+ue8zZEPwKQnadJadlT8E1Ceo=", "narHash": "sha256-GZz0LGkeduajnF7zUuPu5evNyoOATcSsRZCkG1OqiwY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "736c43de3c953104e1610183d56e90b419c6344e", "rev": "7d235f23a84b54c39b1579b68b13e1ff83f5b1ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -543,11 +543,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729696851, "lastModified": 1730300203,
"narHash": "sha256-XME7TzBvjK6GEmZqPLK+2+Wk0qnwc7DCwYH434hMcOM=", "narHash": "sha256-NbqHiXQW8IMUPME49Z2pjSqTW8t+FoEWMmXSZNubfeQ=",
"rev": "2734a9cf94debc6baef4e7d4d9fa28cc28f5b31d", "rev": "8b2f8d538b0e5702fc48e8b60c2952aff847b9f1",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2734a9cf94debc6baef4e7d4d9fa28cc28f5b31d.tar.gz?rev=2734a9cf94debc6baef4e7d4d9fa28cc28f5b31d" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8b2f8d538b0e5702fc48e8b60c2952aff847b9f1.tar.gz?rev=8b2f8d538b0e5702fc48e8b60c2952aff847b9f1"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -723,11 +723,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729394935, "lastModified": 1729999765,
"narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=", "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "04f8a11f247ba00263b060fbcdc95484fd046104", "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -768,11 +768,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1729717678, "lastModified": 1730120924,
"narHash": "sha256-XEfYT1D+4KT9c0mMwsmZdWS2JgKsboAZbnuJvrjBQKg=", "narHash": "sha256-I6hwd+YlgefioLfmsM04MxzbEAES1N328/T+VqhcWnQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "5a965cb108fb1f30b29a26dbc29b473f49e80b41", "rev": "b124084667fb4c912fda68fdd9d05f59e18b6ef7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -799,11 +799,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1729386149, "lastModified": 1729990941,
"narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", "rev": "7d68864343650322045894951602d6e82b5296d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -836,11 +836,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1729859837, "lastModified": 1730229503,
"narHash": "sha256-5M9NVVEjwTITwcNhoJkszeBAfsQjseQWsBSWv/rRk0I=", "narHash": "sha256-SYFUfTXsDeIK3q7fy6SrZ1v+lVQrEmZaKc1fpp4wuBQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "833950fe76340407ce9d9fc409994b11476cd22e", "rev": "d3bb51e62dd4a31c7cfea0f1ad511e53774a79fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -867,11 +867,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1729181673, "lastModified": 1729973466,
"narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -883,11 +883,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1729665710, "lastModified": 1729880355,
"narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -915,11 +915,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1729665710, "lastModified": 1729880355,
"narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1016,11 +1016,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1729862397, "lastModified": 1730263683,
"narHash": "sha256-nPE8y708tD4iwrQQ7wQZNCXa01/Xx0CzJhI8DBZwJz8=", "narHash": "sha256-cYDUzVP+CjMOfpw4pBQNUUS447HE0Ys5r2sf3TbGAGw=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "e1183e58e55397fe07b08981937c4f626ca7db42", "rev": "69dd8d77f3127cb21eaa34f8c7533930e30b923a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1308,11 +1308,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729858295, "lastModified": 1730290305,
"narHash": "sha256-Ia6PEIsGiaP3d4ewuJ3QR46pd0b3qyt2/RM2yUZZtL8=", "narHash": "sha256-4znqGX/WlF1u/dWi3xUb5mCdmzU3sLN059lzclt3+dE=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "71a0618a10c2fb8d6c60b3498bcdb5dc4573e403", "rev": "8abb78710aa4f1cd468953ded410d0711379fada",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1333,11 +1333,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729810516, "lastModified": 1730064361,
"narHash": "sha256-GX3yPqeCtSnpzdKG0FUXVVoe8CBLuHaVtIVRerq2PCc=", "narHash": "sha256-myb/4V8tP3n3WJQlaDrCmQkbmcMEcgX1mFu2jdfwTsk=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "5acc06679321aeff5f6d2f05ebb52520f734a8b8", "rev": "b2e89dfe92850cf02cbd4b73004aaaecd5cf1739",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -53,14 +53,12 @@
"https://hyprland.cachix.org" "https://hyprland.cachix.org"
"https://nixpkgs-wayland.cachix.org" "https://nixpkgs-wayland.cachix.org"
"https://daylin.cachix.org" "https://daylin.cachix.org"
# "https://cache.lix.systems"
]; ];
extra-trusted-public-keys = [ extra-trusted-public-keys = [
"oizys:DSw3mwVMM/Y+PXSVpkDlU5dLwlORuiJRGPkwr5INSMc=" "oizys:DSw3mwVMM/Y+PXSVpkDlU5dLwlORuiJRGPkwr5INSMc="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
"daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k=" "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
# "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
]; ];
}; };
} }

12
modules/nix.nix
View file

@ -75,5 +75,17 @@ in
nix.settings = { nix.settings = {
trusted-users = [ "@wheel" ]; trusted-users = [ "@wheel" ];
accept-flake-config = true; accept-flake-config = true;
extra-substituters = [
"https://attic.dayl.in/oizys"
"https://hyprland.cachix.org"
"https://nixpkgs-wayland.cachix.org"
"https://daylin.cachix.org"
];
extra-trusted-public-keys = [
"oizys:DSw3mwVMM/Y+PXSVpkDlU5dLwlORuiJRGPkwr5INSMc="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
"daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
];
}; };
} }

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

@ -245,31 +245,28 @@ proc nixBuildWithCache*(name: string, rest:seq[string], service: string, jobs: i
info "nothing to build" info "nothing to build"
quit "exiting...", QuitSuccess quit "exiting...", QuitSuccess
var outs: seq[string]
for drv in drvs: for drv in drvs:
var cmd = "nix build" var cmd = "nix build"
cmd.addArg drv cmd.addArg drv
cmd.addArg "--no-link"
cmd.addArg "--print-out-paths"
cmd.addArgs rest cmd.addArgs rest
let buildErr = runCmd(cmd) let (path, _, buildCode) = runCmdCapt(cmd)
if buildErr != 0: if buildCode != 0:
error "failed to build: " & drv error "failed to build: " & drv
continue continue
outs.add path
# TODO: propagate errors using nix log?
let results = collect( var cmd = service
for k, p in walkDir(".", relative = true): cmd.addArg "push"
if k in { pcLinkToDir, pcLinkToFile} and p.startsWith("result"): cmd.addArg name
p cmd.addArg "--jobs"
) cmd.addArg $jobs
cmd.addArgs outs
let pushErr = runCmd(cmd)
if pushErr != 0:
errorQuit "failed to push build to cache"
cmd = service
cmd.addArg "push"
cmd.addArg name
cmd.addArg "--jobs"
cmd.addArg $jobs
cmd.addArgs results
let pushErr = runCmd(cmd)
if pushErr != 0:
errorQuit "failed to push build to cache"
for p in results:
removeFile p