jalr/nixos-configuration
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update docker-machine-gitlab

Browse source
This commit is contained in:
Jakob Lechner 2025-02-03 23:35:44 +01:00
parent f216123b80
commit aef0a15dc8
3 changed files with 309 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkgs/default.nix
View file

@ -11,7 +11,9 @@ in
docker-machine-driver-hetzner = callPackage ./docker-machine-driver-hetzner {
inherit (inputs.gomod2nix.legacyPackages.${system}) buildGoApplication;
};
docker-machine-gitlab = callPackage ./docker-machine-gitlab { };
docker-machine-gitlab = callPackage ./docker-machine-gitlab {
inherit (inputs.gomod2nix.legacyPackages.${system}) buildGoApplication;
};
fpvout = callPackage ./fpvout { };
mute-indicator = callPackage ./mute-indicator { };
myintercom-doorbell = callPackage ./myintercom-doorbell {

103
pkgs/docker-machine-gitlab/default.nix
View file

@ -1,35 +1,80 @@
{ lib, buildGoPackage, fetchFromGitLab, installShellFiles, docker-machine-driver-hetzner, makeWrapper, openssh }:
{ lib
, buildGoApplication
, fetchFromGitLab
, installShellFiles
, docker-machine-driver-hetzner
, makeWrapper
, openssh
, rsync
,
}:
(
buildGoApplication rec {
pname = "docker-machine-gitlab";
version = "0.16.2-gitlab.32";
goPackagePath = "github.com/docker/machine";
modules = ./gomod2nix.toml;
buildGoPackage rec {
pname = "docker-machine-gitlab";
version = "0.16.2-gitlab.22";
src = fetchFromGitLab {
rev = "v${version}";
group = "gitlab-org";
owner = "ci-cd";
repo = "docker-machine";
sha256 = "sha256-jipKo3LRTDUVKMkBK2qH/JIUcj3vJh7SdcQ8FMTr2Ok=";
};
goPackagePath = "github.com/docker/machine";
nativeBuildInputs = [
docker-machine-driver-hetzner
installShellFiles
makeWrapper
openssh
rsync
];
src = fetchFromGitLab {
rev = "v${version}";
group = "gitlab-org";
owner = "ci-cd";
repo = "docker-machine";
sha256 = "sha256-WYnaY/0FJzXDiECms1gGNR1jN4DUQ3s296KG9r1c2io=";
};
nativeBuildInputs = [
docker-machine-driver-hetzner
installShellFiles
makeWrapper
openssh
];
postInstall = ''
pushd go/src/${goPackagePath}/contrib/completion
installShellCompletion --bash bash/*
installShellCompletion --zsh zsh/*
popd
wrapProgram $out/bin/docker-machine \
--prefix PATH : ${lib.makeBinPath [
postInstall = ''
pushd contrib/completion
installShellCompletion --bash bash/*
installShellCompletion --zsh zsh/*
popd
wrapProgram $out/bin/docker-machine \
--prefix PATH : ${lib.makeBinPath [
docker-machine-driver-hetzner
openssh
rsync
]}
'';
}
'';
}
).overrideAttrs (attrs: {
checkPhase =
''
export USER="unknown"
ln -s $GOPATH/bin bin
# Disable failing test
cat > cmd/docker-machine/machine_test.go << EOF
package main
import (
"os"
"testing"
"github.com/docker/machine/commands/mcndirs"
)
func TestStorePathSetCorrectly(t *testing.T) {
mcndirs.BaseDir = ""
os.Args = []string{"docker-machine", "--storage-path", "/tmp/foo"}
main()
/*
if mcndirs.BaseDir != "/tmp/foo" {
t.Fatal("Expected MACHINE_STORAGE_PATH environment variable to be /tmp/foo but was ", os.Getenv("MACHINE_STORAGE_PATH"))
}
*/
}
EOF
sed -i 's#exec.Command("/usr/bin/scp"#exec.Command("${openssh}/bin/scp"#' commands/scp_test.go
sed -i 's#exec.Command("/usr/bin/rsync"#exec.Command("${rsync}/bin/rsync"#' commands/scp_test.go
''
+ attrs.checkPhase;
})

232
pkgs/docker-machine-gitlab/gomod2nix.toml Normal file
View file

@ -0,0 +1,232 @@
schema = 3
[mod]
[mod."cloud.google.com/go/compute"]
version = "v1.25.1"
hash = "sha256-A5Wiq8eKgolb81ZpAnoGaBNrTtHpDLLPFgXBJaKcnSA="
[mod."cloud.google.com/go/compute/metadata"]
version = "v0.2.3"
hash = "sha256-kYB1FTQRdTDqCqJzSU/jJYbVUGyxbkASUKbEs36FUyU="
[mod."github.com/Azure/azure-sdk-for-go"]
version = "v5.0.0-beta+incompatible"
hash = "sha256-wH+ODrNrEx6aLsbJd1LKztHBz4MDric0gVUHtlq26cg="
[mod."github.com/Azure/go-autorest"]
version = "v7.2.1+incompatible"
hash = "sha256-yPtI1uwZs5FIJXU+ZUZfSxsnA+b7AmokMzkzXhQz1z4="
[mod."github.com/Microsoft/go-winio"]
version = "v0.6.1"
hash = "sha256-BL0BVaHtmPKQts/711W59AbHXjGKqFS4ZTal0RYnR9I="
[mod."github.com/aws/aws-sdk-go"]
version = "v1.36.21"
hash = "sha256-Lko4zIyNdBdKI1u7dWgcf8mjuf1HdpvV8lC6u9TmuUM="
[mod."github.com/bitly/go-simplejson"]
version = "v0.5.1"
hash = "sha256-ypd4SyAww1+1IlxXlAeGYbTKwl/mahlj9k0MjXJkAJ0="
[mod."github.com/bugsnag/bugsnag-go"]
version = "v1.0.6-0.20151120182711-02e952891c52"
hash = "sha256-D0oYpL2bgzUlBTs10AM+2MkmwbgfNod4W5hGf4KsP0s="
[mod."github.com/bugsnag/osext"]
version = "v0.0.0-20130617224835-0dd3f918b21b"
hash = "sha256-Q/iSW9oc9UZEH3GFjTouJoMngM6jPp+bszVcQyv+7Ao="
[mod."github.com/bugsnag/panicwrap"]
version = "v0.0.0-20160118154447-aceac81c6e2f"
hash = "sha256-q4qH0IhNfxOOjNsWqR4t8Kk0duRexYRAm+P+oaW+nds="
[mod."github.com/cenkalti/backoff"]
version = "v0.0.0-20141124221459-9831e1e25c87"
hash = "sha256-KyUBfBPlFd37Y9P3xnORI1SbFLxBEtWTsnNf0MaaXkQ="
[mod."github.com/codegangsta/cli"]
version = "v1.11.1-0.20151120215642-0302d3914d2a"
hash = "sha256-D8uAVNyBdtLvpUD97l0521hSJd+Mk/0oT3xW95cklto="
[mod."github.com/containerd/log"]
version = "v0.1.0"
hash = "sha256-vuE6Mie2gSxiN3jTKTZovjcbdBd1YEExb7IBe3GM+9s="
[mod."github.com/davecgh/go-spew"]
version = "v1.1.1"
hash = "sha256-nhzSUrE1fCkN0+RL04N4h8jWmRFPPPWbCuDc7Ss0akI="
[mod."github.com/dgrijalva/jwt-go"]
version = "v4.5.0"
hash = "sha256-dyKL8wQRApkdCkKxJ1knllvixsrBLw+BtRS0SjlN7NQ="
replaced = "github.com/golang-jwt/jwt/v4"
[mod."github.com/digitalocean/godo"]
version = "v1.0.1-0.20170317202744-d59ed2fe842b"
hash = "sha256-YwkNqher0TEfaHghZK/YTNOoTpAVtsr27Kk72CIvtfM="
[mod."github.com/distribution/reference"]
version = "v0.6.0"
hash = "sha256-gr4tL+qz4jKyAtl8LINcxMSanztdt+pybj1T+2ulQv4="
[mod."github.com/docker/docker"]
version = "v25.0.6+incompatible"
hash = "sha256-sUMANzDY4ORfD6qQ25NUhi7PPWF5v8NlOFquiVeDZmc="
[mod."github.com/docker/go-connections"]
version = "v0.4.0"
hash = "sha256-GHNIjOuuNp5lFQ308+nDNwQPGESCVV7bCUxSW5ZxZlc="
[mod."github.com/docker/go-units"]
version = "v0.2.1-0.20151230175859-0bbddae09c5a"
hash = "sha256-PbojDBnjJeH425NPmFUb70+0oAfOUH3r0VdXCT6ViXw="
[mod."github.com/exoscale/egoscale"]
version = "v0.9.23"
hash = "sha256-DftIgQ0YcZAi+fl/XT2Qnwr/jBGw2g7y4d5vgy67/xE="
[mod."github.com/felixge/httpsnoop"]
version = "v1.0.4"
hash = "sha256-c1JKoRSndwwOyOxq9ddCe+8qn7mG9uRq2o/822x5O/c="
[mod."github.com/go-logr/logr"]
version = "v1.4.2"
hash = "sha256-/W6qGilFlZNTb9Uq48xGZ4IbsVeSwJiAMLw4wiNYHLI="
[mod."github.com/go-logr/stdr"]
version = "v1.2.2"
hash = "sha256-rRweAP7XIb4egtT1f2gkz4sYOu7LDHmcJ5iNsJUd0sE="
[mod."github.com/gogo/protobuf"]
version = "v1.3.2"
hash = "sha256-pogILFrrk+cAtb0ulqn9+gRZJ7sGnnLLdtqITvxvG6c="
[mod."github.com/golang/groupcache"]
version = "v0.0.0-20210331224755-41bb18bfe9da"
hash = "sha256-7Gs7CS9gEYZkbu5P4hqPGBpeGZWC64VDwraSKFF+VR0="
[mod."github.com/golang/protobuf"]
version = "v1.5.4"
hash = "sha256-N3+Lv9lEZjrdOWdQhFj6Y3Iap4rVLEQeI8/eFFyAMZ0="
[mod."github.com/google/go-querystring"]
version = "v0.0.0-20140804062624-30f7a39f4a21"
hash = "sha256-gjDRAELJKrQF7NgL2iSz3X260oHwykhsx23pGfN8iP4="
[mod."github.com/google/s2a-go"]
version = "v0.1.7"
hash = "sha256-E+SX/3VmRI5qN7SbnRP4Tt+gQTq93pScpY9U2tTmIU0="
[mod."github.com/google/uuid"]
version = "v1.6.0"
hash = "sha256-VWl9sqUzdOuhW0KzQlv0gwwUQClYkmZwSydHG2sALYw="
[mod."github.com/googleapis/enterprise-certificate-proxy"]
version = "v0.3.2"
hash = "sha256-wVuR3QC0mYFl5LNeKdRXdKdod7BGP5sv2h6VVib85v8="
[mod."github.com/googleapis/gax-go/v2"]
version = "v2.12.2"
hash = "sha256-Ip0d68jgTxN3v1MWFW6nwCsMc70Q9PCM87bhXJdOkHY="
[mod."github.com/intel-go/cpuid"]
version = "v0.0.0-20181003105527-1a4a6f06a1c6"
hash = "sha256-iGtI0TF0jB5FEWy1J4YFuHzDYjZM3YBlmENJEgNNkYg="
[mod."github.com/jinzhu/copier"]
version = "v0.0.0-20180308034124-7e38e58719c3"
hash = "sha256-F3zQzaS79GsZP6pLtxSYnsX/GgTN14TuBE8QqdBnJw4="
[mod."github.com/jmespath/go-jmespath"]
version = "v0.4.0"
hash = "sha256-xpT9g2qIXmPq7eeHUXHiDqJeQoHCudh44G/KCSFbcuo="
[mod."github.com/juju/loggo"]
version = "v1.0.0"
hash = "sha256-kfQSM4ZtqGXJJ0838/ClX2/SinwCKoDGrvpNVYVqsyk="
[mod."github.com/mitchellh/mapstructure"]
version = "v0.0.0-20140721150620-740c764bc614"
hash = "sha256-ix0FerxJyiTrNxmysA9vGDCPig14/8pBtsWQX/NIn2Y="
[mod."github.com/moby/term"]
version = "v0.5.0"
hash = "sha256-jy0kbkeUsr0KoiE33WLxNAgYXZIERKR2O5+saXBwdD8="
[mod."github.com/morikuni/aec"]
version = "v1.0.0"
hash = "sha256-5zYgLeGr3K+uhGKlN3xv0PO67V+2Zw+cezjzNCmAWOE="
[mod."github.com/opencontainers/go-digest"]
version = "v1.0.0"
hash = "sha256-cfVDjHyWItmUGZ2dzQhCHgmOmou8v7N+itDkLZVkqkQ="
[mod."github.com/opencontainers/image-spec"]
version = "v1.0.2"
hash = "sha256-X7kZoMYZNOIDpx8ziK7V+5YM07qiYWOE4yJo+sTOjjU="
[mod."github.com/pkg/errors"]
version = "v0.9.1"
hash = "sha256-mNfQtcrQmu3sNg/7IwiieKWOgFQOVVe2yXgKBpe/wZw="
[mod."github.com/pmezard/go-difflib"]
version = "v1.0.0"
hash = "sha256-/FtmHnaGjdvEIKAJtrUfEhV7EVo5A/eYrtdnUkuxLDA="
[mod."github.com/rackspace/gophercloud"]
version = "v1.0.1-0.20150408191457-ce0f487f6747"
hash = "sha256-MCFOrRu/ctp6LlaSjpLYTrPia3NUUaI0DOxUPLMp9HA="
[mod."github.com/skarademir/naturalsort"]
version = "v0.0.0-20150715044055-69a5d87bef62"
hash = "sha256-0pVMtl/t6ZpDftoVPY4tVa/3nUyPZtc59WsqbOHzKwI="
[mod."github.com/stretchr/objx"]
version = "v0.5.2"
hash = "sha256-VKYxrrFb1nkX6Wu3tE5DoP9+fCttwSl9pgLN6567nck="
[mod."github.com/stretchr/testify"]
version = "v1.9.0"
hash = "sha256-uUp/On+1nK+lARkTVtb5RxlW15zxtw2kaAFuIASA+J0="
[mod."github.com/tent/http-link-go"]
version = "v0.0.0-20130702225549-ac974c61c2f9"
hash = "sha256-0jlX8F7SZJfMmKG51E0x9ZT4nnPTz+nGqYzcbVYQ8Lo="
[mod."github.com/vmware/govcloudair"]
version = "v0.0.2"
hash = "sha256-Hk+WfrVIB1GupSP+XbfPO9szJaKUXz0kfoUX8RxIrKw="
[mod."github.com/vmware/govmomi"]
version = "v0.6.2"
hash = "sha256-MPxva4racsmd4vH76ttps85fhYHW6Ze1uNmCqwdT2so="
[mod."go.opencensus.io"]
version = "v0.24.0"
hash = "sha256-4H+mGZgG2c9I1y0m8avF4qmt8LUKxxVsTqR8mKgP4yo="
[mod."go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"]
version = "v0.49.0"
hash = "sha256-1/7YxtXZM4i75rXXIO6UN4CTY93nE/v2k2htS0uUOVg="
[mod."go.opentelemetry.io/otel"]
version = "v1.28.0"
hash = "sha256-bilBBr2cuADs9bQ7swnGLTuC7h0DooU6BQtrQqMqIjs="
[mod."go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"]
version = "v1.28.0"
hash = "sha256-nst5au6viPt71JG2TOd6JKfJGJ3QfbktC321XQJUfbU="
[mod."go.opentelemetry.io/otel/metric"]
version = "v1.28.0"
hash = "sha256-k3p1lYcvrODwIkZo/j2jvCoDFUelz4yVJEEVdUKUmGU="
[mod."go.opentelemetry.io/otel/sdk"]
version = "v1.28.0"
hash = "sha256-X48fV4A9vgxfjBpmUIQumod2nyI+tUc5lnhFkeKBRsc="
[mod."go.opentelemetry.io/otel/trace"]
version = "v1.28.0"
hash = "sha256-8uxmlm0/5VGoWegxwy0q8NgeY+pyicSoV08RkvD9Q98="
[mod."golang.org/x/crypto"]
version = "v0.31.0"
hash = "sha256-ZBjoG7ZOuTEmjaXPP9txAvjAjC46DeaLs0zrNzi8EQw="
[mod."golang.org/x/mod"]
version = "v0.17.0"
hash = "sha256-CLaPeF6uTFuRDv4oHwOQE6MCMvrzkUjWN3NuyywZjKU="
[mod."golang.org/x/net"]
version = "v0.33.0"
hash = "sha256-9swkU9vp6IflUUqAzK+y8PytSmrKLuryidP3RmRfe0w="
[mod."golang.org/x/oauth2"]
version = "v0.18.0"
hash = "sha256-TX4CvtvHU+SGSmqlxaQqlgJjlJiOtLGYAZa0zeBfZak="
[mod."golang.org/x/sync"]
version = "v0.10.0"
hash = "sha256-HWruKClrdoBKVdxKCyoazxeQV4dIYLdkHekQvx275/o="
[mod."golang.org/x/sys"]
version = "v0.28.0"
hash = "sha256-kzSlDo5FKsQU9cLefIt2dueGUfz9XuEW+mGSGlPATGc="
[mod."golang.org/x/term"]
version = "v0.27.0"
hash = "sha256-cb5p/yOlVL7dbkxugUVfqESTVpZ2LtrUWPnx9yue3r0="
[mod."golang.org/x/text"]
version = "v0.21.0"
hash = "sha256-QaMwddBRnoS2mv9Y86eVC2x2wx/GZ7kr2zAJvwDeCPc="
[mod."golang.org/x/tools"]
version = "v0.21.1-0.20240508182429-e35e4ccd0d2d"
hash = "sha256-KfnS+3fREPAWQUBoUedPupQp9yLrugxMmmEoHvyzKNE="
[mod."google.golang.org/api"]
version = "v0.169.0"
hash = "sha256-7+EAvbTTnUutkXpQBbxPSmZTS5P0mrKTiFooMI81w0k="
[mod."google.golang.org/appengine"]
version = "v1.6.8"
hash = "sha256-decMa0MiWfW/Bzr8QPPzzpeya0YWGHhZAt4Cr/bD1wQ="
[mod."google.golang.org/genproto/googleapis/api"]
version = "v0.0.0-20240701130421-f6361c86f094"
hash = "sha256-uDvld45ensSUweUJYFdUfVt/0mNRrexpuQ3Jas3GMv4="
[mod."google.golang.org/genproto/googleapis/rpc"]
version = "v0.0.0-20240701130421-f6361c86f094"
hash = "sha256-ass/74EkCljwk7DaASDtK2zipn2cZv6tCLKvwONUWgY="
[mod."google.golang.org/grpc"]
version = "v1.64.1"
hash = "sha256-A1+kiePmeqRIdigryUGNJWZiILLacDPtMTEyO6CqDpY="
[mod."google.golang.org/protobuf"]
version = "v1.34.2"
hash = "sha256-nMTlrDEE2dbpWz50eQMPBQXCyQh4IdjrTIccaU0F3m0="
[mod."gopkg.in/check.v1"]
version = "v1.0.0-20160105164936-4f90aeace3a2"
hash = "sha256-2+om0xBiwyEtUZRY78rYvWU8ECLVhEipNngXz9ttiVE="
[mod."gopkg.in/yaml.v3"]
version = "v3.0.1"
hash = "sha256-FqL9TKYJ0XkNwJFnq9j0VvJ5ZUU1RvH/52h/f5bkYAU="
[mod."gotest.tools/v3"]
version = "v3.5.1"
hash = "sha256-ps2GEc3P2xvlrU4TCtXz+nLTxyP0RrF7SScz5jUqE5E="
[mod."launchpad.net/gocheck"]
version = "v0.0.0-20140225173054-000000000087"
hash = "sha256-gDJ3emyS6+PruKHOf9BvukVENNUxzXhfKC4Gs6tQLvk="