tv: turn pkgs into an overlay
This commit is contained in:
parent
9ee286644d
commit
4f1821f397
@ -1,7 +1,5 @@
|
|||||||
{ config, pkgs, ... }:
|
|
||||||
with import <stockholm/lib>;
|
with import <stockholm/lib>;
|
||||||
{
|
self: super: let
|
||||||
nixpkgs.config.packageOverrides = super: let
|
|
||||||
|
|
||||||
# This callPackage will try to detect obsolete overrides.
|
# This callPackage will try to detect obsolete overrides.
|
||||||
callPackage = path: args: let
|
callPackage = path: args: let
|
||||||
@ -11,30 +9,46 @@ with import <stockholm/lib>;
|
|||||||
in if upstream ? "name" &&
|
in if upstream ? "name" &&
|
||||||
override ? "name" &&
|
override ? "name" &&
|
||||||
compareVersions upstream.name override.name != -1
|
compareVersions upstream.name override.name != -1
|
||||||
then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
|
then
|
||||||
|
trace
|
||||||
|
"Upstream `${upstream.name}' gets overridden by `${override.name}'."
|
||||||
|
override
|
||||||
else override;
|
else override;
|
||||||
|
|
||||||
in {}
|
in {
|
||||||
// mapAttrs (_: flip callPackage {})
|
|
||||||
(filterAttrs (_: dir: pathExists (dir + "/default.nix"))
|
|
||||||
(subdirsOf ./.))
|
|
||||||
// {
|
|
||||||
# TODO use XDG_RUNTIME_DIR?
|
# TODO use XDG_RUNTIME_DIR?
|
||||||
cr = pkgs.writeDashBin "cr" ''
|
cr = self.writeDashBin "cr" ''
|
||||||
set -efu
|
set -efu
|
||||||
export LC_TIME=de_DE.utf8
|
export LC_TIME=de_DE.utf8
|
||||||
exec ${pkgs.chromium}/bin/chromium \
|
exec ${self.chromium}/bin/chromium \
|
||||||
--ssl-version-min=tls1 \
|
--ssl-version-min=tls1 \
|
||||||
--disk-cache-dir=/tmp/chromium-disk-cache_"$LOGNAME" \
|
--disk-cache-dir=/tmp/chromium-disk-cache_"$LOGNAME" \
|
||||||
--disk-cache-size=50000000 \
|
--disk-cache-size=50000000 \
|
||||||
"$@"
|
"$@"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
ejabberd = callPackage ./ejabberd {
|
ejabberd = callPackage ./ejabberd {
|
||||||
erlang = pkgs.erlangR16;
|
erlang = self.erlangR16;
|
||||||
};
|
};
|
||||||
ff = pkgs.writeDashBin "ff" ''
|
|
||||||
exec ${pkgs.firefoxWrapper}/bin/firefox "$@"
|
ff = self.writeDashBin "ff" ''
|
||||||
|
exec ${self.firefoxWrapper}/bin/firefox "$@"
|
||||||
'';
|
'';
|
||||||
gnupg = pkgs.gnupg21;
|
|
||||||
};
|
gnupg = self.gnupg21;
|
||||||
|
|
||||||
|
# https://github.com/NixOS/nixpkgs/issues/16113
|
||||||
|
wvdial = let
|
||||||
|
nixpkgs-1509 = import (self.fetchFromGitHub {
|
||||||
|
owner = "NixOS"; repo = "nixpkgs-channels";
|
||||||
|
rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda";
|
||||||
|
sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73";
|
||||||
|
}) {};
|
||||||
|
in nixpkgs-1509.wvdial;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// mapAttrs (_: flip callPackage {})
|
||||||
|
(filterAttrs (_: dir: pathExists (dir + "/default.nix"))
|
||||||
|
(subdirsOf ./.))
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
_:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../krebs
|
../krebs
|
||||||
./2configs
|
./2configs
|
||||||
./3modules
|
./3modules
|
||||||
./5pkgs
|
|
||||||
];
|
];
|
||||||
|
nixpkgs.config.packageOverrides = import ./5pkgs pkgs;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user