micropelago/isle
4
1
Fork 0
Code Issues 1 Pull Requests Projects Releases 5 Activity

Upgrade nixpkgs to 24.05 (primarily for a more up-to-date golang)

Browse Source
This commit is contained in:
Brian Picciano 2024-06-10 16:01:27 +02:00
parent b97ff9b99b
commit b36a38446e
6 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
default.nix
View File

@ -69,7 +69,7 @@ in rec {
''; '';
}; };
vendorSha256 = "sha256-P1TXG0fG8/6n37LmM5ApYctqoZzJFlvFAO2Zl85SVvk="; vendorHash = "sha256-P1TXG0fG8/6n37LmM5ApYctqoZzJFlvFAO2Zl85SVvk=";
subPackages = [ subPackages = [
"./cmd/entrypoint" "./cmd/entrypoint"
@ -90,7 +90,7 @@ in rec {
inherit buildSystem; inherit buildSystem;
hostSystem = "${hostPlatform.cpu.name}-unknown-${hostPlatform.kernel.name}-musl"; hostSystem = "${hostPlatform.cpu.name}-unknown-${hostPlatform.kernel.name}-musl";
pkgsSrc = pkgsNix.src; #pkgsSrc = pkgsNix.src;
}; };

7
nix/garage.nix
View File

@ -8,8 +8,13 @@ rec {
rev = "76230f20282e73a5a5afa33af68152acaf732cf5"; rev = "76230f20282e73a5a5afa33af68152acaf732cf5";
}; };
# TODO compiling garage broke using 24.05, so for now use the pkgs pinned in
# the garage repo. Probably will revisit this when garage gets upgraded
# anyway.
pkgsSrc = (import "${src}/nix/common.nix").pkgsSrc;
package = { package = {
pkgsSrc, #pkgsSrc,
buildSystem, buildSystem,
hostSystem, hostSystem,
}: let }: let

2
nix/nebula.nix
View File

@ -19,7 +19,7 @@
sha256 = "sha256-IsLSlQsrfw3obkz4jHL23BRQY2fviGbPEvs5j0zkdX0="; sha256 = "sha256-IsLSlQsrfw3obkz4jHL23BRQY2fviGbPEvs5j0zkdX0=";
}; };
vendorSha256 = "sha256-GvMiOEC3Y/pGG++Z+XCgLVADKymUR9shDxjx3xIz8u0="; vendorHash = "sha256-GvMiOEC3Y/pGG++Z+XCgLVADKymUR9shDxjx3xIz8u0=";
subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; subPackages = [ "cmd/nebula" "cmd/nebula-cert" ];

6
nix/pkgs.nix
View File

@ -26,13 +26,13 @@ rec {
]; ];
version = "22.11"; version = "24.05";
rev = "ce20e9ebe1903ea2ba1ab006ec63093020c761cb"; rev = "5646423bfac84ec68dfc60f2a322e627ef0d6a95";
src = fetchTarball { src = fetchTarball {
name = "nixpkgs-${version}"; name = "nixpkgs-${version}";
url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz"; url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
sha256 = "sha256-eFNm2h6fNbgD7ZpO4MHikCB5pSnCJ7DTmwPisjetmwc="; sha256 = "sha256:1lr1h35prqkd1mkmzriwlpvxcb34kmhc9dnr48gkm8hh089hifmx";
}; };
supportedSystems = [ supportedSystems = [

4
release.nix
View File

@ -1,6 +1,6 @@
{ {
releaseName, revision ? "dev",
revision, releaseName ? "dev",
buildSystem ? builtins.currentSystem, buildSystem ? builtins.currentSystem,
pkgsNix ? (import ./nix/pkgs.nix), pkgsNix ? (import ./nix/pkgs.nix),

21
shell.nix Normal file
View File

@ -0,0 +1,21 @@
{
buildSystem ? builtins.currentSystem,
pkgsNix ? (import ./nix/pkgs.nix),
}: let
pkgs = pkgsNix.default {
inherit buildSystem;
hostSystem = buildSystem;
};
in pkgs.mkShell {
buildInputs = [
pkgs.go
pkgs.golangci-lint
];
shellHook = ''
true # placeholder
'';
}