picnoir
/
hnix
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CI: mv rev doc (build.sh->default.nix) 

M  build.sh
M  default.nix
This commit is contained in:
Anton-Latukha 2020-06-24 03:11:05 +03:00
parent 601659af16
commit cbe22270b6
No known key found for this signature in database
GPG Key ID: 3D84C07E91802E41
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build.sh
View File

@ -14,17 +14,6 @@ set -Eexuo pipefail
# NOTE: If vars not imported - set to the default value
compiler=${compiler:-'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'}
# If NIX_PATH not imported - construct it from `rev`
NIX_PATH=${NIX_PATH:-"nixpkgs=https://github.com/nixos/nixpkgs/archive/$rev.tar.gz"}

12
default.nix
View File

@ -68,7 +68,17 @@
, useRev ? false
# Accepts Nixpkgs channel name and Git revision
# Nix by default uses nixpkgs-unstable channel
# Nixpkgs revision options:
# `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 ? "nixpkgs-unstable"
, pkgs ?