Skip to content

Commit 1bca5f1

Browse files
committed
Bump nixpkgs to e7215ec and drop the vendored gophernotes fork
1 parent d620b21 commit 1bca5f1

3 files changed

Lines changed: 8 additions & 18 deletions

File tree

‎default.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
}:
77

88
let
9-
stableRev = "ca23145d9899c9d4b7f035339e2f21cf3106aa79"; # nixpkgs-rev
9+
stableRev = "e7215ec9581d62b85a3b1b870cd40cc353a06816"; # nixpkgs-rev
1010
stableFetchFromGitHub = fetchFromGitHub {
1111
owner = "NixOS";
1212
repo = "nixpkgs";
1313
rev = stableRev;
14-
hash = "sha256-UxFzpSVQ7zZdd9bPc/sgCkbtSMwJkAKi82tas5FXgFI="; # nixpkgs-hash
14+
hash = "sha256-/PS45tTr/AN2x7rjT/fj1Scc5Fz0WjePt9davTICV8E="; # nixpkgs-hash
1515
};
1616
stableBuiltins = builtins.fetchTarball {
1717
url = ''https://github.com/NixOS/nixpkgs/archive/${stableRev}.tar.gz'';
18-
sha256 = "0ll0ay8v6nkbyfi05409ri4fsiha43xp7kynfxfkdvsh4njp64ak"; # nixpkgs-sha256
18+
sha256 = "1hap08rbsnnpny7kfnplbkj1q9ymwgvlzqxsqxv07z7bskkbix7w"; # nixpkgs-sha256
1919
};
2020
pkgsStableSrc = if fetchFromGitHub != null then stableFetchFromGitHub else stableBuiltins;
2121
pkgsStable = import pkgsStableSrc ({

‎flake.lock‎

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

‎modules/kernels/go/kernel.nix‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{ lib
22
, callPackage
3-
, fetchFromGitHub
43
, gophernotes
54

65
, attrs
@@ -13,23 +12,14 @@ with lib;
1312
let
1413
common = callPackage ../common.nix {};
1514

16-
gophernotesPatched = gophernotes.overrideAttrs (_oldAttrs: {
17-
src = fetchFromGitHub {
18-
owner = "codedownio";
19-
repo = "gophernotes";
20-
rev = "6b18077f97aa913b73093beeb2152b2d51ee64af";
21-
hash = "sha256-gSD2zUWka3cur5jkv4siYp2gJdxD+00bmJi6BZd0c+c="; # nixpkgs-hash
22-
};
23-
24-
vendorHash = "sha256-bGaXnd0E6dRNiwvGIn7Ptddrt7dRzPfkPThgHPuL2Vo=";
25-
15+
gophernotes' = gophernotes.overrideAttrs (_oldAttrs: {
2616
# The upstream tests give the kernel a fixed retry budget to come up on a ZMQ port, which
2717
# isn't long enough on an emulated or loaded builder. The go suite covers the kernel anyway.
2818
doCheck = false;
2919
});
3020

3121
argv = [
32-
"${gophernotesPatched}/bin/gophernotes"
22+
"${gophernotes'}/bin/gophernotes"
3323
"{connection_file}"
3424
];
3525

0 commit comments

Comments
 (0)