Merge pull request #7 from tazjin/chore/bump-19.09
Update nixpkgs set to NixOS 19.09
This commit is contained in:
commit
2e4c630f64
4 changed files with 8 additions and 5 deletions
|
@ -9,10 +9,10 @@ with builtins;
|
|||
let
|
||||
# The pinned commit here is identical to the public nixery.dev
|
||||
# version, since popularity data has been generated for that.
|
||||
stableCommit = "5271f8dddc0f2e54f55bd2fc1868c09ff72ac980";
|
||||
stableCommit = "80b42e630b23052d9525840a9742100a2ceaaa8f";
|
||||
stableSrc = fetchTarball {
|
||||
url = "https://github.com/NixOS/nixpkgs-channels/archive/${stableCommit}.tar.gz";
|
||||
sha256 = "0w0x7whwb98lalaw25hxarmr924m1i49c1kacyypmnh2vjbkrjmi";
|
||||
sha256 = "0243qiivxl3z51biy4f5y5cy81x5bki5dazl9wqwgnmd373gpmxy";
|
||||
};
|
||||
|
||||
unstableCommit = "765a71f15025ce78024bae3dc4a92bd2be3a8fbf";
|
||||
|
@ -39,7 +39,7 @@ let
|
|||
|
||||
# Third-party projects (either vendored or modified from nixpkgs) go here:
|
||||
nixery = import ./third_party/nixery.nix { pkgs = self; };
|
||||
terraform-gcp = unstable.terraform_0_12.withPlugins(p: [ p.google p.google-beta ]);
|
||||
terraform-gcp = self.terraform_0_12.withPlugins(p: [ p.google p.google-beta ]);
|
||||
ormolu = import (self.fetchFromGitHub {
|
||||
owner = "tweag";
|
||||
repo = "ormolu";
|
||||
|
|
|
@ -42,6 +42,8 @@ spec:
|
|||
value: 'ssh -F /var/nixery/ssh_config'
|
||||
- name: NIXERY_PKGS_REPO
|
||||
value: {{ .repo }}
|
||||
- name: NIX_POPULARITY_URL
|
||||
value: 'https://storage.googleapis.com/nixery-layers/popularity/{{ .popularity }}'
|
||||
volumes:
|
||||
- name: nixery-secrets
|
||||
secret:
|
||||
|
|
|
@ -25,6 +25,7 @@ include:
|
|||
bucket: tazjins-data
|
||||
account: nixery@tazjins-infrastructure.iam.gserviceaccount.com
|
||||
repo: git@github.com:tazjin/depot.git
|
||||
popularity: 'popularity-19.09.891.80b42e630b2.json'
|
||||
- name: tazblog
|
||||
- name: https-lb
|
||||
- name: nginx
|
||||
|
|
4
third_party/nixery.nix
vendored
4
third_party/nixery.nix
vendored
|
@ -5,8 +5,8 @@
|
|||
let src = pkgs.fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "nixery";
|
||||
rev = "924a4b2d3bf5ed9d7052d7ac09288bb0037daae1";
|
||||
sha256 = "1ccq2nk4kbprm48zzpvc132970wvdmvi1iyyrk8kbrf3b92gsm63";
|
||||
rev = "4f6ce83f9296545d6c74321b37d18545764c8827";
|
||||
sha256 = "19aiak1pss6vwm0fwn02827l5ir78fkqglfbdl2gchsyv3gps8bg";
|
||||
};
|
||||
in import src {
|
||||
inherit pkgs;
|
||||
|
|
Loading…
Reference in a new issue