Commit 8ebda453 authored by sternenseemann's avatar sternenseemann
Browse files

nix-serve-ng: unbreak on aarch64-darwin 

The source of the failure is justStaticExecutables, the easiest
workaround is to not do it for now.
parent 07deefb3

pkgs/development/haskell-modules/configuration-nix.nix

+0 −3
Original line number Diff line number Diff line
@@ -354,9 +354,6 @@ builtins.intersectAttrs super { 
    (overrideCabal (old: {

      # Doesn't declare boost dependency

      pkg-configDepends = (old.pkg-configDepends or [ ]) ++ [ pkgs.boost.dev ];

      # error: output '/nix/store/hv6lzj1nlshn8q5lirzgys8f4vgym4hg-nix-serve-ng-1.0.0-unstable-2024-12-02' is not allowed to refer to the following paths:

      #    /nix/store/qza2y18fwkq1wzi02qywf691r42r5jfy-ghc-9.6.6

      broken = pkgs.stdenv.hostPlatform.system == "aarch64-darwin";

    }))

  ];

pkgs/top-level/all-packages.nix

+7 −1
Original line number Diff line number Diff line
@@ -16073,7 +16073,13 @@ with pkgs; 


  nix-tree = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-tree);



  nix-serve-ng = haskell.lib.compose.justStaticExecutables haskellPackages.nix-serve-ng;

  nix-serve-ng =

    # FIXME: manually eliminate incorrect references on aarch64-darwin,

    # see https://github.com/NixOS/nixpkgs/issues/318013

    if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then

      haskellPackages.nix-serve-ng

    else

      haskell.lib.compose.justStaticExecutables haskellPackages.nix-serve-ng;



  nix-visualize = python3.pkgs.callPackage ../tools/package-management/nix-visualize { };