From 4ae2fa4a6aa3740a9fbd175ae869a698badb2351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Tue, 19 Oct 2021 22:42:00 +0200
Subject: [PATCH] feat: unify/update stockholm pkgs

---
 .versions/stockholm.json | 8 ++++----
 configs/default.nix      | 5 +----
 configs/flix.nix         | 4 ++--
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.versions/stockholm.json b/.versions/stockholm.json
index 9c7809e..2a58bbe 100644
--- a/.versions/stockholm.json
+++ b/.versions/stockholm.json
@@ -1,9 +1,9 @@
 {
   "url": "https://cgit.krebsco.de/stockholm",
-  "rev": "9a855d50a7619192b909e8e3657acb16ecbd5fb4",
-  "date": "2021-10-05T23:18:09+02:00",
-  "path": "/nix/store/kzcxvmapy6whl25895dq35s11imv8ibi-stockholm",
-  "sha256": "08c2qd83704c6f3b7m5wxkf5id46bljm6xpkpc42i7svlbakb8zz",
+  "rev": "be5f4833fe1dc3ec4acb24eeb5a6670c2aaef2e0",
+  "date": "2021-10-12T22:11:08+02:00",
+  "path": "/nix/store/cir2mah9pjahvy2mql663zhj6pwzi6h6-stockholm",
+  "sha256": "1cyl21rh7dlpar33gq2bv0rm8x3s0k3vib75gpgz3qcah0ycdcjw",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false
diff --git a/configs/default.nix b/configs/default.nix
index 4d3a301..fe7bedc 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -30,13 +30,10 @@ in {
           };
         };
         overlays = [
+          (import <stockholm/krebs/5pkgs>)
           (self: super: {
             scripts = import <niveum/packages/scripts> { pkgs = super; lib = super.lib; };
           })
-          (import <stockholm/krebs/5pkgs/haskell>)
-          (import <stockholm/krebs/5pkgs/simple>)
-          (import <stockholm/submodules/nix-writers/pkgs>)
-          (import <stockholm/krebs/5pkgs/override>)
         ];
       };
     }
diff --git a/configs/flix.nix b/configs/flix.nix
index 9cdc468..ac43d83 100644
--- a/configs/flix.nix
+++ b/configs/flix.nix
@@ -55,7 +55,7 @@ in {
   };
 
   environment.systemPackages = [
-    (pkgs.writeDashBin "mpv-simpsons" ''
+    (pkgs.writers.writeDashBin "mpv-simpsons" ''
       set -efu
       cd "${flixLocation}/download"
       [ -f "${cacheLocation}/${indexFilename}" ] || exit 1
@@ -65,7 +65,7 @@ in {
         | shuf \
         | ${pkgs.findutils}/bin/xargs -d '\n' ${pkgs.mpv}/bin/mpv
     '')
-    (pkgs.writeDashBin "flixmenu" ''
+    (pkgs.writers.writeDashBin "flixmenu" ''
       set -efu
       cd "${flixLocation}/download"