summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-02-09 15:11:02 +0100
committertv <tv@krebsco.de>2017-02-09 15:11:02 +0100
commitc34f8a33dc0d10e471fa6f4fb7d6e7dd54164ff2 (patch)
treee3fcbb55d1027cf9dab1c272063b9c9c7af1d5da
parent38d2ff961f2ad8d02ae6061952abe42e4de89f75 (diff)
packageOverrides: allow using pkgs in addition to oldpkgs
-rw-r--r--krebs/5pkgs/default.nix15
1 files changed, 7 insertions, 8 deletions
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index c79a639a4..ec9b6bdba 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -1,13 +1,13 @@
{ config, lib, pkgs, ... }@args:
with import <stockholm/lib>;
{
- nixpkgs.config.packageOverrides = pkgs: let
+ nixpkgs.config.packageOverrides = oldpkgs: let
# This callPackage will try to detect obsolete overrides.
callPackage = path: args: let
override = pkgs.callPackage path args;
upstream = optionalAttrs (override ? "name")
- (pkgs.${(parseDrvName override.name).name} or {});
+ (oldpkgs.${(parseDrvName override.name).name} or {});
in if upstream ? "name" &&
override ? "name" &&
compareVersions upstream.name override.name != -1
@@ -22,7 +22,7 @@ with import <stockholm/lib>;
// {
empty = pkgs.runCommand "empty-1.0.0" {} "mkdir $out";
- haskellPackages = pkgs.haskellPackages.override {
+ haskellPackages = oldpkgs.haskellPackages.override {
overrides = self: super:
mapAttrs (name: path: self.callPackage path {})
(mapAttrs'
@@ -45,16 +45,15 @@ with import <stockholm/lib>;
buildbot-worker = callPackage ./buildbot/worker.nix {};
# https://github.com/proot-me/PRoot/issues/106
- proot = pkgs.writeScriptBin "proot" ''
- #!${pkgs.dash}/bin/dash
+ proot = pkgs.writeDashBin "proot" ''
export PROOT_NO_SECCOMP=1
- exec ${pkgs.proot}/bin/proot "$@"
+ exec ${oldpkgs.proot}/bin/proot "$@"
'';
# XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d
symlinkJoin = { name, paths, ... }@args: let
- x = pkgs.symlinkJoin args;
- in if typeOf x != "lambda" then x else pkgs.symlinkJoin name paths;
+ x = oldpkgs.symlinkJoin args;
+ in if typeOf x != "lambda" then x else oldpkgs.symlinkJoin name paths;
test = {
infest-cac-centos7 = callPackage ./test/infest-cac-centos7 {};