From b24d37bf5858866832141b66984ad163cb514fbe Mon Sep 17 00:00:00 2001 From: DarkKirb Date: Mon, 13 Jun 2022 05:53:33 +0000 Subject: [PATCH] Automatic Update --- flake.lock | 6 +++--- flake.nix | 24 +++++++++++------------- matrix/mautrix-whatsapp/default.nix | 14 ++++++++------ matrix/mautrix-whatsapp/source.nix | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 4c4522b..b84fd3c 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1654953433, - "narHash": "sha256-TwEeh4r50NdWHFAHQSyjCk2cZxgwUfcCCAJOhPdXB28=", + "lastModified": 1655096479, + "narHash": "sha256-Euh6BZ0JptL2KvhP8WxQoLbIHuqtXWqaEeMjJfmNfkw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90cd5459a1fd707819b9a3fb9c852beaaac3b79a", + "rev": "7f9a78e1979a35cffac617c521b98e08f89198de", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2db9f6b..89e5319 100644 --- a/flake.nix +++ b/flake.nix @@ -20,18 +20,16 @@ gomod2nix.url = "github:tweag/gomod2nix"; }; - outputs = - { self - , nixpkgs - , flake-utils - , ... - } @ inputs: - flake-utils.lib.eachSystem [ "aarch64-linux" "x86_64-linux" ] ( - system: - let - pkgs = import nixpkgs { inherit system; }; - in - rec { + outputs = { + self, + nixpkgs, + flake-utils, + ... + } @ inputs: + flake-utils.lib.eachSystem ["aarch64-linux" "x86_64-linux"] ( + system: let + pkgs = import nixpkgs {inherit system;}; + in rec { formatter = pkgs.alejandra; devShells.default = pkgs.mkShell { @@ -40,7 +38,7 @@ ]; }; - packages = pkgs.lib.lists.foldl (a: b: a // b) { } (map (f: import f { inherit pkgs inputs; }) [ + packages = pkgs.lib.lists.foldl (a: b: a // b) {} (map (f: import f {inherit pkgs inputs;}) [ ./scripts/clean-s3-cache.nix ./web/old-homepage.nix ./web/miifox-net.nix diff --git a/matrix/mautrix-whatsapp/default.nix b/matrix/mautrix-whatsapp/default.nix index 444f230..ae87947 100644 --- a/matrix/mautrix-whatsapp/default.nix +++ b/matrix/mautrix-whatsapp/default.nix @@ -1,15 +1,17 @@ -{ pkgs, inputs, ... } @ args: -let - buildGoApplication = pkgs.callPackage "${inputs.gomod2nix}/builder" { }; -in { + pkgs, + inputs, + ... +} @ args: let + buildGoApplication = pkgs.callPackage "${inputs.gomod2nix}/builder" {}; +in { mautrix-whatsapp = buildGoApplication rec { pname = "mautrix-whatsapp"; version = inputs.mautrix-whatsapp.lastModifiedDate; - src = pkgs.callPackage ./source.nix { }; + src = pkgs.callPackage ./source.nix {}; proxyVendor = true; modules = ./gomod2nix.toml; CGO_ENABLED = "1"; - buildInputs = [ pkgs.olm ]; + buildInputs = [pkgs.olm]; }; } diff --git a/matrix/mautrix-whatsapp/source.nix b/matrix/mautrix-whatsapp/source.nix index 682edbf..1606eb7 100644 --- a/matrix/mautrix-whatsapp/source.nix +++ b/matrix/mautrix-whatsapp/source.nix @@ -1,5 +1,5 @@ {fetchgit}: -fetchgit { +fetchgit { url = "https://github.com/mautrix/whatsapp"; rev = "0796d14133c19d5e18223b6f138835229b7acf10"; sha256 = "1a8d3rn9xsmxc8sd4iwfsrgia49nygc9va2n8v1ja2smn560pyq1";