From f0b98bd0114df1e1ebb82ff300f9532d86b3eb18 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
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 81481e14b..5af541258 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -12,10 +12,8 @@ with import <stockholm/lib>;
       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 <stockholm/lib>;
             (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.3.1


From 17df5f0c453d891b29dbb6a9d189fc8dcf88fac0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 01:49:36 +0200
Subject: empty: move to krebs/5pkgs/simple

---
 krebs/5pkgs/default.nix      | 2 --
 krebs/5pkgs/simple/empty.nix | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 krebs/5pkgs/simple/empty.nix

(limited to 'krebs/5pkgs/default.nix')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 5af541258..9fe2fea3c 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -15,8 +15,6 @@ with import <stockholm/lib>;
   // 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 {})
diff --git a/krebs/5pkgs/simple/empty.nix b/krebs/5pkgs/simple/empty.nix
new file mode 100644
index 000000000..a45723b65
--- /dev/null
+++ b/krebs/5pkgs/simple/empty.nix
@@ -0,0 +1,2 @@
+{ pkgs }:
+pkgs.runCommand "empty-1.0.0" {} "mkdir $out"
-- 
cgit v1.3.1


From eae210f8ff05b7f59ab62ba161c86971dbd7f50e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 01:57:28 +0200
Subject: krebs/5pkgs: move haskell stuff to a subdir

---
 krebs/5pkgs/default.nix                            | 15 +------------
 krebs/5pkgs/haskell-overrides/blessings.nix        | 14 ------------
 krebs/5pkgs/haskell-overrides/email-header.nix     | 25 ----------------------
 krebs/5pkgs/haskell-overrides/hyphenation.nix      | 17 ---------------
 krebs/5pkgs/haskell-overrides/kirk.nix             | 21 ------------------
 krebs/5pkgs/haskell-overrides/news.nix             | 18 ----------------
 krebs/5pkgs/haskell-overrides/scanner.nix          | 12 -----------
 krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix | 16 --------------
 krebs/5pkgs/haskell/blessings.nix                  | 14 ++++++++++++
 krebs/5pkgs/haskell/default.nix                    | 15 +++++++++++++
 krebs/5pkgs/haskell/email-header.nix               | 25 ++++++++++++++++++++++
 krebs/5pkgs/haskell/hyphenation.nix                | 17 +++++++++++++++
 krebs/5pkgs/haskell/kirk.nix                       | 21 ++++++++++++++++++
 krebs/5pkgs/haskell/news.nix                       | 18 ++++++++++++++++
 krebs/5pkgs/haskell/scanner.nix                    | 12 +++++++++++
 krebs/5pkgs/haskell/xmonad-stockholm.nix           | 16 ++++++++++++++
 16 files changed, 139 insertions(+), 137 deletions(-)
 delete mode 100644 krebs/5pkgs/haskell-overrides/blessings.nix
 delete mode 100644 krebs/5pkgs/haskell-overrides/email-header.nix
 delete mode 100644 krebs/5pkgs/haskell-overrides/hyphenation.nix
 delete mode 100644 krebs/5pkgs/haskell-overrides/kirk.nix
 delete mode 100644 krebs/5pkgs/haskell-overrides/news.nix
 delete mode 100644 krebs/5pkgs/haskell-overrides/scanner.nix
 delete mode 100644 krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix
 create mode 100644 krebs/5pkgs/haskell/blessings.nix
 create mode 100644 krebs/5pkgs/haskell/default.nix
 create mode 100644 krebs/5pkgs/haskell/email-header.nix
 create mode 100644 krebs/5pkgs/haskell/hyphenation.nix
 create mode 100644 krebs/5pkgs/haskell/kirk.nix
 create mode 100644 krebs/5pkgs/haskell/news.nix
 create mode 100644 krebs/5pkgs/haskell/scanner.nix
 create mode 100644 krebs/5pkgs/haskell/xmonad-stockholm.nix

(limited to 'krebs/5pkgs/default.nix')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 9fe2fea3c..eab059165 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -12,23 +12,10 @@ with import <stockholm/lib>;
       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 {
diff --git a/krebs/5pkgs/haskell-overrides/blessings.nix b/krebs/5pkgs/haskell-overrides/blessings.nix
deleted file mode 100644
index f852b4a44..000000000
--- a/krebs/5pkgs/haskell-overrides/blessings.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ mkDerivation, base, fetchgit, stdenv }:
-mkDerivation rec {
-  pname = "blessings";
-  version = "1.1.0";
-  src = fetchgit {
-    url = http://cgit.ni.krebsco.de/blessings;
-    rev = "refs/tags/v${version}";
-    sha256 = "1k908zap3694fcxdk4bb29s54b0lhdh557y10ybjskfwnym7szn1";
-  };
-  libraryHaskellDepends = [ base ];
-  doHaddock = false;
-  # WTFPL is the true license, which is unknown to cabal.
-  license = stdenv.lib.licenses.wtfpl;
-}
diff --git a/krebs/5pkgs/haskell-overrides/email-header.nix b/krebs/5pkgs/haskell-overrides/email-header.nix
deleted file mode 100644
index b54240809..000000000
--- a/krebs/5pkgs/haskell-overrides/email-header.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, attoparsec, base, base64-bytestring, bytestring
-, case-insensitive, containers, exceptions, fetchgit, QuickCheck
-, stdenv, tasty, tasty-quickcheck, text, text-icu, time
-}:
-mkDerivation {
-  pname = "email-header";
-  version = "0.3.0";
-  src = fetchgit {
-    url = "https://github.com/4z3/email-header";
-    rev = "7b179bd31192ead8afe7a0b6e34bcad4039deaa8";
-    sha256 = "12j2n3sbvzjnw99gga7kkdygm8n3qx2lh8q26ad6a53xm5whnz59";
-  };
-  buildDepends = [
-    attoparsec base base64-bytestring bytestring case-insensitive
-    containers exceptions text text-icu time
-  ];
-  testDepends = [
-    base bytestring case-insensitive containers QuickCheck tasty
-    tasty-quickcheck text time
-  ];
-  jailbreak = true;
-  homepage = "http://github.com/knrafto/email-header";
-  description = "Parsing and rendering of email and MIME headers";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/krebs/5pkgs/haskell-overrides/hyphenation.nix b/krebs/5pkgs/haskell-overrides/hyphenation.nix
deleted file mode 100644
index 6e5fe9455..000000000
--- a/krebs/5pkgs/haskell-overrides/hyphenation.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# Same as upstream but with doCheck = false because doctest has wrong version.
-{ mkDerivation, base, bytestring, containers, directory
-, filepath, unordered-containers, zlib, stdenv
-}:
-mkDerivation {
-  pname = "hyphenation";
-  version = "0.6";
-  sha256 = "2f673666c18f63581422f7c6389b78b0ff754406671296a3d680d417942512f7";
-  libraryHaskellDepends = [
-    base bytestring containers unordered-containers zlib
-  ];
-  homepage = "http://github.com/ekmett/hyphenation";
-  description = "Configurable Knuth-Liang hyphenation";
-  license = stdenv.lib.licenses.bsd3;
-  hydraPlatforms = stdenv.lib.platforms.none;
-  doCheck = false;
-}
diff --git a/krebs/5pkgs/haskell-overrides/kirk.nix b/krebs/5pkgs/haskell-overrides/kirk.nix
deleted file mode 100644
index 073e5d505..000000000
--- a/krebs/5pkgs/haskell-overrides/kirk.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, async, base, bytestring, fetchgit, network
-, optparse-applicative, stdenv, text
-}:
-mkDerivation {
-  pname = "kirk";
-  version = "1.0.1";
-  src = fetchgit {
-    url = "http://cgit.krebsco.de/kirk";
-    sha256 = "1acsmmc485c54axpy9bd0320j18hs261vl1vdxns4n04sxzqd7k0";
-    rev = "cdf3cb373af8f9b03a9487a63eb32e0226913589";
-  };
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    base bytestring network optparse-applicative text
-  ];
-  executableHaskellDepends = [
-    async base network optparse-applicative text
-  ];
-  license = stdenv.lib.licenses.mit;
-}
diff --git a/krebs/5pkgs/haskell-overrides/news.nix b/krebs/5pkgs/haskell-overrides/news.nix
deleted file mode 100644
index ba5e7a5e1..000000000
--- a/krebs/5pkgs/haskell-overrides/news.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ mkDerivation, base, bloomfilter, bytestring, feed, fetchgit, lens
-, stdenv, wreq
-}:
-mkDerivation {
-  pname = "news";
-  version = "1.0.0";
-  src = fetchgit {
-    url = "http://cgit.lassul.us/news";
-    sha256 = "1n3ffr2a5irr5aly0y7qsafag3kxvyyh077ayk0vdwbd0s9hvnjs";
-    rev = "c3eb2c0a1a34fc41e18d0bc99b1c4dc73aa6eb20";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    base bloomfilter bytestring feed lens wreq
-  ];
-  license = stdenv.lib.licenses.mit;
-}
diff --git a/krebs/5pkgs/haskell-overrides/scanner.nix b/krebs/5pkgs/haskell-overrides/scanner.nix
deleted file mode 100644
index 071fd757f..000000000
--- a/krebs/5pkgs/haskell-overrides/scanner.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ mkDerivation, base, fetchgit, stdenv }:
-mkDerivation {
-  pname = "scanner";
-  version = "1.0.0";
-  src = fetchgit {
-    url = http://cgit.ni.krebsco.de/scanner;
-    rev = "7f091a3bc152ad3974a1873b460fa1759bf8dcad";
-    sha256 = "1lgl158axczsm4fx53fyq1d4116v91jsx4dbz66ka4k1ljqrmhgn";
-  };
-  libraryHaskellDepends = [ base ];
-  license = stdenv.lib.licenses.wtfpl;
-}
diff --git a/krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix b/krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix
deleted file mode 100644
index bf19e7d66..000000000
--- a/krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ mkDerivation, base, containers, fetchgit, stdenv, X11, X11-xshape
-, xmonad, xmonad-contrib
-}:
-mkDerivation {
-  pname = "xmonad-stockholm";
-  version = "1.1.0";
-  src = fetchgit {
-    url = http://cgit.ni.krebsco.de/xmonad-stockholm;
-    rev = "179d29fd4c765dee698058ef63295331ac603639";
-    sha256 = "0c6mj68xsxxr4j8adkzhjszi7bg6cpisrsmqn587a16sblpbrnkj";
-  };
-  libraryHaskellDepends = [
-    base containers X11 X11-xshape xmonad xmonad-contrib
-  ];
-  license = stdenv.lib.licenses.mit;
-}
diff --git a/krebs/5pkgs/haskell/blessings.nix b/krebs/5pkgs/haskell/blessings.nix
new file mode 100644
index 000000000..f852b4a44
--- /dev/null
+++ b/krebs/5pkgs/haskell/blessings.nix
@@ -0,0 +1,14 @@
+{ mkDerivation, base, fetchgit, stdenv }:
+mkDerivation rec {
+  pname = "blessings";
+  version = "1.1.0";
+  src = fetchgit {
+    url = http://cgit.ni.krebsco.de/blessings;
+    rev = "refs/tags/v${version}";
+    sha256 = "1k908zap3694fcxdk4bb29s54b0lhdh557y10ybjskfwnym7szn1";
+  };
+  libraryHaskellDepends = [ base ];
+  doHaddock = false;
+  # WTFPL is the true license, which is unknown to cabal.
+  license = stdenv.lib.licenses.wtfpl;
+}
diff --git a/krebs/5pkgs/haskell/default.nix b/krebs/5pkgs/haskell/default.nix
new file mode 100644
index 000000000..1120356a7
--- /dev/null
+++ b/krebs/5pkgs/haskell/default.nix
@@ -0,0 +1,15 @@
+with import <stockholm/lib>;
+
+self: super:
+{
+  haskellPackages = super.haskellPackages.override {
+    overrides = self: super:
+      listToAttrs
+        (map
+          (name: nameValuePair (removeSuffix ".nix" name)
+                               (self.callPackage (./. + "/${name}") {}))
+          (filter
+            (name: name != "default.nix" && !hasPrefix "." name)
+            (attrNames (readDir ./.))));
+  };
+}
diff --git a/krebs/5pkgs/haskell/email-header.nix b/krebs/5pkgs/haskell/email-header.nix
new file mode 100644
index 000000000..b54240809
--- /dev/null
+++ b/krebs/5pkgs/haskell/email-header.nix
@@ -0,0 +1,25 @@
+{ mkDerivation, attoparsec, base, base64-bytestring, bytestring
+, case-insensitive, containers, exceptions, fetchgit, QuickCheck
+, stdenv, tasty, tasty-quickcheck, text, text-icu, time
+}:
+mkDerivation {
+  pname = "email-header";
+  version = "0.3.0";
+  src = fetchgit {
+    url = "https://github.com/4z3/email-header";
+    rev = "7b179bd31192ead8afe7a0b6e34bcad4039deaa8";
+    sha256 = "12j2n3sbvzjnw99gga7kkdygm8n3qx2lh8q26ad6a53xm5whnz59";
+  };
+  buildDepends = [
+    attoparsec base base64-bytestring bytestring case-insensitive
+    containers exceptions text text-icu time
+  ];
+  testDepends = [
+    base bytestring case-insensitive containers QuickCheck tasty
+    tasty-quickcheck text time
+  ];
+  jailbreak = true;
+  homepage = "http://github.com/knrafto/email-header";
+  description = "Parsing and rendering of email and MIME headers";
+  license = stdenv.lib.licenses.bsd3;
+}
diff --git a/krebs/5pkgs/haskell/hyphenation.nix b/krebs/5pkgs/haskell/hyphenation.nix
new file mode 100644
index 000000000..6e5fe9455
--- /dev/null
+++ b/krebs/5pkgs/haskell/hyphenation.nix
@@ -0,0 +1,17 @@
+# Same as upstream but with doCheck = false because doctest has wrong version.
+{ mkDerivation, base, bytestring, containers, directory
+, filepath, unordered-containers, zlib, stdenv
+}:
+mkDerivation {
+  pname = "hyphenation";
+  version = "0.6";
+  sha256 = "2f673666c18f63581422f7c6389b78b0ff754406671296a3d680d417942512f7";
+  libraryHaskellDepends = [
+    base bytestring containers unordered-containers zlib
+  ];
+  homepage = "http://github.com/ekmett/hyphenation";
+  description = "Configurable Knuth-Liang hyphenation";
+  license = stdenv.lib.licenses.bsd3;
+  hydraPlatforms = stdenv.lib.platforms.none;
+  doCheck = false;
+}
diff --git a/krebs/5pkgs/haskell/kirk.nix b/krebs/5pkgs/haskell/kirk.nix
new file mode 100644
index 000000000..073e5d505
--- /dev/null
+++ b/krebs/5pkgs/haskell/kirk.nix
@@ -0,0 +1,21 @@
+{ mkDerivation, async, base, bytestring, fetchgit, network
+, optparse-applicative, stdenv, text
+}:
+mkDerivation {
+  pname = "kirk";
+  version = "1.0.1";
+  src = fetchgit {
+    url = "http://cgit.krebsco.de/kirk";
+    sha256 = "1acsmmc485c54axpy9bd0320j18hs261vl1vdxns4n04sxzqd7k0";
+    rev = "cdf3cb373af8f9b03a9487a63eb32e0226913589";
+  };
+  isLibrary = true;
+  isExecutable = true;
+  libraryHaskellDepends = [
+    base bytestring network optparse-applicative text
+  ];
+  executableHaskellDepends = [
+    async base network optparse-applicative text
+  ];
+  license = stdenv.lib.licenses.mit;
+}
diff --git a/krebs/5pkgs/haskell/news.nix b/krebs/5pkgs/haskell/news.nix
new file mode 100644
index 000000000..ba5e7a5e1
--- /dev/null
+++ b/krebs/5pkgs/haskell/news.nix
@@ -0,0 +1,18 @@
+{ mkDerivation, base, bloomfilter, bytestring, feed, fetchgit, lens
+, stdenv, wreq
+}:
+mkDerivation {
+  pname = "news";
+  version = "1.0.0";
+  src = fetchgit {
+    url = "http://cgit.lassul.us/news";
+    sha256 = "1n3ffr2a5irr5aly0y7qsafag3kxvyyh077ayk0vdwbd0s9hvnjs";
+    rev = "c3eb2c0a1a34fc41e18d0bc99b1c4dc73aa6eb20";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    base bloomfilter bytestring feed lens wreq
+  ];
+  license = stdenv.lib.licenses.mit;
+}
diff --git a/krebs/5pkgs/haskell/scanner.nix b/krebs/5pkgs/haskell/scanner.nix
new file mode 100644
index 000000000..071fd757f
--- /dev/null
+++ b/krebs/5pkgs/haskell/scanner.nix
@@ -0,0 +1,12 @@
+{ mkDerivation, base, fetchgit, stdenv }:
+mkDerivation {
+  pname = "scanner";
+  version = "1.0.0";
+  src = fetchgit {
+    url = http://cgit.ni.krebsco.de/scanner;
+    rev = "7f091a3bc152ad3974a1873b460fa1759bf8dcad";
+    sha256 = "1lgl158axczsm4fx53fyq1d4116v91jsx4dbz66ka4k1ljqrmhgn";
+  };
+  libraryHaskellDepends = [ base ];
+  license = stdenv.lib.licenses.wtfpl;
+}
diff --git a/krebs/5pkgs/haskell/xmonad-stockholm.nix b/krebs/5pkgs/haskell/xmonad-stockholm.nix
new file mode 100644
index 000000000..bf19e7d66
--- /dev/null
+++ b/krebs/5pkgs/haskell/xmonad-stockholm.nix
@@ -0,0 +1,16 @@
+{ mkDerivation, base, containers, fetchgit, stdenv, X11, X11-xshape
+, xmonad, xmonad-contrib
+}:
+mkDerivation {
+  pname = "xmonad-stockholm";
+  version = "1.1.0";
+  src = fetchgit {
+    url = http://cgit.ni.krebsco.de/xmonad-stockholm;
+    rev = "179d29fd4c765dee698058ef63295331ac603639";
+    sha256 = "0c6mj68xsxxr4j8adkzhjszi7bg6cpisrsmqn587a16sblpbrnkj";
+  };
+  libraryHaskellDepends = [
+    base containers X11 X11-xshape xmonad xmonad-contrib
+  ];
+  license = stdenv.lib.licenses.mit;
+}
-- 
cgit v1.3.1


