mirror of
https://github.com/tale/headplane.git
synced 2026-08-30 16:59:56 +00:00
Merge pull request #325 from igor-ramazanov/next
This commit is contained in:
Generated
+3
-3
@@ -40,11 +40,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758916627,
|
"lastModified": 1759826507,
|
||||||
"narHash": "sha256-fB2ISCc+xn+9hZ6gOsABxSBcsCgLCjbJ5bC6U9bPzQ4=",
|
"narHash": "sha256-vwXL9H5zDHEQA0oFpww2one0/hkwnPAjc47LRph6d0I=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "53614373268559d054c080d070cfc732dbe68ac4",
|
"rev": "bce5fe2bb998488d8e7e7856315f90496723793c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -22,29 +22,9 @@ rec {
|
|||||||
"x86_64-linux"
|
"x86_64-linux"
|
||||||
]
|
]
|
||||||
(system: let
|
(system: let
|
||||||
# Overlay: bump go_1_25 to 1.25.1 while nixpkgs-unstable lags behind
|
|
||||||
# https://nixpk.gs/pr-tracker.html?pr=441125 / https://github.com/NixOS/nixpkgs/pull/441125
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/440982
|
|
||||||
go1251Overlay = (final: prev:
|
|
||||||
let
|
|
||||||
newVersion = "1.25.1";
|
|
||||||
in {
|
|
||||||
go_1_25 = prev.go_1_25.overrideAttrs (old: {
|
|
||||||
version = newVersion;
|
|
||||||
src = prev.fetchurl {
|
|
||||||
url = "https://go.dev/dl/go${newVersion}.src.tar.gz";
|
|
||||||
hash = "sha256-0BDBCc7pTYDv5oHqtGvepJGskGv0ZYPDLp8NuwvRpZQ=";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
# ensure pkgs.go resolves to the bumped compiler
|
|
||||||
go = final.go_1_25;
|
|
||||||
});
|
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
overlays = [
|
overlays = [ devshell.overlays.default ];
|
||||||
devshell.overlays.default
|
|
||||||
go1251Overlay
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
in rec {
|
in rec {
|
||||||
formatter = pkgs.alejandra;
|
formatter = pkgs.alejandra;
|
||||||
|
|||||||
+1
-1
@@ -3,7 +3,7 @@ buildGoModule {
|
|||||||
pname = "hp_agent";
|
pname = "hp_agent";
|
||||||
version = (builtins.fromJSON (builtins.readFile ../package.json)).version;
|
version = (builtins.fromJSON (builtins.readFile ../package.json)).version;
|
||||||
src = ../.;
|
src = ../.;
|
||||||
vendorHash = "sha256-cPE8cnfTdzi6hAmSXujKmfd5ezivc3sQ6DKOZubCpYI=";
|
vendorHash = "sha256-MvrqKMD+A+qBZmzQv+T9920U5uJop+pjfJpZdm2ZqEA=";
|
||||||
ldflags = ["-s" "-w"];
|
ldflags = ["-s" "-w"];
|
||||||
env.CGO_ENABLED = 0;
|
env.CGO_ENABLED = 0;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -28,7 +28,7 @@ in
|
|||||||
|
|
||||||
pnpmDeps = pnpm_10.fetchDeps {
|
pnpmDeps = pnpm_10.fetchDeps {
|
||||||
inherit (finalAttrs) pname version src;
|
inherit (finalAttrs) pname version src;
|
||||||
hash = "sha256-mNVDgVfGNnBRtUVacVwjyww/XWqFTlayHtv6TLgXTT4=";
|
hash = "sha256-KyUcaR2Lvu5kT8arr4ZO8rCa5HWXTqmk8C7P8WoYK+c=";
|
||||||
fetcherVersion = 1;
|
fetcherVersion = 1;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -14,7 +14,7 @@ in
|
|||||||
version = (builtins.fromJSON (builtins.readFile ../package.json)).version;
|
version = (builtins.fromJSON (builtins.readFile ../package.json)).version;
|
||||||
src = ../.;
|
src = ../.;
|
||||||
subPackages = ["cmd/hp_ssh"];
|
subPackages = ["cmd/hp_ssh"];
|
||||||
vendorHash = "sha256-cPE8cnfTdzi6hAmSXujKmfd5ezivc3sQ6DKOZubCpYI=";
|
vendorHash = "sha256-MvrqKMD+A+qBZmzQv+T9920U5uJop+pjfJpZdm2ZqEA=";
|
||||||
env.CGO_ENABLED = 0;
|
env.CGO_ENABLED = 0;
|
||||||
|
|
||||||
nativeBuildInputs = [go];
|
nativeBuildInputs = [go];
|
||||||
|
|||||||
Reference in New Issue
Block a user