Merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
Martin Potier 2019-10-08 18:07:35 +03:00
commit 6db8b83266
No known key found for this signature in database
GPG key ID: D4DD957DBA4AD89E

View file

@ -2,18 +2,11 @@
self: super:
let
iosevkaTree = import (builtins.fetchTarball https://github.com/NixOS/nixpkgs/archive/dd2f026780399cf11c47fcf6085145b25b14307e.tar.gz) {};
mopidyTree = import (builtins.fetchTarball https://github.com/NixOS/nixpkgs/archive/d68db15912f6ff0f0082ed3825efae5098c77905.tar.gz) {};
in
#let
# mopidyTree = import (builtins.fetchTarball https://github.com/NixOS/nixpkgs/archive/d68db15912f6ff0f0082ed3825efae5098c77905.tar.gz) {};
#in
{
# Picked from 2019-09-26 tree
# Delete this when it lands in main channel
mopidy = mopidyTree.mopidy;
# Picked from 2019-09-25 tree
# replace iosevkaTree by super once it's in the main channel
iosevka-hskl = iosevkaTree.iosevka.override {
iosevka-hskl = super.iosevka.override {
privateBuildPlan = {
family = "Iosevka Samae";
design = [