Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

turn krebs/5pkgs into an overlay

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
krebs/5pkgs/default.nix
View File

@ -1,11 +1,6 @@
{ config, lib, pkgs, ... }@args: pkgs: oldpkgs:
with import <stockholm/lib>; with import <stockholm/lib>;
{ let
imports = [
./writers.nix
];
nixpkgs.config.packageOverrides = oldpkgs: 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
override = pkgs.callPackage path args; override = pkgs.callPackage path args;
@ -16,8 +11,8 @@ with import <stockholm/lib>;
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 {}
// import ./writers.nix pkgs oldpkgs
// mapAttrs (_: flip callPackage {}) // mapAttrs (_: flip callPackage {})
(filterAttrs (_: dir: pathExists (dir + "/default.nix")) (filterAttrs (_: dir: pathExists (dir + "/default.nix"))
(subdirsOf ./.)) (subdirsOf ./.))
@ -60,5 +55,4 @@ with import <stockholm/lib>;
test = { test = {
infest-cac-centos7 = callPackage ./test/infest-cac-centos7 {}; infest-cac-centos7 = callPackage ./test/infest-cac-centos7 {};
}; };
};
} }

4
krebs/5pkgs/writers.nix
View File

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

2
krebs/default.nix
View File

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