From d05e0badf3b7d8c5d597b64d3fec89b5743853ca Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 26 Mar 2024 16:51:27 -0600 Subject: [PATCH] flake.lock: update nixpkgs,flake-utils Signed-off-by: Sumner Evans --- flake.lock | 16 ++++++++-------- flake.nix | 17 +++++++---------- go.mod | 5 +---- 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index f45bbbb..5e1e7a2 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -18,13 +18,13 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1711333969, + "narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b", "type": "github" }, "original": { @@ -37,7 +37,7 @@ "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs": "nixpkgs" } }, "systems": { diff --git a/flake.nix b/flake.nix index adfc461..acd203d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,28 +2,25 @@ description = "Chatwoot <-> Matrix Help Bot Integration"; inputs = { - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs-unstable, flake-utils }: + outputs = { self, nixpkgs, flake-utils }: (flake-utils.lib.eachDefaultSystem (system: - let pkgs = import nixpkgs-unstable { system = system; }; + let pkgs = import nixpkgs { inherit system; }; in rec { packages.chatwoot = pkgs.buildGoModule { pname = "chatwoot"; - version = "unstable-2023-12-14"; - - src = ./.; - + version = "unstable-2024-03-26"; + src = self; propagatedBuildInputs = [ pkgs.olm ]; - - vendorHash = "sha256-MYmJf8UlR6IhF5SVEQ9nap1vWFH00TjFjKrmISInXMg="; + vendorHash = "sha256-BIymQIs7vYO4JvRrj4cg8VlgsJ+pK/TRftwbYXKJD88="; }; packages.default = packages.chatwoot; devShells.default = pkgs.mkShell { - packages = with pkgs; [ go_1_21 olm pre-commit gotools gopls ]; + packages = with pkgs; [ go olm pre-commit gotools gopls ]; }; })); } diff --git a/go.mod b/go.mod index 7a791aa..ea8d0e1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/beeper/chatwoot -go 1.21 +go 1.22 require ( github.com/jackc/pgx/v4 v4.18.3 @@ -15,9 +15,6 @@ require ( github.com/rs/xid v1.5.0 // indirect golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect -) - -require ( github.com/jackc/chunkreader/v2 v2.0.1 // indirect github.com/jackc/pgconn v1.14.3 // indirect github.com/jackc/pgio v1.0.0 // indirect