Skip to content

Commit ad88268

Browse files
committed
Update nixpkgs
This gets rid of the call to the nixpkgs internal `_fromFetchGit` because the `shallow = true` option has been adopted upstream.
1 parent ea543be commit ad88268

2 files changed

Lines changed: 4 additions & 11 deletions

File tree

default.nix

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,7 @@ pkgs.stdenv.mkDerivation rec {
1616
src = with pkgs.lib.fileset;
1717
toSource {
1818
root = ./.;
19-
# This should be `gitTracked ./.`. However, this currently doesn't accept
20-
# shallow repositories as used in GitHub CI.
21-
fileset =
22-
(import (sources.nixpkgs + "/lib/fileset/internal.nix") {inherit (pkgs) lib;})._fromFetchGit
23-
"gitTracked"
24-
"argument"
25-
./.
26-
{shallow = true;};
19+
fileset = gitTracked ./.;
2720
};
2821

2922
nativeBuildInputs = with pkgs; [

nix/sources.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"homepage": null,
66
"owner": "NixOS",
77
"repo": "nixpkgs",
8-
"rev": "a77ab169a83a4175169d78684ddd2e54486ac651",
9-
"sha256": "0r9a87aqhqr7dkhfy5zrx2dgqq11ma2rfvkfwqhz1xqg7y6mcxxg",
8+
"rev": "6832d0d99649db3d65a0e15fa51471537b2c56a6",
9+
"sha256": "1ww2vrgn8xrznssbd05hdlr3d4br6wbjlqprys1al8ahxkyl5syi",
1010
"type": "tarball",
11-
"url": "https://github.com/NixOS/nixpkgs/archive/a77ab169a83a4175169d78684ddd2e54486ac651.tar.gz",
11+
"url": "https://github.com/NixOS/nixpkgs/archive/6832d0d99649db3d65a0e15fa51471537b2c56a6.tar.gz",
1212
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
1313
}
1414
}

0 commit comments

Comments
 (0)