From f074bd8978057418db4fc3f8f9e26c8478d8e2b8 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Tue, 23 Jun 2020 18:43:47 +0300 Subject: [PATCH] CI: mv rev doc (.travis.yml->build.sh) M .travis.yml M build.sh --- .travis.yml | 10 ---------- build.sh | 11 +++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 95de683..2403032 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,16 +23,6 @@ env: global: # NOTE: This is secure CACHIX_SIGNING_KEY=val - secure: "dm6I+M4+V+C7QMTpcSADdKPE633SvmToXZrTbZ7miNDGmMN+/SfHeN2ybi1+PW6oViMlbPN/7J/aEfiGjSJI8vLk72Y4uCWGmpSb8TXZLu6+whnxtZzzW8+z4tsM4048QJg7CF3N/25U8thRFgs3DqUub1Sf3nG9LrNWdz6ZcDQ=" - # NOTE: Nix by default uses nixpkgs-unstable channel - # NOTE: Setup for Nixpkgs revision - # `rev` vals in order of freshness -> cache & stability: - # { master - # , commitHash - # , haskell-updates # Haskell development branch in Nixpkgs, can be inconsistent. Weekly merged into the upstream - # , nixpkgs-unstable # Default branch on Nix installation, default for non NixOS - # , nixos-unstable # nixpkgs-unstable that passes a bunch of base tests - # , nixos-20.03 # Last stable release, gets almost no updates to recipes, gets only required backports - # } ### ### NOTE: This configuration uses `build.sh` interface, which uses `default.nix` interface, which exposes the Nixpkgs Haskell Lib interface. ### diff --git a/build.sh b/build.sh index be3fea0..1b1a349 100755 --- a/build.sh +++ b/build.sh @@ -7,6 +7,17 @@ set -Eexuo pipefail # NOTE: If var not imported - set to the default value GHCVERSION=${GHCVERSION:-'ghc8101'} +# NOTE: Nix by default uses nixpkgs-unstable channel +# Setup for Nixpkgs revision: +# `rev` vals in order of freshness -> cache & stability: +# { master +# , commitHash +# , haskell-updates # Haskell development branch in Nixpkgs, can be inconsistent. Weekly merged into the upstream +# , nixpkgs-unstable # Default branch on Nix installation, default for non NixOS +# , nixos-unstable # nixpkgs-unstable that passes a bunch of base tests +# , nixos-20.03 # Last stable release, gets almost no updates to recipes, gets only required backports +# ... +# } rev=${rev:-'nixpkgs-unstable'} NIX_PATH=${NIX_PATH:-"nixpkgs=https://github.com/nixos/nixpkgs/archive/$rev.tar.gz"} export NIX_PATH