abonerib/nix-serve-ng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Nix build (#17)

Browse Source 
Fixes https://github.com/aristanetworks/nix-serve-ng/issues/16
This commit is contained in:
Gabriella Gonzalez 2022-11-25 17:46:54 -08:00 committed by GitHub
parent 9b546864f4
commit e36a1a93aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
flake.nix
View File

@ -11,33 +11,39 @@
outputs = { nixpkgs, utils, ... }: outputs = { nixpkgs, utils, ... }:
let let
compiler = "ghc92";
overlay = pkgsNew: pkgsOld: { overlay = pkgsNew: pkgsOld: {
cabal2nix-unwrapped = cabal2nix-unwrapped =
pkgsNew.haskell.lib.justStaticExecutables pkgsNew.haskell.lib.justStaticExecutables
pkgsNew.haskell.packages.ghc92.cabal2nix; pkgsNew.haskell.packages."${compiler}".cabal2nix;
haskellPackages = pkgsOld.haskellPackages.override (old: { haskell = pkgsOld.haskell // {
overrides = packages = pkgsOld.haskell.packages // {
pkgsNew.lib.fold pkgsNew.lib.composeExtensions (old.overrides or (_: _: { })) [ "${compiler}" = pkgsOld.haskell.packages."${compiler}".override (old: {
(pkgsNew.haskell.lib.packageSourceOverrides { overrides =
nix-serve-ng = ./.; pkgsNew.lib.fold pkgsNew.lib.composeExtensions (old.overrides or (_: _: { })) [
}) (pkgsNew.haskell.lib.packageSourceOverrides {
(haskellPackagesNew: haskellPackagesOld: { nix-serve-ng = ./.;
nix-serve-ng = })
pkgsNew.haskell.lib.overrideCabal (haskellPackagesNew: haskellPackagesOld: {
haskellPackagesOld.nix-serve-ng nix-serve-ng =
(old: { pkgsNew.haskell.lib.overrideCabal
executableSystemDepends = (old.executableSystemDepends or []) ++ [ haskellPackagesOld.nix-serve-ng
pkgsNew.boost.dev (old: {
]; executableSystemDepends = (old.executableSystemDepends or []) ++ [
}); pkgsNew.boost.dev
}) ];
]; });
}); })
];
});
};
};
nix-serve-ng = nix-serve-ng =
pkgsNew.haskell.lib.justStaticExecutables pkgsNew.haskell.lib.justStaticExecutables
pkgsNew.haskellPackages.nix-serve-ng; pkgsNew.haskell.packages."${compiler}".nix-serve-ng;
}; };
in in
@ -68,13 +74,16 @@
defaultApp = apps.default; defaultApp = apps.default;
devShells.default = devShells.default =
(pkgs.haskell.lib.doBenchmark pkgs.haskellPackages.nix-serve-ng).env; (pkgs.haskell.lib.doBenchmark
pkgs.haskell.packages."${compiler}".nix-serve-ng
).env;
devShell = devShells.default; devShell = devShells.default;
}) // rec { }) // rec {
overlays = { overlays = {
# The default overlay only adds the exports for # The default overlay only adds the exports for
# `pkgs.haskellPackages.nix-serve-ng` and `pkgs.nix-serve-ng` # `pkgs.haskell.packages."${compiler}".nix-serve-ng` and
# `pkgs.nix-serve-ng`
default = [ overlay ]; default = [ overlay ];
# This overlay additionally overrides `pkgs.nix-serve` to refer to # This overlay additionally overrides `pkgs.nix-serve` to refer to