Skip to content

Fix for HPUX, IOS and IRIX #2389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jun 25, 2025
Merged

Fix for HPUX, IOS and IRIX #2389

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
26469da
Fix for HPUX, IOS and IRIX
hamishmack Jun 12, 2025
4acd342
Update head.hackage and fix warning
hamishmack Jun 13, 2025
6684aad
Merge remote-tracking branch 'origin/master' into static-nix-tools
hamishmack Jun 14, 2025
5d9c297
Merge remote-tracking branch 'origin/master' into static-nix-tools
hamishmack Jun 15, 2025
fc0c17f
cd nix-tools && nix flake update haskellNix
hamishmack Jun 15, 2025
cba484d
Bump head.hackage
hamishmack Jun 16, 2025
e292ebb
Merge remote-tracking branch 'origin/master' into static-nix-tools
hamishmack Jun 19, 2025
25e8de8
Merge remote-tracking branch 'origin/master' into static-nix-tools
hamishmack Jun 24, 2025
60779b2
update nix-tools-static.nix
Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion builder/comp-builder.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,6 @@ let
env = shellWrappers.drv;
shell = drv.overrideAttrs (attrs: {
pname = nameOnly + "-shell";
inherit (package.identifier) version;
nativeBuildInputs = [shellWrappers.drv] ++ attrs.nativeBuildInputs;
});
profiled = lib.makeOverridable self (drvArgs // { enableLibraryProfiling = true; });
Expand Down
77 changes: 56 additions & 21 deletions nix-tools/flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions nix-tools/nix-tools/lib-cabal2nix/Cabal2Nix.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,9 @@ instance {-# OVERLAPS #-} ToNixExpr a => ToNixExpr [a] where
fixSystem :: String -> String
fixSystem "isJavascript" = "isJavaScript"
fixSystem "isDragonfly" = "isDragonFly"
fixSystem "isHpux" = "isHPUX"
fixSystem "isIos" = "isIOS"
fixSystem "isIrix" = "isIRIX"
fixSystem s = s

instance ToNixExpr ConfVar where
Expand Down
2 changes: 1 addition & 1 deletion test/cabal.project.local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ repository head.hackage.ghc.haskell.org
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
--sha256: sha256-Zu+OsPXt+tUllxC2LVJ3jneYGUH5GvdemZZPnynWaN0=
--sha256: sha256-/xhcQuMhTBDT+1pq7YIBkNCzElILJxNhjW3LOoaChb8=
Copy link
Contributor

@thomasjm thomasjm Jun 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This hash seems to be causing failures in the CI? I'm seeing errors like this:

error: hash mismatch in fixed-output derivation '/nix/store/52fii0a9c71c9jlyr6ymv9khf6m5kfi1-head.hackage.ghc.haskell.org.drv':
         specified: sha256-/xhcQuMhTBDT+1pq7YIBkNCzElILJxNhjW3LOoaChb8=
            got:    sha256-qO3Gb/EXiX6jP3LMR/RRvSXw+IKpINXZhils3eq7Avk=


repository ghcjs-overlay
url: https://raw.githubusercontent.com/input-output-hk/hackage-overlay-ghcjs/ffb32dce467b9a4d27be759fdd2740a6edd09d0b
Expand Down
Loading