11 files changed, 19 insertions(+), 2 deletions(-)

M ci.nix
M default.nix
M pkgs/applications/misc/haunt/default.nix
M pkgs/development/guile-modules/guile-commonmark/default.nix
M pkgs/development/python-modules/daemonocle/default.nix
M pkgs/development/python-modules/json-logging/default.nix
M pkgs/development/tools/esbuild/default.nix
M pkgs/development/tools/shellharden/default.nix
M pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
M pkgs/servers/monitoring/prometheus/bird-exporter.nix
M pkgs/tools/networking/dyndnsc/default.nix

@@ 5,10 5,13 @@ let
 
   selectDerivations = set:
     let
+      # Check if a given derivation must be built in the current system.
+      shouldBuildForPlatform = system: drv:
+        builtins.elem system (drv.meta.hydraPlatforms or drv.meta.platforms or [ system ]);
       derivationTree = value:
         # Output derivations directly, but only if they're compatible
         # with this platform.
-        if isDerivation value && builtins.elem pkgs.system (value.meta.platforms or [ pkgs.system ])
+        if isDerivation value && shouldBuildForPlatform pkgs.system value
         then value
         else if value.recurseForDerivations or false
         then

@@ 7,6 7,12 @@ let
       pkgs.appendOverlays
       (copyAttrsByPath manifest)
       recurseIntoAttrsRecursive
+      (mapAttrsRecursiveCond
+        (set: set.recurseForDerivations or false)
+        (path: drv:
+          if drv ? meta.hydraPlatforms && drv.meta.hydraPlatforms == platforms.none
+          then warn "aasg-nixexprs.${concatStringsSep "." path} is no longer supported; please switch to use the version in Nixpkgs" drv
+          else drv))
     ];
   self = {
     lib = import ./lib { inherit (pkgs) lib; };

@@ 41,5 41,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ AluisioASG ];
     platforms = platforms.gnu;
+    hydraPlatforms = platforms.none;
   };
 }

@@ 43,5 43,6 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ AluisioASG ];
     platforms = platforms.gnu;
+    hydraPlatforms = platforms.none;
   };
 }

@@ 30,6 30,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/jnrbsn/daemonocle";
     license = licenses.mit;
     platforms = platforms.unix;
+    hydraPlatforms = platforms.none;
     maintainers = with maintainers; [ AluisioASG ];
   };
 }

@@ 50,7 50,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/bobbui/json-logging-python";
     license = licenses.asl20;
-    platforms = platforms.all;
+    hydraPlatforms = platforms.none;
     maintainers = with maintainers; [ AluisioASG ];
   };
 }

@@ 29,5 29,6 @@ buildGoModule rec {
     license = licenses.mit;
     maintainers = with maintainers; [ AluisioASG ];
     platforms = platforms.all;
+    hydraPlatforms = platforms.none;
   };
 }

@@ 9,6 9,7 @@
         license = licenses.mpl20;
         maintainers = with maintainers; [ AluisioASG ];
         platforms = platforms.all;
+        hydraPlatforms = platforms.none;
       };
     };
   };

@@ 21,5 21,6 @@ nodePackages.matrix-appservice-irc.override {
     license = licenses.asl20;
     maintainers = with maintainers; [ AluisioASG ];
     platforms = platforms.all;
+    hydraPlatforms = platforms.none;
   };
 }

@@ 20,5 20,6 @@ buildGoModule rec {
     license = licenses.mit;
     maintainers = with maintainers; [ AluisioASG ];
     platforms = platforms.unix;
+    hydraPlatforms = platforms.none;
   };
 }

@@ 64,6 64,7 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/infothrill/python-dyndnsc";
     license = licenses.mit;
     platforms = platforms.unix;
+    hydraPlatforms = platforms.none;
     maintainers = with maintainers; [ AluisioASG ];
   };
 }