From a41a30d709ae7bacb7d89c21dd11afa610648972 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 3 Oct 2017 21:36:53 +0200
Subject: tv alnus nixpkgs: 17.03 -> 17.09

---
 tv/1systems/alnus/source.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/1systems')

diff --git a/tv/1systems/alnus/source.nix b/tv/1systems/alnus/source.nix
index c3ed4dcfb..9fd2f668c 100644
--- a/tv/1systems/alnus/source.nix
+++ b/tv/1systems/alnus/source.nix
@@ -1,4 +1,4 @@
 import <stockholm/tv/source.nix> {
   name = "alnus";
-  override.nixpkgs.git.ref = "9b948ea439ddbaa26740ce35543e7e35d2aa6d18";
+  override.nixpkgs.git.ref = "d0f0657ca06cc8cb239cb94f430b53bcdf755887";
 }
-- 
cgit v1.2.3


From 213356531dd1ba8c807ae90fc85a92ebbc301be0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 3 Oct 2017 21:53:52 +0200
Subject: tv mu systemPackages: build KDE locale manually

Because nixpkgs d7e9248debe66225bae1788c347bfe6c62e38a6e

nixpkgs-17.09 fixup
---
 tv/1systems/mu/config.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tv/1systems')

diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index f3e7b515b..501200c1f 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -52,11 +52,13 @@ with import <stockholm/lib>;
   networking.networkmanager.enable = true;
 
   environment.systemPackages = with pkgs; [
+    (pkgs.kdeApplications.callPackage
+      (import <nixpkgs/pkgs/applications/kde/kde-locale-5.nix> "de" {})
+      {})
     chromium
     firefoxWrapper
     gimp
     iptables
-    kdeApplications.l10n.de.qt5
     libreoffice
     pidginotr
     pidgin-with-plugins
-- 
cgit v1.2.3


From c9c5fa7c872778f81868e4f30f9abcac9cd2f74d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 5 Oct 2017 20:00:03 +0200
Subject: tv mu systemPackages: drop custom KDE locales

Apparently each application ships their own locales now.
See discussion at https://github.com/NixOS/nixpkgs/commit/d7e9248debe66225

nixpkgs-17.09 fixup
---
 tv/1systems/mu/config.nix | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'tv/1systems')

diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 501200c1f..10d7b2197 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -52,9 +52,6 @@ with import <stockholm/lib>;
   networking.networkmanager.enable = true;
 
   environment.systemPackages = with pkgs; [
-    (pkgs.kdeApplications.callPackage
-      (import <nixpkgs/pkgs/applications/kde/kde-locale-5.nix> "de" {})
-      {})
     chromium
     firefoxWrapper
     gimp
-- 
cgit v1.2.3