Deuxfleurs
/
guichet
23
3
Fork 1
Code Issues 44 Pull Requests 1 Projects 2 Releases Wiki Activity

fix build
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Quentin 2023-09-26 09:10:04 +02:00
parent 49d8e81fbe
commit c735183a7a
Signed by: quentin
GPG Key ID: E9602264D639FF68
3 changed files with 74 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
flake.lock
View File

@ -1,54 +1,72 @@
{ {
"nodes": { "nodes": {
"gomod2nix": { "flake-utils": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs", "systems": "systems"
"utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1655245309, "lastModified": 1694529238,
"narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=", "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gomod2nix": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1694616124,
"narHash": "sha256-c49BVhQKw3XDRgt+y+uPAbArtgUlMXCET6VxEBmzHXE=",
"owner": "tweag", "owner": "tweag",
"repo": "gomod2nix", "repo": "gomod2nix",
"rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", "rev": "f95720e89af6165c8c0aa77f180461fe786f3c21",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "tweag", "owner": "tweag",
"repo": "gomod2nix", "repo": "gomod2nix",
"rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", "rev": "f95720e89af6165c8c0aa77f180461fe786f3c21",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1653581809, "lastModified": 1695711119,
"narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", "narHash": "sha256-qrtJ4zliGgH24FMhj5a/5Gq7SkjqKquF5AVS0eEevBk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "83658b28fe638a170a19b8933aa008b30640fbd1", "rev": "044b1b65fd5dd49a535e9a9bd1a2cee884eb22d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "master",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1669764884, "lastModified": 1695710730,
"narHash": "sha256-1qWR/5+WtqxSedrFbUbM3zPMO7Ec2CGWaxtK4z4DdvY=", "narHash": "sha256-GigCuk3t8AVXr2NdX6eBgouc20JWWrZatbKH3xZZSC4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0244e143dc943bcf661fdaf581f01eb0f5000fcf", "rev": "f758d66c9cc3011f5327f8583908a7803cc019b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0244e143dc943bcf661fdaf581f01eb0f5000fcf", "rev": "f758d66c9cc3011f5327f8583908a7803cc019b1",
"type": "github" "type": "github"
} }
}, },
@ -58,18 +76,18 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
} }
}, },
"utils": { "systems": {
"locked": { "locked": {
"lastModified": 1653893745, "lastModified": 1681028828,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "numtide", "owner": "nix-systems",
"repo": "flake-utils", "repo": "default",
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "nix-systems",
"repo": "flake-utils", "repo": "default",
"type": "github" "type": "github"
} }
} }

13
flake.nix
View File

@ -2,22 +2,23 @@
description = "A simple LDAP web interface for Bottin"; description = "A simple LDAP web interface for Bottin";
inputs.nixpkgs.url = inputs.nixpkgs.url =
"github:nixos/nixpkgs/0244e143dc943bcf661fdaf581f01eb0f5000fcf"; "github:nixos/nixpkgs/f758d66c9cc3011f5327f8583908a7803cc019b1";
inputs.gomod2nix.url = inputs.gomod2nix.url =
"github:tweag/gomod2nix/40d32f82fc60d66402eb0972e6e368aeab3faf58"; "github:tweag/gomod2nix/f95720e89af6165c8c0aa77f180461fe786f3c21";
outputs = { self, nixpkgs, gomod2nix }: outputs = { self, nixpkgs, gomod2nix }:
let let
pkgs = import nixpkgs { pkgs = import nixpkgs {
system = "x86_64-linux"; system = "x86_64-linux";
overlays = [ overlays = [
(self: super: { (import "${gomod2nix}/overlay.nix")
/*(self: super: {
gomod = super.callPackage "${gomod2nix}/builder/" { }; gomod = super.callPackage "${gomod2nix}/builder/" { };
}) })*/
]; ];
}; };
src = ./.; src = ./.;
bottin = pkgs.gomod.buildGoApplication { bottin = pkgs.buildGoApplication {
pname = "guichet"; pname = "guichet";
version = "0.1.0"; version = "0.1.0";
src = src; src = src;
@ -41,6 +42,6 @@
packages.x86_64-linux.bottin = bottin; packages.x86_64-linux.bottin = bottin;
packages.x86_64-linux.default = bottin; packages.x86_64-linux.default = bottin;
devShell.x86_64-linux = pkgs.mkShell { nativeBuildInputs = [ pkgs.go ]; }; devShell.x86_64-linux = pkgs.mkShell { nativeBuildInputs = [ pkgs.go pkgs.gomod2nix ]; };
}; };
} }

73
gomod2nix.toml
View File

