Update dependencies

This commit is contained in:
niten 2022-08-22 09:30:34 -07:00
parent 72d3613970
commit 903d1b81d1
3 changed files with 34 additions and 30 deletions

8
flake.lock generated
View File

@ -76,16 +76,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1655278232, "lastModified": 1659446231,
"narHash": "sha256-H6s7tnHYiDKFCcLADS4sl1sUq0dDJuRQXCieguk/6SA=", "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8b538fcb329a7bc3d153962f17c509ee49166973", "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-22.05", "ref": "nixos-21.11",
"type": "indirect" "type": "indirect"
} }
}, },

View File

@ -2,7 +2,7 @@
description = "Fudo Coinbase Price Bot."; description = "Fudo Coinbase Price Bot.";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-22.05"; nixpkgs.url = "nixpkgs/nixos-21.11";
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
clj-nix = { clj-nix = {
url = "github:jlesquembre/clj-nix"; url = "github:jlesquembre/clj-nix";
@ -11,28 +11,33 @@
}; };
outputs = { self, nixpkgs, utils, clj-nix, ... }: outputs = { self, nixpkgs, utils, clj-nix, ... }:
let utils.lib.eachDefaultSystem (system:
system = "x86_64-linux"; let
pkgs = nixpkgs.legacyPackages."${system}"; pkgs = nixpkgs.legacyPackages."${system}";
cljpkgs = clj-nix.packages."${system}"; mkCljBin = clj-nix.packages."${system}".mkCljBin;
update-deps = pkgs.writeShellScriptBin "update-deps.sh" '' update-deps = pkgs.writeShellScriptBin "update-deps.sh" ''
${clj-nix.packages."${system}".deps-lock}/bin/deps-lock ${clj-nix.packages."${system}".deps-lock}/bin/deps-lock
''; '';
in { in {
packages."${system}".fudo-pricebot = cljpkgs.mkCljBin { packages = rec {
projectSrc = ./.; fudo-pricebot = mkCljBin {
name = "org.fudo/pricebot"; projectSrc = ./.;
main-ns = "pricebot.core"; name = "org.fudo/pricebot";
jdkRunner = pkgs.jdk17_headless; main-ns = "pricebot.core";
version = "0.1"; jdkRunner = pkgs.jdk17_headless;
version = "0.1";
};
default = fudo-pricebot;
};
legacyPackages = {
fudo-pricebot = self.packages."${system}".fudo-pricebot;
};
devShells.default =
pkgs.mkShell { buildInputs = with pkgs; [ update-deps ]; };
}) // {
nixosModules.default = import ./module.nix;
}; };
defaultPackage."${system}" = self.packages."${system}".fudo-pricebot;
nixosModule =
pkgs.callPackage ./module.nix self.packages."${system}".fudo-pricebot;
devShell."${system}" =
pkgs.mkShell { buildInputs = with pkgs; [ clojure update-deps ]; };
};
} }

View File

@ -1,4 +1,3 @@
pricebot:
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
@ -68,7 +67,7 @@ in {
}; };
serviceConfig = { serviceConfig = {
ExecStart = pkgs.writeShellScript "launch-pricebot-${currency}.sh" '' ExecStart = pkgs.writeShellScript "launch-pricebot-${currency}.sh" ''
${pricebot}/bin/pricebot --bebot-auth-token-file=$CREDENTIALS_DIRECTORY/auth.token ${pkgs.pricebot}/bin/pricebot --bebot-auth-token-file=$CREDENTIALS_DIRECTORY/auth.token
''; '';
DynamicUser = true; DynamicUser = true;
PrivateTmp = true; PrivateTmp = true;