Merge remote-tracking branch 'prism/master'

1 files changed, 18 insertions, 0 deletions

diff --git a/jeschli/5pkgs/firefox/default.nix b/jeschli/5pkgs/firefox/default.nix
new file mode 100644
index 000000000..6ba4fec83
--- /dev/null
+++ b/jeschli/5pkgs/firefox/default.nix
@@ -0,0 +1,18 @@
+with import <stockholm/lib>;
+
+self: super:
+
+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
+
+  mapNixDir (path: callPackage path {}) ./.