summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-07-02 00:09:16 +0200
committertv <tv@krebsco.de>2017-07-02 00:11:21 +0200
commit4f1821f3971708a8f7d4db5f15b8c9651138518d (patch)
tree945174c2a41175748a8111e9c211616d05ea58c3
parent9ee286644d050e68292776e02357549801fd20b6 (diff)
tv: turn pkgs into an overlay
-rw-r--r--tv/5pkgs/default.nix88
-rw-r--r--tv/default.nix4
2 files changed, 53 insertions, 39 deletions
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index ae47ab0f3..284e42a79 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -1,40 +1,54 @@
-{ config, pkgs, ... }:
with import <stockholm/lib>;
-{
- nixpkgs.config.packageOverrides = super: let
-
- # This callPackage will try to detect obsolete overrides.
- callPackage = path: args: let
- override = super.callPackage path args;
- upstream = optionalAttrs (override ? "name")
- (super.${(parseDrvName override.name).name} or {});
- in if upstream ? "name" &&
- override ? "name" &&
- compareVersions upstream.name override.name != -1
- then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
- else override;
-
- in {}
- // mapAttrs (_: flip callPackage {})
- (filterAttrs (_: dir: pathExists (dir + "/default.nix"))
- (subdirsOf ./.))
- // {
- # TODO use XDG_RUNTIME_DIR?
- cr = pkgs.writeDashBin "cr" ''
- set -efu
- export LC_TIME=de_DE.utf8
- exec ${pkgs.chromium}/bin/chromium \
- --ssl-version-min=tls1 \
- --disk-cache-dir=/tmp/chromium-disk-cache_"$LOGNAME" \
- --disk-cache-size=50000000 \
- "$@"
- '';
- ejabberd = callPackage ./ejabberd {
- erlang = pkgs.erlangR16;
- };
- ff = pkgs.writeDashBin "ff" ''
- exec ${pkgs.firefoxWrapper}/bin/firefox "$@"
- '';
- gnupg = pkgs.gnupg21;
+self: super: let
+
+ # This callPackage will try to detect obsolete overrides.
+ callPackage = path: args: let
+ override = super.callPackage path args;
+ upstream = optionalAttrs (override ? "name")
+ (super.${(parseDrvName override.name).name} or {});
+ in if upstream ? "name" &&
+ override ? "name" &&
+ compareVersions upstream.name override.name != -1
+ then
+ trace
+ "Upstream `${upstream.name}' gets overridden by `${override.name}'."
+ override
+ else override;
+
+in {
+
+ # TODO use XDG_RUNTIME_DIR?
+ cr = self.writeDashBin "cr" ''
+ set -efu
+ export LC_TIME=de_DE.utf8
+ exec ${self.chromium}/bin/chromium \
+ --ssl-version-min=tls1 \
+ --disk-cache-dir=/tmp/chromium-disk-cache_"$LOGNAME" \
+ --disk-cache-size=50000000 \
+ "$@"
+ '';
+
+ ejabberd = callPackage ./ejabberd {
+ erlang = self.erlangR16;
};
+
+ ff = self.writeDashBin "ff" ''
+ exec ${self.firefoxWrapper}/bin/firefox "$@"
+ '';
+
+ 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 ./.))
diff --git a/tv/default.nix b/tv/default.nix
index b1c7c1be8..d077cc09f 100644
--- a/tv/default.nix
+++ b/tv/default.nix
@@ -1,9 +1,9 @@
-_:
+{ pkgs, ... }:
{
imports = [
../krebs
./2configs
./3modules
- ./5pkgs
];
+ nixpkgs.config.packageOverrides = import ./5pkgs pkgs;
}