1
0
mirror of https://github.com/kmein/niveum synced 2026-03-16 10:11:08 +01:00

feat: unify/update stockholm pkgs

This commit is contained in:
2021-10-19 22:42:00 +02:00
parent 6809db5ccc
commit 4ae2fa4a6a
3 changed files with 7 additions and 10 deletions

View File

@@ -1,9 +1,9 @@
{ {
"url": "https://cgit.krebsco.de/stockholm", "url": "https://cgit.krebsco.de/stockholm",
"rev": "9a855d50a7619192b909e8e3657acb16ecbd5fb4", "rev": "be5f4833fe1dc3ec4acb24eeb5a6670c2aaef2e0",
"date": "2021-10-05T23:18:09+02:00", "date": "2021-10-12T22:11:08+02:00",
"path": "/nix/store/kzcxvmapy6whl25895dq35s11imv8ibi-stockholm", "path": "/nix/store/cir2mah9pjahvy2mql663zhj6pwzi6h6-stockholm",
"sha256": "08c2qd83704c6f3b7m5wxkf5id46bljm6xpkpc42i7svlbakb8zz", "sha256": "1cyl21rh7dlpar33gq2bv0rm8x3s0k3vib75gpgz3qcah0ycdcjw",
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,
"leaveDotGit": false "leaveDotGit": false

View File

@@ -30,13 +30,10 @@ in {
}; };
}; };
overlays = [ overlays = [
(import <stockholm/krebs/5pkgs>)
(self: super: { (self: super: {
scripts = import <niveum/packages/scripts> { pkgs = super; lib = super.lib; }; 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>)
]; ];
}; };
} }

View File

@@ -55,7 +55,7 @@ in {
}; };
environment.systemPackages = [ environment.systemPackages = [
(pkgs.writeDashBin "mpv-simpsons" '' (pkgs.writers.writeDashBin "mpv-simpsons" ''
set -efu set -efu
cd "${flixLocation}/download" cd "${flixLocation}/download"
[ -f "${cacheLocation}/${indexFilename}" ] || exit 1 [ -f "${cacheLocation}/${indexFilename}" ] || exit 1
@@ -65,7 +65,7 @@ in {
| shuf \ | shuf \
| ${pkgs.findutils}/bin/xargs -d '\n' ${pkgs.mpv}/bin/mpv | ${pkgs.findutils}/bin/xargs -d '\n' ${pkgs.mpv}/bin/mpv
'') '')
(pkgs.writeDashBin "flixmenu" '' (pkgs.writers.writeDashBin "flixmenu" ''
set -efu set -efu
cd "${flixLocation}/download" cd "${flixLocation}/download"