Skip to content
Open
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
4 changes: 2 additions & 2 deletions checks/run-vm-test.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ writeShellApplication {
echo " Options:"
echo " -h --help Show this screen."
echo " -l --list Show available tests."
echo " -s --system Specify the target platform [default: ${stdenv.system}]."
echo " -s --system Specify the target platform [default: ${stdenv.hostPlatform.system}]."
echo " -i --interactive Run the test interactively."
echo
}
Expand All @@ -41,7 +41,7 @@ writeShellApplication {
args=$(getopt -o lihs: --long list,interactive,help,system: -n 'tests' -- "$@")
eval set -- "$args"
system="${stdenv.system}"
system="${stdenv.hostPlatform.system}"
nix_args="''${NIX_ARGS:=}"
driver_args=()
Expand Down
2 changes: 1 addition & 1 deletion checks/vmTests.nix
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ in
# Import all of our NixOS modules by default.
nixosModules.default
# Fix missing `pkgs.system` in tests.
{ nixpkgs.overlays = [ (_: _: { inherit system; }) ]; }
{ nixpkgs.overlays = [ (_: _: { inherit (pkgs.stdenv.hostPlatform) system; }) ]; }
];
documentation.enable = lib.mkDefault false;
};
Expand Down
62 changes: 24 additions & 38 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
cardano-node.url = "github:intersectmbo/cardano-node/10.5.3"; # following `nixpkgs_` doesn'work

cardano-db-sync = {
url = "github:intersectmbo/cardano-db-sync/13.6.0.5";
url = "github:intersectmbo/cardano-db-sync/13.6.0.7";
inputs = {
nixpkgs.follows = "cardano-node/nixpkgs"; # following `nixpkgs_` doesn't work
utils.follows = "flake-utils_";
Expand All @@ -58,8 +58,8 @@
};

blockfrost = {
url = "github:blockfrost/blockfrost-backend-ryo/v4.1.2";
# inputs.nixpkgs.follows = "nixpkgs_"; # FIXME do this when https://github.com/blockfrost/blockfrost-backend-ryo/issues/279 is merged
url = "github:blockfrost/blockfrost-backend-ryo/v4.3.0";
inputs.nixpkgs.follows = "nixpkgs_";
};

oura = {
Expand Down
2 changes: 1 addition & 1 deletion modules/monitoring.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ in
monitoring services Prometheus and Grafana
'';
targets = mkOption {
type = with types; listOf string;
type = with types; listOf str;
default = [ "localhost" ];
description = ''
List of hosts to to scrape prometheus metrics from.
Expand Down
2 changes: 1 addition & 1 deletion packages/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
];
flake.overlays = {
default = final: _prev: {
inherit ((config.perSystem final.system).packages)
inherit ((config.perSystem final.stdenv.hostPlatform.system).packages)
cardano-cli
cardano-node
demeter-run-cli
Expand Down
2 changes: 1 addition & 1 deletion packages/kupo.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ let
mkPackage =
pkgs: version: hash:
pkgs.fetchzip {
url = mkUrl pkgs.system version;
url = mkUrl pkgs.stdenv.hostPlatform.system version;
inherit hash;
stripRoot = false;
name = "kupo-${version}";
Expand Down
4 changes: 2 additions & 2 deletions packages/ogmios.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ let
pkgs: version: hash:
pkgs.fetchzip {
name = "ogmios-${version}";
url = mkUrl pkgs.system version;
url = mkUrl pkgs.stdenv.hostPlatform.system version;
inherit hash;
stripRoot = false;
postFetch = "chmod +x $out/bin/ogmios";
Expand All @@ -18,6 +18,6 @@ in
perSystem =
{ pkgs, ... }:
{
packages.ogmios = mkPackage pkgs "6.13.0" "sha256-b8EscEAsyBkC4PHu+XLtO4sT8WlbWfjfhu/HnOsOQ3E=";
packages.ogmios = mkPackage pkgs "6.14.0" "sha256-luN05hKGwB00y0mSTGAexi+l7edMfBSEg7WenGEMO6o=";
};
}