Compare commits
No commits in common. "b36a38446ee37aa44c8ba387f0ad2a507754b7a0" and "249c46c586ffc804bc3d0b1d0e2967f01b02bc2b" have entirely different histories.
b36a38446e
...
249c46c586
@ -69,7 +69,7 @@ in rec {
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-P1TXG0fG8/6n37LmM5ApYctqoZzJFlvFAO2Zl85SVvk=";
|
vendorSha256 = "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;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -8,13 +8,8 @@ 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
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
sha256 = "sha256-IsLSlQsrfw3obkz4jHL23BRQY2fviGbPEvs5j0zkdX0=";
|
sha256 = "sha256-IsLSlQsrfw3obkz4jHL23BRQY2fviGbPEvs5j0zkdX0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-GvMiOEC3Y/pGG++Z+XCgLVADKymUR9shDxjx3xIz8u0=";
|
vendorSha256 = "sha256-GvMiOEC3Y/pGG++Z+XCgLVADKymUR9shDxjx3xIz8u0=";
|
||||||
|
|
||||||
subPackages = [ "cmd/nebula" "cmd/nebula-cert" ];
|
subPackages = [ "cmd/nebula" "cmd/nebula-cert" ];
|
||||||
|
|
||||||
|
@ -26,13 +26,13 @@ rec {
|
|||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
version = "24.05";
|
version = "22.11";
|
||||||
rev = "5646423bfac84ec68dfc60f2a322e627ef0d6a95";
|
rev = "ce20e9ebe1903ea2ba1ab006ec63093020c761cb";
|
||||||
|
|
||||||
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:1lr1h35prqkd1mkmzriwlpvxcb34kmhc9dnr48gkm8hh089hifmx";
|
sha256 = "sha256-eFNm2h6fNbgD7ZpO4MHikCB5pSnCJ7DTmwPisjetmwc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
supportedSystems = [
|
supportedSystems = [
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
revision ? "dev",
|
releaseName,
|
||||||
releaseName ? "dev",
|
revision,
|
||||||
|
|
||||||
buildSystem ? builtins.currentSystem,
|
buildSystem ? builtins.currentSystem,
|
||||||
pkgsNix ? (import ./nix/pkgs.nix),
|
pkgsNix ? (import ./nix/pkgs.nix),
|
||||||
|
@ -14,9 +14,14 @@ echo '*' > "$releasesDir"/.gitignore
|
|||||||
|
|
||||||
out="$releasesDir/$releaseName"
|
out="$releasesDir/$releaseName"
|
||||||
|
|
||||||
|
if [ -e "$out" ]; then
|
||||||
|
echo "$out already exists, aborting"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
revision=$(git rev-parse HEAD)
|
revision=$(git rev-parse HEAD)
|
||||||
|
|
||||||
result=$(nix-build -v \
|
result=$(nix-build \
|
||||||
--argstr revision "$revision" \
|
--argstr revision "$revision" \
|
||||||
--argstr releaseName "$releaseName" \
|
--argstr releaseName "$releaseName" \
|
||||||
--no-out-link \
|
--no-out-link \
|
||||||
|
Loading…
Reference in New Issue
Block a user