Commit graph

456 commits

Author SHA1 Message Date
Graham Christensen c5e897a376
Merge pull request #124 from DeterminateSystems/updates
Updates to flakes and crates
2025-02-24 15:04:11 -05:00
Cole Helbling 1eeaf990c0
Merge pull request #125 from emilazy/push-qppkqwrwsowk
Fix build with Darwin and Nix 2.26 after updates
2025-02-24 11:27:00 -08:00
Emily 66c0f4bf8e nix.patch: remove
No longer used and confused me for a second.
2025-02-24 18:42:11 +00:00
Emily f64d3e92bf readme: remove mention of Musl
This confused me a bunch so it’ll probably confuse others!
2025-02-24 18:42:11 +00:00
Emily 5e805d85e8 ci: re‐enable flake checker fail mode
Looks like this should be fine now that Nixpkgs has been updated and
the static build isn’t used any more.
2025-02-24 18:42:11 +00:00
Emily 8780a7d721 flake: use the Nix flake in the development shell too 2025-02-24 18:42:11 +00:00
Emily 90e06e4287 cargo: bump attic for Nix 2.26 2025-02-24 18:42:11 +00:00
Emily f5504c8285 flake: fix Darwin build
None of this stuff is necessary these days. This will produce an
executable linking against a Nix store `libiconv`, but as the build
isn’t static to begin with that should be fine. If a static build
is required in the future, `pkgsStatic` can be used as it is in the
`nix-installer` flake.
2025-02-19 22:25:16 +00:00
Emily a5c0301ee8 flake: use stock Nixpkgs Rust toolchain
This makes it easier to use Nixpkgs’ cross‐compilation machinery
and simplifies the flake.
2025-02-19 22:25:16 +00:00
Emily 92b7440174 flake: update crane 2025-02-19 22:24:35 +00:00
Emily ee9c0b9fa5 flake: drop flake-compat input
Not used by anything.
2025-02-19 22:24:35 +00:00
Emily a0571cc895 flake: remove default from the overlay
This belongs in `packages` instead (where a duplicate is already
present anyway).
2025-02-19 20:07:15 +00:00
Cole Helbling 260ce740fc
Update flake.nix 2025-02-19 10:32:14 -08:00
Graham Christensen 22d923e664 ...flake.nix too 2025-02-19 11:48:48 -05:00
Graham Christensen 214e869fee flake.lock: Update
Flake lock file updates:
2025-02-19 11:48:22 -05:00
Graham Christensen 36897bff90 Cargo update 2025-02-19 11:45:06 -05:00
Graham Christensen f3fe26e7c0 Swift from a nix overlay to the nix input's default package, update flakes 2025-02-19 11:43:40 -05:00
Graham Christensen 61233c3bb5 flake.lock: Update
Flake lock file updates:

• Updated input 'nix':
    'https://api.flakehub.com/f/pinned/NixOS/nix/2.22.1/018f61d9-3f9a-7ccf-9bfc-174e3a17ab38/source.tar.gz?narHash=sha256-5Q1WkpTWH7fkVfYhHDc5r0A%2BVc%2BK5xB1UhzrLzBCrB8%3D' (2024-05-09)
  → 'https://api.flakehub.com/f/pinned/NixOS/nix/2.26.2/0194fbd7-e2ec-7193-93a9-05ae757e79a1/source.tar.gz?narHash=sha256-EOnBPe%2BydQ0/P5ZyWnFekvpyUxMcmh2rnP9yNFi/EqU%3D' (2025-02-12)
• Updated input 'nix/flake-compat':
    'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9?narHash=sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm%2B504Ch3sNKLd8%3D' (2023-01-17)
  → 'github:edolstra/flake-compat/ff81ac966bb2cae68946d5ed5fc4994f96d0ffec?narHash=sha256-NeCCThCEP3eCl2l/%2B27kNNK7QrwZB1IJCrXfrbv5oqU%3D' (2024-12-04)
• Updated input 'nix/flake-parts':
    'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d?narHash=sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm%2BGpZNw%3D' (2024-04-01)
  → 'github:hercules-ci/flake-parts/205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9?narHash=sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c%3D' (2024-12-04)
• Added input 'nix/git-hooks-nix':
    'github:cachix/git-hooks.nix/aa9f40c906904ebd83da78e7f328cd8aeaeae785?narHash=sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0%3D' (2024-12-15)
