Skip to content

Commit

Permalink
Update nixpkgs pin, update to gcc12, pull in tools for building a flo…
Browse files Browse the repository at this point in the history
…ppy image

Signed-off-by: Nahum Shalman <[email protected]>
  • Loading branch information
nshalman committed Sep 11, 2023
1 parent 6eefab8 commit aa2e0d5
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions binary/script/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ in
import (_pkgs.fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs";
#branch@date: nixos-21.11@2022-08-02
rev = "eabc38219184cc3e04a974fe31857d8e0eac098d";
sha256 = "04ffwp2gzq0hhz7siskw6qh9ys8ragp7285vi1zh8xjksxn1msc5";
#branch@date: release-23.05@2023-09-11
rev = "4610292e25a414c2b111a7d99075cf1683e5a359";
hash = "sha256-ddMK+MKncPuPgMzsR72ndx4VObAjnM+R73+F6wL0aPs=";
}) {},
}:
with pkgs; let
Expand All @@ -17,19 +17,21 @@ in
buildInputs =
[
curl
dosfstools
expect
gcc9
gcc12
git
gnumake
gnused
go
mtools
perl
qemu-utils
syslinux
xorriso
xz
]
++ lib.optionals stdenv.isLinux [
pkgsCross.aarch64-multiplatform.buildPackages.gcc9
pkgsCross.aarch64-multiplatform.buildPackages.gcc12
];
}

0 comments on commit aa2e0d5

Please sign in to comment.