Skip to content

Commit ebad618

Browse files
authored
Merge pull request #7 from paulyoung/github-actions
Add GitHub action
2 parents c8ba7cf + 89c48cf commit ebad618

File tree

5 files changed

+50
-35
lines changed

5 files changed

+50
-35
lines changed

.github/workflows/nix.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: "Nix"
2+
on:
3+
pull_request:
4+
push:
5+
jobs:
6+
nix:
7+
name: Nix on ${{ matrix.os }}
8+
strategy:
9+
matrix:
10+
os: [ubuntu-latest, macos-latest]
11+
runs-on: ${{ matrix.os }}
12+
steps:
13+
- uses: actions/[email protected]
14+
- uses: cachix/install-nix-action@v15
15+
- run: nix build --show-trace

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/fat/src/fat/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ path = "lib.rs"
1010
crate-type = ["cdylib"]
1111

1212
[dependencies]
13-
fatfs = { git = "https://github.com/rafalh/rust-fatfs" }
13+
fatfs = { git = "https://github.com/rafalh/rust-fatfs", rev = "87fc1ed5074a32b4e0344fcdde77359ef9e75432" }
1414
fscommon = "0.1"
1515
ic-cdk = { git = "https://github.com/dfinity/cdk-rs.git", rev = "a253119adb08929b6304d007ee0a6a37960656ed" }
1616
ic-cdk-macros = "0.3"

flake.lock

Lines changed: 23 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,22 @@
55
flake = false;
66
};
77
flake-utils.url = "github:numtide/flake-utils";
8-
mozillapkgs = {
9-
url = "github:mozilla/nixpkgs-mozilla";
10-
flake = false;
11-
};
12-
naersk.url = "github:nix-community/naersk";
8+
9+
# https://github.com/nix-community/naersk/pull/211
10+
naersk.url = "github:mhuesch/naersk?rev=193e049d6e4c841faf800e302551d2e0a48eee88";
11+
# naersk.url = "github:nix-community/naersk";
12+
1313
nixpkgs.url = "github:nixos/nixpkgs/21.11";
14+
nixpkgs-mozilla.url = "github:mozilla/nixpkgs-mozilla";
1415
};
1516

1617
outputs = {
1718
self,
1819
nixpkgs,
1920
dfinity-sdk,
2021
flake-utils,
21-
mozillapkgs,
2222
naersk,
23+
nixpkgs-mozilla,
2324
}:
2425
flake-utils.lib.eachDefaultSystem (
2526
system: let
@@ -31,11 +32,10 @@
3132
};
3233

3334
# Get a specific rust version
34-
mozilla = pkgs.callPackage (mozillapkgs + "/package-set.nix") {};
35+
mozilla = pkgs.callPackage (nixpkgs-mozilla + "/package-set.nix") {};
3536
rust = (mozilla.rustChannelOf {
36-
channel = "stable";
37-
version = "1.54.0";
38-
sha256 = "NL+YHnOj1++1O7CAaQLijwAxKJW9SnHg8qsiOJ1m0Kk=";
37+
channel = "1.55.0";
38+
sha256 = "HNIlEerJvk6sBfd8zugzwSgSiHcQH8ZbqWQn9BGfmpo=";
3939
# sha256 = pkgs.lib.fakeSha256;
4040
}).rust.override {
4141
extensions = [

0 commit comments

Comments
 (0)