• Added input 'nix/git-hooks-nix/flake-compat':
    follows 'nix'
• Added input 'nix/git-hooks-nix/gitignore':
    follows 'nix'
• Added input 'nix/git-hooks-nix/nixpkgs':
    follows 'nix/nixpkgs'
• Added input 'nix/git-hooks-nix/nixpkgs-stable':
    follows 'nix/nixpkgs'
• Removed input 'nix/libgit2'
• Updated input 'nix/nixpkgs':
    'github:NixOS/nixpkgs/b550fe4b4776908ac2a861124307045f8e717c8e?narHash=sha256-7kkJQd4rZ%2BvFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo%3D' (2024-02-28)
  → 'github:NixOS/nixpkgs/48d12d5e70ee91fe8481378e540433a7303dbf6a?narHash=sha256-1Noao/H%2BN8nFB4Beoy8fgwrcOQLVm9o4zKW1ODaqK9E%3D' (2024-12-16)
• Added input 'nix/nixpkgs-23-11':
    'github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446?narHash=sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw%3D' (2024-05-31)
• Removed input 'nix/pre-commit-hooks'
• Removed input 'nix/pre-commit-hooks/flake-compat'
• Removed input 'nix/pre-commit-hooks/flake-utils'
• Removed input 'nix/pre-commit-hooks/gitignore'
• Removed input 'nix/pre-commit-hooks/nixpkgs'
• Removed input 'nix/pre-commit-hooks/nixpkgs-stable'
2025-02-19 11:43:22 -05:00
Graham Christensen 1cd5d316da flake.lock: Update
Flake lock file updates:

• Updated input 'fenix':
    'https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1955%2Brev-60ab4a085ef6ee40f2ef7921ca4061084dd8cf26/01910d03-2462-7e48-b72e-439d1152bd11/source.tar.gz?narHash=sha256-l7/yMehbrL5d4AI8E2hKtNlT50BlUAau4EKTgPg9KcY%3D' (2024-08-01)
  → 'https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.2156%2Brev-de3ea31eb651b663449361f77d9c1e8835290470/0194c095-0041-7b9c-b19e-cf1c4a2adaad/source.tar.gz?narHash=sha256-TC3xA%2B%2BKgprECm/WPsLUd%2Ba77MObZPElCW6eAsjVW1k%3D' (2025-02-01)
• Updated input 'fenix/rust-analyzer-src':
    'github:rust-lang/rust-analyzer/c8e41d95061543715b30880932ec3dc24c42d7ae?narHash=sha256-1na4m2PNH99syz2g/WQ%2BHr3RfY7k4H8NBnmkr5dFDXw%3D' (2024-07-31)
  → 'github:rust-lang/rust-analyzer/3c2aca1e5e9fbabb4e05fc4baa62e807aadc476a?narHash=sha256-1zhfA5NBqin0Z79Se85juvqQteq7uClJMEb7l2pdDUY%3D' (2025-01-30)
• Updated input 'flake-compat':
    'https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz?narHash=sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U%3D' (2023-10-04)
  → 'https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz?narHash=sha256-NeCCThCEP3eCl2l/%2B27kNNK7QrwZB1IJCrXfrbv5oqU%3D' (2024-12-04)
• Updated input 'nixpkgs':
    'https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2311.558675%2Brev-9d29cd266cebf80234c98dd0b87256b6be0af44e/018fb680-a725-7c9d-825e-aadb0901263e/source.tar.gz?narHash=sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4%3D' (2024-05-25)
  → 'https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.755230%2Brev-73cf49b8ad837ade2de76f87eb53fc85ed5d4680/01951ca9-35fa-70f2-b972-630b0cd93c65/source.tar.gz?narHash=sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64%3D' (2025-02-18)
