Merge pull request #1 from DarkKirb/create-pull-request/patch

Run automatic update
This commit is contained in:
Charlotte 🦝 Delenk 2022-06-13 06:54:28 +01:00 committed by GitHub
commit ccb9adf47a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 23 deletions

View file

@ -148,11 +148,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1654953433, "lastModified": 1655096479,
"narHash": "sha256-TwEeh4r50NdWHFAHQSyjCk2cZxgwUfcCCAJOhPdXB28=", "narHash": "sha256-Euh6BZ0JptL2KvhP8WxQoLbIHuqtXWqaEeMjJfmNfkw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "90cd5459a1fd707819b9a3fb9c852beaaac3b79a", "rev": "7f9a78e1979a35cffac617c521b98e08f89198de",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -20,18 +20,16 @@
gomod2nix.url = "github:tweag/gomod2nix"; gomod2nix.url = "github:tweag/gomod2nix";
}; };
outputs = outputs = {
{ self self,
, nixpkgs nixpkgs,
, flake-utils flake-utils,
, ... ...
} @ inputs: } @ inputs:
flake-utils.lib.eachSystem [ "aarch64-linux" "x86_64-linux" ] ( flake-utils.lib.eachSystem ["aarch64-linux" "x86_64-linux"] (
system: system: let
let pkgs = import nixpkgs {inherit system;};
pkgs = import nixpkgs { inherit system; }; in rec {
in
rec {
formatter = pkgs.alejandra; formatter = pkgs.alejandra;
devShells.default = pkgs.mkShell { 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 ./scripts/clean-s3-cache.nix
./web/old-homepage.nix ./web/old-homepage.nix
./web/miifox-net.nix ./web/miifox-net.nix

View file

@ -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 { mautrix-whatsapp = buildGoApplication rec {
pname = "mautrix-whatsapp"; pname = "mautrix-whatsapp";
version = inputs.mautrix-whatsapp.lastModifiedDate; version = inputs.mautrix-whatsapp.lastModifiedDate;
src = pkgs.callPackage ./source.nix { }; src = pkgs.callPackage ./source.nix {};
proxyVendor = true; proxyVendor = true;
modules = ./gomod2nix.toml; modules = ./gomod2nix.toml;
CGO_ENABLED = "1"; CGO_ENABLED = "1";
buildInputs = [ pkgs.olm ]; buildInputs = [pkgs.olm];
}; };
} }

View file

@ -1,5 +1,5 @@
{fetchgit}: {fetchgit}:
fetchgit { fetchgit {
url = "https://github.com/mautrix/whatsapp"; url = "https://github.com/mautrix/whatsapp";
rev = "0796d14133c19d5e18223b6f138835229b7acf10"; rev = "0796d14133c19d5e18223b6f138835229b7acf10";
sha256 = "1a8d3rn9xsmxc8sd4iwfsrgia49nygc9va2n8v1ja2smn560pyq1"; sha256 = "1a8d3rn9xsmxc8sd4iwfsrgia49nygc9va2n8v1ja2smn560pyq1";