Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions .gitmodules

This file was deleted.

17 changes: 5 additions & 12 deletions arion-compose.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
{ pkgs, ... }:
let
nft-marketplace-server =
(pkgs.callPackage (import nft-marketplace-server/release.nix)
{ }).nft-marketplace-server;
ogmios-datum-cache = (pkgs.callPackage (import ogmios-datum-cache/release.nix)
{ }).ogmios-datum-cache;
cardano-transaction-lib-server = (import
cardano-transaction-lib/default.nix).packages.x86_64-linux."cardano-browser-tx-server:exe:cardano-browser-tx-server";
in {

{
# NOTE: still can't remember it...
# ports = [ "host:container" ]
config.services = {
Expand Down Expand Up @@ -44,7 +37,7 @@ in {
};
cardano-transaction-lib-server.service = {
command =
[ "${cardano-transaction-lib-server}/bin/cardano-browser-tx-server" ];
[ "${pkgs.cardano-transaction-lib-server}/bin/cardano-browser-tx-server" ];
ports = [ "8081:8081" ];
useHostStore = true;
};
Expand All @@ -66,7 +59,7 @@ in {
];
};
ogmios-datum-cache.service = {
command = [ "${ogmios-datum-cache}/bin/ogmios-datum-cache" ];
command = [ "${pkgs.ogmios-datum-cache}/bin/ogmios-datum-cache" ];
depends_on = {
ogmios.condition = "service_healthy";
postgresql-db.condition = "service_healthy";
Expand Down Expand Up @@ -117,7 +110,7 @@ in {
};
nft-marketplace-server.service = {
command = [
"${nft-marketplace-server}/bin/nft-marketplace-server"
"${pkgs.nft-marketplace-server}/bin/nft-marketplace-server"
"--db-connection"
"postgresql://seabug:seabug@postgresql-db:5432/seabug"
"--nft-storage-key"
Expand Down
16 changes: 15 additions & 1 deletion arion-pkgs.nix
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
import <nixpkgs> { system = "x86_64-linux"; }
let flake = (import
(
let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
fetchTarball {
url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
sha256 = lock.nodes.flake-compat.locked.narHash;
}
)
{ src = ./.; }
);
in
import (flake.inputs.nixpkgs) {
systeem = "x86-64_linux";
overlays = [ flake.overlay ];
}
2 changes: 1 addition & 1 deletion buildFrontend.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nix develop cardano-transaction-lib/ -L --extra-experimental-features "nix-command flakes" -c ./buildFrontendStage2.sh
nix develop ".#stage2" -L --extra-experimental-features "nix-command flakes" -c ./buildFrontendStage2.sh
1 change: 0 additions & 1 deletion cardano-transaction-lib
Submodule cardano-transaction-lib deleted from 77b151
Loading