Remove workarounds

This commit is contained in:
EEva (JPotier) 2019-09-28 14:05:25 +03:00
parent d856df18d4
commit 521bfc0a15

View file

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