2025-02-19 11:37:25 -05:00
Cole Helbling c12f7ed42f
Merge pull request #121 from maxheld83/patch-1
notify users about EOL of magic nix cache
2025-02-18 12:49:59 -08:00
Cole Helbling 7099e801ae fixup: README link 2025-02-18 12:05:25 -08:00
Cole Helbling b1a16d5ac2
Merge pull request #122 from DeterminateSystems/fh-583-shorten-file-changed-check
Check if token changed every 3 seconds instead
2025-02-10 07:43:16 -08:00
Cole Helbling 1fad1473c5 Check if token changed every 3 seconds instead 2025-02-10 07:28:34 -08:00
Max Held 8492a69263
notify users about EOL
closes https://github.com/DeterminateSystems/magic-nix-cache/issues/119
2025-01-29 18:44:28 +01:00
Graham Christensen a65ff39edd
Merge pull request #118 from DeterminateSystems/grahamc-patch-2
drop 429 notice
2025-01-16 18:48:03 -05:00
Graham Christensen ef4bd6fb91
drop 429 notice 2025-01-16 18:34:39 -05:00
Cole Helbling 4d32a8ef4e
Merge pull request #117 from DeterminateSystems/fixup-ci
fixup: bump forgotten download-artifact action version
2025-01-16 09:24:02 -08:00
Cole Helbling e8e38ad4fc fixup: bump forgotten download-artifact action version 2025-01-16 09:10:05 -08:00
Cole Helbling e70bb1e416
Merge pull request #116 from DeterminateSystems/cole/fh-543
Suggest FlakeHub Cache when hit by 429
2025-01-16 09:00:06 -08:00
Graham Christensen 4e2b37be36 Set a metric field for when GHA 429's 2025-01-16 08:46:41 -08:00
Cole Helbling 322a99d45e fixup: update upload-artifact, download-artifact action versions 2025-01-16 08:46:41 -08:00
Cole Helbling 003f106338
Update GHA 429 notice wording
Co-authored-by: Graham Christensen <graham@grahamc.com>
2025-01-16 07:32:20 -08:00
Cole Helbling b9f89bd546 Suggest FlakeHub Cache when hit by 429 2025-01-14 13:56:17 -08:00
Cole Helbling 215dc0d8e9
Merge pull request #114 from DeterminateSystems/cole/fh-485
Fixup auth when using determinate-nixd with long-running builds
2024-12-04 13:24:01 -08:00
Cole Helbling 2bac50c0ca Move "workaround" notes closer to the workaround 2024-12-04 13:11:19 -08:00
Cole Helbling 5e7acea3d1 Fixup auth when using determinate-nixd with long-running builds 2024-12-04 13:11:19 -08:00
Cole Helbling 11b78639f1 Cargo.lock: update attic dependencies 2024-12-04 12:44:32 -08:00
Cole Helbling 296e9dc1af
Merge pull request #111 from DeterminateSystems/grahamc-patch-2
Use magic-nix-cache-action@main, oops
2024-11-08 09:48:20 -08:00
Graham Christensen f27f314206
Use magic-nix-cache-action@main, oops 2024-11-08 12:29:41 -05:00
Graham Christensen 448d84e32f
Merge pull request #110 from DeterminateSystems/graham/fh-433-magic-nix-cache-should-disable-github-actions-cache-if
Graham/fh 433 magic nix cache should disable GitHub actions cache when flakehub cache is enabled
2024-11-06 12:05:23 -05:00
Graham Christensen d1983bbdff Don't try to use the netrc if itdoesn't exist 2024-11-06 09:47:44 -05:00
Graham Christensen a68e1c4d54 Test the patched action 2024-11-05 22:27:17 -05:00
Graham Christensen bf844027bc Turn off the GitHub actions cache if the user expresses no preference, and flakehub cache is in use 2024-11-05 21:22:38 -05:00
Graham Christensen 65060bc705 Switch the GHA Caceh preference to a trinary, but treat it as a straight bool for the moment 2024-11-05 21:19:18 -05:00
Graham Christensen 3fd6eeb208 Make the FlakeHubArg a generic Trinary so we can use it for GHA Cache too 2024-11-05 21:11:26 -05:00
Graham Christensen cf183317a5
Merge pull request #109 from DeterminateSystems/colemickens/shutdown
shutdown: wait for flakehub_cache first
2024-11-05 19:45:48 -05:00
Graham Christensen 647b207575
Update magic-nix-cache/src/api.rs 2024-11-05 19:33:11 -05:00
Cole Mickens 625d7717b6 flakehub logging review comments 2024-11-05 15:08:00 -08:00
Graham Christensen 925be77ec2
Merge pull request #108 from mightyiam/bump-checkout-action
Bump GitHub action actions/checkout from v3 to v4
2024-11-05 18:02:55 -05:00
Cole Mickens 7841b8bbe2 flakehub cache init failure is an error 2024-11-05 15:00:56 -08:00