Merge pull request #1 from DarkKirb/create-pull-request/patch
Run automatic update
This commit is contained in:
commit
ccb9adf47a
4 changed files with 23 additions and 23 deletions
|
@ -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": {
|
||||
|
|
24
flake.nix
24
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
|
||||
|
|
|
@ -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];
|
||||
};
|
||||
}
|
||||
|
|
Reference in a new issue