turn krebs/5pkgs into an overlay

This commit is contained in:
tv 2017-05-23 23:44:17 +02:00
parent 2d2550c5b5
commit 061e702a6f
3 changed files with 8 additions and 16 deletions

View File

@ -1,11 +1,6 @@
{ config, lib, pkgs, ... }@args:
pkgs: oldpkgs:
with import <stockholm/lib>;
{
imports = [
./writers.nix
];
nixpkgs.config.packageOverrides = oldpkgs: let
let
# This callPackage will try to detect obsolete overrides.
callPackage = path: args: let
override = pkgs.callPackage path args;
@ -16,8 +11,8 @@ with import <stockholm/lib>;
compareVersions upstream.name override.name != -1
then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
else override;
in {}
// import ./writers.nix pkgs oldpkgs
// mapAttrs (_: flip callPackage {})
(filterAttrs (_: dir: pathExists (dir + "/default.nix"))
(subdirsOf ./.))
@ -60,5 +55,4 @@ with import <stockholm/lib>;
test = {
infest-cac-centos7 = callPackage ./test/infest-cac-centos7 {};
};
};
}

View File

@ -1,7 +1,6 @@
{ pkgs, ... }:
pkgs: oldpkgs:
with import <stockholm/lib>;
{
nixpkgs.config.packageOverrides = _: {
# Combine a list of derivations using symlinks. Paths in later derivations
# take precedence over earlier ones.
@ -323,5 +322,4 @@ with import <stockholm/lib>;
};
writeSed = pkgs.makeScriptWriter "${pkgs.gnused}/bin/sed -f";
};
}

View File

@ -3,6 +3,6 @@ with import <stockholm/lib>;
{
imports = [
./3modules
./5pkgs
];
nixpkgs.config.packageOverrides = import ./5pkgs pkgs;
}