From d856df18d4c71031630299369b333ef2a9fb131e Mon Sep 17 00:00:00 2001 From: "EEva (JPotier)" Date: Sat, 28 Sep 2019 13:16:35 +0300 Subject: [PATCH 1/2] Bring mopidy extensions up to speed as well --- pkgs/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/default.nix b/pkgs/default.nix index d49f570..a02b5fa 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -10,6 +10,10 @@ in # Picked from 2019-09-26 tree # 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 From 521bfc0a1502c1f6c6137e102ead5952b46ee7c1 Mon Sep 17 00:00:00 2001 From: "EEva (JPotier)" Date: Sat, 28 Sep 2019 14:05:25 +0300 Subject: [PATCH 2/2] Remove workarounds --- pkgs/default.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index a02b5fa..afa303b 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,22 +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; - 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 { + iosevka-hskl = super.iosevka.override { privateBuildPlan = { family = "Iosevka Samae"; design = [