@ -1,12 +1,9 @@
schema = 3 schema = 3
[mod] [mod]
[mod."github.com/davecgh/go-spew"] [mod."git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang"]
version = "v1.1.1" version = "v0.0.0-20230131081355-c965fe7f7dc9"
hash = "sha256-nhzSUrE1fCkN0+RL04N4h8jWmRFPPPWbCuDc7Ss0akI=" hash = "sha256-qJN9yDMIh3xRk/3IYEWZca/biMVXXmDlPTzy0Cg11oc="
[mod."github.com/dustin/go-humanize"]
version = "v1.0.0"
hash = "sha256-gy4G1PnHD9iw2MitHX6y1y93qr3C9IncmXL7ttUMDs8="
[mod."github.com/emersion/go-sasl"] [mod."github.com/emersion/go-sasl"]
version = "v0.0.0-20191210011802-430746ea8b9b" version = "v0.0.0-20191210011802-430746ea8b9b"
hash = "sha256-bADpAn0ZhlTTsEB3MsG8J31cQjTtHTzohX/wkL1aMIc=" hash = "sha256-bADpAn0ZhlTTsEB3MsG8J31cQjTtHTzohX/wkL1aMIc="
@ -19,15 +16,12 @@ schema = 3
[mod."github.com/go-ldap/ldap/v3"] [mod."github.com/go-ldap/ldap/v3"]
version = "v3.1.6" version = "v3.1.6"
hash = "sha256-UPUdYKOoCQWgl2Onbq1Oql7XU4TeYQA/+j4atwhdKbE=" hash = "sha256-UPUdYKOoCQWgl2Onbq1Oql7XU4TeYQA/+j4atwhdKbE="
[mod."github.com/google/gofuzz"] [mod."github.com/golang/protobuf"]
version = "v1.0.0" version = "v1.4.2"
hash = "sha256-ZvgcSQt4kMwS6nvPp3jrlCHSH3bky1oBD6kytnEa5GM=" hash = "sha256-zhA1d1Kw1ZV/kDBZ4Iv5miKHjZBhcV8m3BiD1qocJqw="
[mod."github.com/google/uuid"] [mod."github.com/google/uuid"]
version = "v1.1.1" version = "v1.1.1"
hash = "sha256-66PXC/RCPUyhS9PhkIPQFR3tbM2zZYDNPGXN7JJj3UE=" hash = "sha256-66PXC/RCPUyhS9PhkIPQFR3tbM2zZYDNPGXN7JJj3UE="
[mod."github.com/gopherjs/gopherjs"]
version = "v0.0.0-20181017120253-0766667cb4d1"
hash = "sha256-AuXnjjoLbFZ85Oi8sldH117MBh+yCUB9HU5Y5syJ7Lg="
[mod."github.com/gorilla/mux"] [mod."github.com/gorilla/mux"]
version = "v1.7.3" version = "v1.7.3"
hash = "sha256-YZSIN7Ua+hPqSIrT+tiRz3aFqJ1EWHvwee+PptpHI28=" hash = "sha256-YZSIN7Ua+hPqSIrT+tiRz3aFqJ1EWHvwee+PptpHI28="
@ -43,15 +37,9 @@ schema = 3
[mod."github.com/json-iterator/go"] [mod."github.com/json-iterator/go"]
version = "v1.1.10" version = "v1.1.10"
hash = "sha256-jdS2C0WsgsWREBSj+YUzSqdZofMfUMecaOQ/lB9Mu6k=" hash = "sha256-jdS2C0WsgsWREBSj+YUzSqdZofMfUMecaOQ/lB9Mu6k="
[mod."github.com/jtolds/gls"]
version = "v4.20.0+incompatible"
hash = "sha256-Zu5naRjnwOYBzRv0CYhIZTizA0AajzOg7mJrL7Bo/cw="
[mod."github.com/klauspost/cpuid"] [mod."github.com/klauspost/cpuid"]
version = "v1.2.3" version = "v1.2.3"
hash = "sha256-1IBlONMxKVgudV/mzNrFZB60z8w4xFjVbEU2DoIAoeg=" hash = "sha256-1IBlONMxKVgudV/mzNrFZB60z8w4xFjVbEU2DoIAoeg="
[mod."github.com/konsorten/go-windows-terminal-sequences"]
version = "v1.0.3"
hash = "sha256-9HojTXKv7b3HiEhYaKXDxraEfvU5vrg47FbCjTRpOvs="
[mod."github.com/minio/md5-simd"] [mod."github.com/minio/md5-simd"]
version = "v1.1.0" version = "v1.1.0"
hash = "sha256-jJbDwg7KlLB991wj1U6y+kJKOUxKVGQrDbM3nY+6qxE=" hash = "sha256-jJbDwg7KlLB991wj1U6y+kJKOUxKVGQrDbM3nY+6qxE="
@ -73,39 +61,30 @@ schema = 3
[mod."github.com/nfnt/resize"] [mod."github.com/nfnt/resize"]
version = "v0.0.0-20180221191011-83c6a9932646" version = "v0.0.0-20180221191011-83c6a9932646"
hash = "sha256-yvPV+HlDOyJsiwAcVHQkmtw8DHSXyw+cXHkigXm8rAA=" hash = "sha256-yvPV+HlDOyJsiwAcVHQkmtw8DHSXyw+cXHkigXm8rAA="
[mod."github.com/pmezard/go-difflib"]
version = "v1.0.0"
hash = "sha256-/FtmHnaGjdvEIKAJtrUfEhV7EVo5A/eYrtdnUkuxLDA="
[mod."github.com/sirupsen/logrus"]
version = "v1.6.0"
hash = "sha256-4v27X4yyl52BtZcZEnDe0tfvOaEq+TCcp7R8HBzreDM="
[mod."github.com/smartystreets/assertions"]
version = "v0.0.0-20180927180507-b2de0cb4f26d"
hash = "sha256-PoE+VQEnzJogI/mDBJ6dTCCR217nFjHfYWXQt9Vr9MQ="
[mod."github.com/smartystreets/goconvey"]
version = "v0.0.0-20190330032615-68dc04aab96a"
hash = "sha256-HD+AZE1agl1pVbQTFUKLKtjg3XdVSVLwRSu4u+UVV2M="
[mod."github.com/stretchr/objx"]
version = "v0.1.0"
hash = "sha256-az0Vd4MG3JXfaYbj0Q6AOmNkrXgmXDeQm8+BBiDXmdA="
[mod."github.com/stretchr/testify"]
version = "v1.3.0"
hash = "sha256-+mSebBNccNcxbY462iKTNTWmd5ZuUkUqFebccn3EtIA="
[mod."golang.org/x/crypto"] [mod."golang.org/x/crypto"]
version = "v0.0.0-20200214034016-1d94cc7ab1c6" version = "v0.0.0-20200622213623-75b288015ac9"
hash = "sha256-fWTzdDxt/1E8Jx7b6tmYEVqqJs5FoVVya9aEK9gDbdY=" hash = "sha256-QvFbJEm3gXs2NtaaREbkbAtdHpU4fqX+0C0EvTezdKM="
[mod."golang.org/x/net"] [mod."golang.org/x/net"]
version = "v0.0.0-20190522155817-f3200d17e092" version = "v0.0.0-20200822124328-c89045814202"
hash = "sha256-KkNNFr+wx/pf7lSLN2ygwkQ9oCZQuef+hCtEjEX+gJE=" hash = "sha256-wg5IrlVfnsRL86dbi3WJ9XA6Er6JuuyusytIPf18mO0="
[mod."golang.org/x/oauth2"]
version = "v0.0.0-20210323180902-22b0adad7558"
hash = "sha256-mQv+EELtNg99ZYiRFxel405A66PtHK6eCx6XM3vqKG8="
[mod."golang.org/x/sys"] [mod."golang.org/x/sys"]
version = "v0.0.0-20200223170610-d5e6a3e2c0ae" version = "v0.12.0"
hash = "sha256-IvG2XSER2dyrVfhYieEpHcp28LOz4FrjQqN0SCeFOek=" hash = "sha256-Ht/PhBJGWNBg4ksmdUu4+7hJjFypSwoUN/8DJricd+0="
[mod."golang.org/x/term"]
version = "v0.12.0"
hash = "sha256-NFko0uqv/r2VxrbSgS1IwWzaWQK3RZuk0MvUV+qxIsc="
[mod."golang.org/x/text"] [mod."golang.org/x/text"]
version = "v0.3.0" version = "v0.3.3"
hash = "sha256-0FFbaxF1ZuAQF3sCcA85e8MO6prFeHint36inija4NY=" hash = "sha256-kiauoT7vd7Mh2AW7TnceQyoCDsARxWkDZu1OSD9dCZw="
[mod."golang.org/x/tools"] [mod."google.golang.org/appengine"]
version = "v0.0.0-20190328211700-ab21143f2384" version = "v1.6.6"
hash = "sha256-OcjaTxx6C/cbnUZLN2ArTrOBlBCijWJVUPaMgK67MkY=" hash = "sha256-nZnEfsXy3mgzRnlyWGHJKqsosvnAQFkhVszw3DSFe6Y="
[mod."google.golang.org/protobuf"]
version = "v1.25.0"
hash = "sha256-3sf57K5A0nmA1UmDe+6FUNJI6UR+SfVyZWNv+2TGHT4="
[mod."gopkg.in/ini.v1"] [mod."gopkg.in/ini.v1"]
version = "v1.57.0" version = "v1.57.0"
hash = "sha256-WSjX+qHJ1Rf4FRMTs7udQwEBkIo+z8+EK3uB5CebrZ4=" hash = "sha256-WSjX+qHJ1Rf4FRMTs7udQwEBkIo+z8+EK3uB5CebrZ4="