From e6b7fe74c1ec4ff42967e7bd79d7fe669451d047 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 02:03:46 +0200
Subject: krebs/5pkgs: detect simple obsolete overrides

---
 krebs/5pkgs/default.nix        | 21 +++++----------------
 krebs/5pkgs/simple/default.nix | 28 +++++++++++++++++++++-------
 2 files changed, 26 insertions(+), 23 deletions(-)

(limited to 'krebs/5pkgs/default.nix')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index eab059165..ea14e02a4 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -1,27 +1,16 @@
 pkgs: oldpkgs:
 with import <stockholm/lib>;
-  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 <stockholm/lib>;
     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 {};
     };
   }
diff --git a/krebs/5pkgs/simple/default.nix b/krebs/5pkgs/simple/default.nix
index 2f6799759..1b9d8c235 100644
--- a/krebs/5pkgs/simple/default.nix
+++ b/krebs/5pkgs/simple/default.nix
@@ -1,10 +1,24 @@
 with import <stockholm/lib>;
 
 self: super:
-listToAttrs
-  (map
-    (name: nameValuePair (removeSuffix ".nix" name)
-                         (super.callPackage (./. + "/${name}") {}))
-    (filter
-      (name: name != "default.nix" && !hasPrefix "." name)
-      (attrNames (readDir ./.))))
+
+let
+  # This callPackage will try to detect obsolete overrides.
+  callPackage = path: args: let
+    override = self.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
+
+  listToAttrs
+    (map
+      (name: nameValuePair (removeSuffix ".nix" name)
+                           (callPackage (./. + "/${name}") {}))
+      (filter
+        (name: name != "default.nix" && !hasPrefix "." name)
+        (attrNames (readDir ./.))))
-- 
cgit v1.3.1


