From f0b98bd0114df1e1ebb82ff300f9532d86b3eb18 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 24 May 2017 01:43:50 +0200 Subject: krebs/5pkgs: move simple pkgs to a subdir --- krebs/5pkgs/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'krebs/5pkgs/default.nix') diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 81481e14..5af54125 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -12,10 +12,8 @@ with import ; then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override else override; in {} + // import ./simple pkgs oldpkgs // import ./writers.nix pkgs oldpkgs - // mapAttrs (_: flip callPackage {}) - (filterAttrs (_: dir: pathExists (dir + "/default.nix")) - (subdirsOf ./.)) // { empty = pkgs.runCommand "empty-1.0.0" {} "mkdir $out"; @@ -33,13 +31,12 @@ with import ; (builtins.readDir ./haskell-overrides)); }; - ReaktorPlugins = callPackage ./Reaktor/plugins.nix {}; + ReaktorPlugins = callPackage ./simple/Reaktor/plugins.nix {}; - buildbot = callPackage ./buildbot {}; - buildbot-full = callPackage ./buildbot { + buildbot-full = callPackage ./simple/buildbot { plugins = with pkgs.buildbot-plugins; [ www console-view waterfall-view ]; }; - buildbot-worker = callPackage ./buildbot/worker.nix {}; + buildbot-worker = callPackage ./simple/buildbot/worker.nix {}; # https://github.com/proot-me/PRoot/issues/106 proot = pkgs.writeDashBin "proot" '' -- cgit v1.2.3 From 17df5f0c453d891b29dbb6a9d189fc8dcf88fac0 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 24 May 2017 01:49:36 +0200 Subject: empty: move to krebs/5pkgs/simple --- krebs/5pkgs/default.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'krebs/5pkgs/default.nix') diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 5af54125..9fe2fea3 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -15,8 +15,6 @@ with import ; // import ./simple pkgs oldpkgs // import ./writers.nix pkgs oldpkgs // { - empty = pkgs.runCommand "empty-1.0.0" {} "mkdir $out"; - haskellPackages = oldpkgs.haskellPackages.override { overrides = self: super: mapAttrs (name: path: self.callPackage path {}) -- cgit v1.2.3 From eae210f8ff05b7f59ab62ba161c86971dbd7f50e Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 24 May 2017 01:57:28 +0200 Subject: krebs/5pkgs: move haskell stuff to a subdir --- krebs/5pkgs/default.nix | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'krebs/5pkgs/default.nix') diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 9fe2fea3..eab05916 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -12,23 +12,10 @@ with import ; then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override else override; in {} + // import ./haskell pkgs oldpkgs // import ./simple pkgs oldpkgs // import ./writers.nix pkgs oldpkgs // { - haskellPackages = oldpkgs.haskellPackages.override { - overrides = self: super: - mapAttrs (name: path: self.callPackage path {}) - (mapAttrs' - (name: type: - if hasSuffix ".nix" name - then { - name = removeSuffix ".nix" name; - value = ./haskell-overrides + "/${name}"; - } - else null) - (builtins.readDir ./haskell-overrides)); - }; - ReaktorPlugins = callPackage ./simple/Reaktor/plugins.nix {}; buildbot-full = callPackage ./simple/buildbot { -- cgit v1.2.3 From e6b7fe74c1ec4ff42967e7bd79d7fe669451d047 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 24 May 2017 02:03:46 +0200 Subject: krebs/5pkgs: detect simple obsolete overrides --- krebs/5pkgs/default.nix | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'krebs/5pkgs/default.nix') diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index eab05916..ea14e02a 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -1,27 +1,16 @@ pkgs: oldpkgs: with import ; - let - # This callPackage will try to detect obsolete overrides. - callPackage = path: args: let - override = pkgs.callPackage path args; - upstream = optionalAttrs (override ? "name") - (oldpkgs.${(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 {} + {} // import ./haskell pkgs oldpkgs // import ./simple pkgs oldpkgs // import ./writers.nix pkgs oldpkgs // { - ReaktorPlugins = callPackage ./simple/Reaktor/plugins.nix {}; + ReaktorPlugins = pkgs.callPackage ./simple/Reaktor/plugins.nix {}; - buildbot-full = callPackage ./simple/buildbot { + buildbot-full = pkgs.callPackage ./simple/buildbot { plugins = with pkgs.buildbot-plugins; [ www console-view waterfall-view ]; }; - buildbot-worker = callPackage ./simple/buildbot/worker.nix {}; + buildbot-worker = pkgs.callPackage ./simple/buildbot/worker.nix {}; # https://github.com/proot-me/PRoot/issues/106 proot = pkgs.writeDashBin "proot" '' @@ -35,6 +24,6 @@ with import ; in if typeOf x != "lambda" then x else oldpkgs.symlinkJoin name paths; test = { - infest-cac-centos7 = callPackage ./test/infest-cac-centos7 {}; + infest-cac-centos7 = pkgs.callPackage ./test/infest-cac-centos7 {}; }; } -- cgit v1.2.3 From 98741092302a796554b727f54cef1316b405562d Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 24 May 2017 02:12:02 +0200 Subject: krebs/5pkgs: move test stuff to a subdir --- krebs/5pkgs/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'krebs/5pkgs/default.nix') diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index ea14e02a..6dbb0954 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -3,6 +3,7 @@ with import ; {} // import ./haskell pkgs oldpkgs // import ./simple pkgs oldpkgs + // import ./test pkgs oldpkgs // import ./writers.nix pkgs oldpkgs // { ReaktorPlugins = pkgs.callPackage ./simple/Reaktor/plugins.nix {}; @@ -22,8 +23,4 @@ with import ; symlinkJoin = { name, paths, ... }@args: let x = oldpkgs.symlinkJoin args; in if typeOf x != "lambda" then x else oldpkgs.symlinkJoin name paths; - - test = { - infest-cac-centos7 = pkgs.callPackage ./test/infest-cac-centos7 {}; - }; } -- cgit v1.2.3 From 00b9970aae4e2cb472c793b9809bfb18fff8a37f Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 24 May 2017 02:25:21 +0200 Subject: krebs/5pkgs: import directory contents as overlays --- krebs/5pkgs/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'krebs/5pkgs/default.nix') diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 6dbb0954..820f0cdc 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -1,10 +1,13 @@ pkgs: oldpkgs: with import ; - {} - // import ./haskell pkgs oldpkgs - // import ./simple pkgs oldpkgs - // import ./test pkgs oldpkgs - // import ./writers.nix pkgs oldpkgs + + foldl' mergeAttrs {} + (map + (name: import (./. + "/${name}") pkgs oldpkgs) + (filter + (name: name != "default.nix" && !hasPrefix "." name) + (attrNames (readDir ./.)))) + // { ReaktorPlugins = pkgs.callPackage ./simple/Reaktor/plugins.nix {}; -- cgit v1.2.3 From e733b7e07d091593ebbe9274be0e71e541db4c06 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 24 May 2017 02:28:37 +0200 Subject: krebs/5pkgs: reformat --- krebs/5pkgs/default.nix | 50 ++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) (limited to 'krebs/5pkgs/default.nix') diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 820f0cdc..39e89a4b 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -1,29 +1,33 @@ -pkgs: oldpkgs: with import ; - foldl' mergeAttrs {} - (map - (name: import (./. + "/${name}") pkgs oldpkgs) - (filter - (name: name != "default.nix" && !hasPrefix "." name) - (attrNames (readDir ./.)))) +self: super: - // { - ReaktorPlugins = pkgs.callPackage ./simple/Reaktor/plugins.nix {}; +# Import files and subdirectories like they are overlays. +foldl' mergeAttrs {} + (map + (name: import (./. + "/${name}") self super) + (filter + (name: name != "default.nix" && !hasPrefix "." name) + (attrNames (readDir ./.)))) - buildbot-full = pkgs.callPackage ./simple/buildbot { - plugins = with pkgs.buildbot-plugins; [ www console-view waterfall-view ]; - }; - buildbot-worker = pkgs.callPackage ./simple/buildbot/worker.nix {}; +// - # https://github.com/proot-me/PRoot/issues/106 - proot = pkgs.writeDashBin "proot" '' - export PROOT_NO_SECCOMP=1 - exec ${oldpkgs.proot}/bin/proot "$@" - ''; +{ + ReaktorPlugins = self.callPackage ./simple/Reaktor/plugins.nix {}; - # XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d - symlinkJoin = { name, paths, ... }@args: let - x = oldpkgs.symlinkJoin args; - in if typeOf x != "lambda" then x else oldpkgs.symlinkJoin name paths; - } + buildbot-full = self.callPackage ./simple/buildbot { + plugins = with self.buildbot-plugins; [ www console-view waterfall-view ]; + }; + buildbot-worker = self.callPackage ./simple/buildbot/worker.nix {}; + + # https://github.com/proot-me/PRoot/issues/106 + proot = self.writeDashBin "proot" '' + export PROOT_NO_SECCOMP=1 + exec ${super.proot}/bin/proot "$@" + ''; + + # XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d + symlinkJoin = { name, paths, ... }@args: let + x = super.symlinkJoin args; + in if typeOf x != "lambda" then x else super.symlinkJoin name paths; +} -- cgit v1.2.3