Skip to content

Commit 03d1700

Browse files
committed
bump deps
1 parent 6705455 commit 03d1700

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+921
-765
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
- uses: actions/checkout@v2
1111
- run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
1212

13-
- uses: cachix/install-nix-action@v6
14-
- uses: cachix/cachix-action@v3
13+
- uses: cachix/install-nix-action@v13
14+
- uses: cachix/cachix-action@v10
1515
with:
1616
name: zfs-snap-diff
1717
attributes: bindata

.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v2
1111
- run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
12-
- uses: cachix/install-nix-action@v6
12+
- uses: cachix/install-nix-action@v13
1313

1414
- name: build
1515
run: nix-build -A site

default.nix

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
{ goos ? "linux", with-dev-tools ? false }:
22
let
33

4-
fetchNixpkgs = {rev, sha256}: builtins.fetchTarball {
5-
url = "https://github.com/NixOS/nixpkgs-channels/archive/${rev}.tar.gz";
6-
inherit sha256;
7-
};
8-
9-
pkgs = import (fetchNixpkgs {
10-
rev = "8a9807f1941d046f120552b879cf54a94fca4b38";
11-
sha256 = "0s8gj8b7y1w53ak138f3hw1fvmk40hkpzgww96qrsgf490msk236";
4+
pkgs = import (builtins.fetchGit {
5+
name = "nixos-21.05";
6+
url = "https://github.com/nixos/nixpkgs/";
7+
ref = "refs/heads/nixos-21.05";
8+
rev = "a1007637cea374bd1bafd754cfd5388894c49129";
129
}) {};
1310

1411
# nix-prefetch-git https://github.com/justinwoo/easy-purescript-nix
1512
easy-ps = import (pkgs.fetchFromGitHub {
1613
owner = "justinwoo";
1714
repo = "easy-purescript-nix";
18-
rev = "a09d4ff6a8e4a8a24b26f111c2a39d9ef7fed720";
19-
sha256 = "1iaid67vf8frsqfnw1vm313d50mdws9qg4bavrhfhmgjhcyqmb52";
15+
rev = "5e66c8fe92e80c054cd6ef7e9ac0e91de81175ca";
16+
sha256 = "1wr5gynay76623mnf0jz8adwvldk4qyqc96r3yp9qkql83gn3zpx";
2017
}) { inherit pkgs; };
2118

2219

@@ -81,6 +78,7 @@ let
8178
rev = version;
8279
sha256 = "11j2cph5w042qx1d91gbwkcq884dlz0lc7ngq1xvyg5hhpd3j8qv";
8380
};
81+
vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
8482
modSha256 = "00zr3kpaywqi5kgjzvmf284njxl1fs1k9xaz1b8azwxnjpy77i0c";
8583
};
8684
in pkgs.runCommand "bindata.go" {} ''
@@ -89,10 +87,11 @@ let
8987
${go-bindata}/bin/go-bindata -pkg webapp -o $out/bindata.go .
9088
'';
9189

92-
zfs-snap-diff = pkgs.buildGo112Module rec {
90+
zfs-snap-diff = pkgs.buildGo115Module rec {
9391
pname = "zfs-snap-diff";
9492
inherit version;
9593
src = pkgs.nix-gitignore.gitignoreSource [ ".gitignore" "/webapp/" ] ./.;
94+
vendorSha256 = "1pr4xnm412ihmvxm3zygqsb34wabyxvs7dlnhbks3sxr0zsfp6fi";
9695
modSha256 = "0k1sz9mnz09pgn4w3k2dx0grcb66xd3h0f6ccc2r76vz6mz1hpgf";
9796

9897
preBuild = ''

webapp/default.nix

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

webapp/node-env.nix

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

0 commit comments

Comments
 (0)