From 98741092302a796554b727f54cef1316b405562d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 02:12:02 +0200
Subject: krebs/5pkgs: move test stuff to a subdir

---
 krebs/5pkgs/default.nix      | 5 +----
 krebs/5pkgs/test/default.nix | 9 +++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 krebs/5pkgs/test/default.nix

(limited to 'krebs/5pkgs/default.nix')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index ea14e02a4..6dbb0954f 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -3,6 +3,7 @@ with import <stockholm/lib>;
   {}
   // 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 <stockholm/lib>;
     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 {};
-    };
   }
diff --git a/krebs/5pkgs/test/default.nix b/krebs/5pkgs/test/default.nix
new file mode 100644
index 000000000..5ee8f913b
--- /dev/null
+++ b/krebs/5pkgs/test/default.nix
@@ -0,0 +1,9 @@
+with import <stockholm/lib>;
+
+self: super:
+
+{
+  test = {
+    infest-cac-centos7 = self.callPackage ./infest-cac-centos7 {};
+  };
+}
-- 
cgit v1.3.1


From 00b9970aae4e2cb472c793b9809bfb18fff8a37f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
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 6dbb0954f..820f0cdc8 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -1,10 +1,13 @@
 pkgs: oldpkgs:
 with import <stockholm/lib>;
-  {}
-  // 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.3.1


From e733b7e07d091593ebbe9274be0e71e541db4c06 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
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 820f0cdc8..39e89a4b6 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -1,29 +1,33 @@
-pkgs: oldpkgs:
 with import <stockholm/lib>;
 
-  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.3.1