language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-07-07 22:55:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

don't use flakehub input for flake-compat and update a comment

Browse source
This commit is contained in:
John Murray 2023-11-15 23:30:15 -05:00
parent 07e06e60f5
commit 3509d6c666
No known key found for this signature in database
4 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
default.nix
View file

@ -1,10 +1,10 @@
(import (import
( (
let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in let lock = builtins.fromJSON (builtins.readFile ./flake.lock);
fetchTarball { in fetchTarball {
url = lock.nodes.flake-compat.locked.url or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; url =
"https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
sha256 = lock.nodes.flake-compat.locked.narHash; sha256 = lock.nodes.flake-compat.locked.narHash;
} }
) )
{ src = ./.; } { src = ./.; }).defaultNix
).defaultNix

12
flake.lock generated
View file

@ -1,17 +1,19 @@
{ {
"nodes": { "nodes": {
"flake-compat": { "flake-compat": {
"flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"revCount": 57, "type": "github"
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "owner": "edolstra",
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" "repo": "flake-compat",
"type": "github"
} }
}, },
"flake-utils": { "flake-utils": {

5
flake.nix
View file

@ -20,7 +20,10 @@
}; };
# for non flake backwards compatibility # for non flake backwards compatibility
flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"; flake-compat = {
url = "github:edolstra/flake-compat";
flake = false;
};
}; };
outputs = { self, nixpkgs, rust-overlay, flake-utils, nixgl, ... }@inputs: outputs = { self, nixpkgs, rust-overlay, flake-utils, nixgl, ... }@inputs:

1
rust-toolchain.toml
View file

@ -9,7 +9,6 @@
# - update nightly-OLD_DATE in .github/workflows/windows_tests.yml # - update nightly-OLD_DATE in .github/workflows/windows_tests.yml
# - update nightly-OLD_DATE in .github/workflows/windows_release_build.yml # - update nightly-OLD_DATE in .github/workflows/windows_release_build.yml
# - update nightly-OLD_DATE in crates/compiler/build/src/link.rs # - update nightly-OLD_DATE in crates/compiler/build/src/link.rs
# - Follow instructions in default.nix: `assert pkgs.lib.assertMsg rustVersionsMatch` ...
channel = "1.71.1" # check ^^^ when changing this channel = "1.71.1" # check ^^^ when changing this
# #