mirror of
https://github.com/Mic92/sops-nix.git
synced 2026-02-22 12:55:29 +08:00
Bump go to 1.25, remove compatibility for 25.05 or older
This commit is contained in:
parent
17eea6f381
commit
5c23dc81a7
13 changed files with 31 additions and 44 deletions
|
|
@ -2,24 +2,15 @@
|
|||
makeSetupHook,
|
||||
gnupg,
|
||||
sops,
|
||||
lib,
|
||||
}:
|
||||
|
||||
let
|
||||
# FIXME: drop after 23.05
|
||||
propagatedBuildInputs =
|
||||
if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.05") then
|
||||
"deps"
|
||||
else
|
||||
"propagatedBuildInputs";
|
||||
in
|
||||
(makeSetupHook {
|
||||
makeSetupHook {
|
||||
name = "sops-import-keys-hook";
|
||||
substitutions = {
|
||||
gpg = "${gnupg}/bin/gpg";
|
||||
};
|
||||
${propagatedBuildInputs} = [
|
||||
propagatedBuildInputs = [
|
||||
sops
|
||||
gnupg
|
||||
];
|
||||
} ./sops-import-keys-hook.bash)
|
||||
} ./sops-import-keys-hook.bash
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
//go:build darwin
|
||||
// +build darwin
|
||||
|
||||
package main
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
lib,
|
||||
buildGo124Module,
|
||||
buildGo125Module,
|
||||
stdenv,
|
||||
vendorHash,
|
||||
go,
|
||||
}:
|
||||
buildGo124Module {
|
||||
buildGo125Module {
|
||||
pname = "sops-install-secrets";
|
||||
version = "0.0.1";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
//go:build linux
|
||||
// +build linux
|
||||
|
||||
package main
|
||||
|
||||
|
|
@ -8,8 +7,8 @@ import (
|
|||
"fmt"
|
||||
"os"
|
||||
|
||||
"golang.org/x/sys/unix"
|
||||
"github.com/moby/sys/mountinfo"
|
||||
"golang.org/x/sys/unix"
|
||||
)
|
||||
|
||||
func RuntimeDir() (string, error) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
//go:build linux || darwin
|
||||
// +build linux darwin
|
||||
|
||||
package main
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue