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

default.nix

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

nix/garage.nix

@@ -8,8 +8,13 @@ rec {
     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 = {
-    pkgsSrc,
+    #pkgsSrc,
     buildSystem,
     hostSystem,
   }: let

nix/nebula.nix

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

nix/pkgs.nix

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

release.nix

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

release.sh

@@ -14,14 +14,9 @@ echo '*' > "$releasesDir"/.gitignore
 
 out="$releasesDir/$releaseName"
 
-if [ -e "$out" ]; then
-    echo "$out already exists, aborting"
-    exit 1
-fi
-
 revision=$(git rev-parse HEAD)
 
-result=$(nix-build \
+result=$(nix-build -v \
             --argstr revision "$revision" \
             --argstr releaseName "$releaseName" \
             --no-out-link \

shell.nix

@@ -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
+  '';
+}