From 1bb32b1bcc6cc6f258d745bd51cf919c1ca4700e Mon Sep 17 00:00:00 2001 From: William Carroll Date: Mon, 17 Aug 2020 10:25:26 +0100 Subject: [PATCH] Disable failing goals/default.nix Disabling failing packages until I can get a working CI build. --- ci/scripts/build-socrates.sh | 3 ++- website/default.nix | 3 --- website/goals/{default.nix => default.nix.ignore} | 0 website/index.html | 3 --- 4 files changed, 2 insertions(+), 7 deletions(-) rename website/goals/{default.nix => default.nix.ignore} (100%) diff --git a/ci/scripts/build-socrates.sh b/ci/scripts/build-socrates.sh index 6a9c48556..721fbdf57 100644 --- a/ci/scripts/build-socrates.sh +++ b/ci/scripts/build-socrates.sh @@ -1,7 +1,8 @@ set -euo pipefail -nix-build /home/wpcarro/nixpkgs/nixos \ +nix-build '' \ -I briefcase="$(pwd)" \ + -I nixpkgs=/home/wpcarro/nixpkgs-channels \ -I nixos-config=nixos/socrates/default.nix \ -A system \ --show-trace diff --git a/website/default.nix b/website/default.nix index 7bb2e4751..4fd85f260 100644 --- a/website/default.nix +++ b/website/default.nix @@ -7,9 +7,6 @@ pkgs.stdenv.mkDerivation { mkdir -p $out cp $src/index.html $out - mkdir -p $out/goals - cp -r ${briefcase.website.goals}/* $out/goals - mkdir -p $out/habits cp ${briefcase.website.habits} $out/habits/index.html ''; diff --git a/website/goals/default.nix b/website/goals/default.nix.ignore similarity index 100% rename from website/goals/default.nix rename to website/goals/default.nix.ignore diff --git a/website/index.html b/website/index.html index 6ad409bc1..5176b2a9e 100644 --- a/website/index.html +++ b/website/index.html @@ -10,9 +10,6 @@