From 1b35eec4cfda3756ba0bca7d6249691bcf7b1829 Mon Sep 17 00:00:00 2001 From: Mateusz Galazyn Date: Tue, 2 Apr 2024 18:58:54 +0200 Subject: [PATCH] Enable x86_64-darwin, aarch64-darwin, nix builds --- cabal.project | 4 +++ flake.lock | 74 +++++++++++++++++++++++++-------------------------- flake.nix | 7 ++--- 3 files changed, 45 insertions(+), 40 deletions(-) diff --git a/cabal.project b/cabal.project index d24d470001..adce302ff1 100644 --- a/cabal.project +++ b/cabal.project @@ -27,6 +27,10 @@ package cryptonite -- generation is dubious. Set the flag so we use /dev/urandom by default. flags: -support_rdrand +package bitvec + -- Workaround for windows cross-compilation + flags: -simd + tests: True test-show-details: direct diff --git a/flake.lock b/flake.lock index 4bac217e1d..ea89713c02 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1713175844, + "lastModified": 1713193436, "narHash": "sha256-8Xz0kMPvgHp1rsv9FHwEl2N40DzPQv22qk+aUW361mM=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "e00be463a34798f98c5d18e1d7cc0b8137547005", + "rev": "ffc155aa2980891f84f5375164ffd2075518546b", "type": "github" }, "original": { @@ -173,11 +173,11 @@ "ghc910X": { "flake": false, "locked": { - "lastModified": 1709693152, - "narHash": "sha256-j7K/oZLy1ZZIpOsjq101IF7cz/i/UxY1ofIeNUfuuXc=", + "lastModified": 1711543129, + "narHash": "sha256-MUI07CxYOng7ZwHnMCw0ugY3HmWo2p/f4r07CGV7OAM=", "ref": "ghc-9.10", - "rev": "21e3f3250e88640087a1a60bee2cc113bf04509f", - "revCount": 62524, + "rev": "6ecd5f2ff97af53c7334f2d8581651203a2c6b7d", + "revCount": 62607, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -192,11 +192,11 @@ "ghc911": { "flake": false, "locked": { - "lastModified": 1710286031, - "narHash": "sha256-fz71zsU/ZukFMUsRNk2Ro3xTNMKsNrpvQtRtPqRI60c=", + "lastModified": 1711538967, + "narHash": "sha256-KSdOJ8seP3g30FaC2du8QjU9vumMnmzPR5wfkVRXQMk=", "ref": "refs/heads/master", - "rev": "e6bfb85c842edca36754bb8914e725fbaa1a83a6", - "revCount": 62586, + "rev": "0acfe391583d77a72051d505f05fab0ada056c49", + "revCount": 62632, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -210,11 +210,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1713148874, - "narHash": "sha256-qJs+4QNxxB9aD+CsByOZR2aheGDb3xNRukw7D9TqSj4=", + "lastModified": 1713399842, + "narHash": "sha256-e2WgMXaoos+dJld+KcntBMqnS4tqtlKnXBFC+4KTuyA=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "9586d6737b7bf7480df9bd3e3e710fb530b4da9e", + "rev": "db08c82c5085b992f88f1dc48ab543b347496653", "type": "github" }, "original": { @@ -242,10 +242,10 @@ "hls-2.4": "hls-2.4", "hls-2.5": "hls-2.5", "hls-2.6": "hls-2.6", + "hls-2.7": "hls-2.7", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", - "nix-tools-static": "nix-tools-static", "nixpkgs": [ "haskellNix", "nixpkgs-unstable" @@ -262,11 +262,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1711327801, - "narHash": "sha256-u1c7y+ksx0Er8C1s5tnoHDhhkG9eXskVOnKtzHUqQIw=", + "lastModified": 1713401416, + "narHash": "sha256-n+ECHMHb5Yzz5n9F2BkK7YbRXdlRF/bs5CCpRT2KczU=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "11337f2fb85cd606630929f8fce485160d343cdc", + "rev": "7ff394777d4ba0505fd41a388d52994d250766e6", "type": "github" }, "original": { @@ -394,6 +394,23 @@ "type": "github" } }, + "hls-2.7": { + "flake": false, + "locked": { + "lastModified": 1708965829, + "narHash": "sha256-LfJ+TBcBFq/XKoiNI7pc4VoHg4WmuzsFxYJ3Fu+Jf+M=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "50322b0a4aefb27adc5ec42f5055aaa8f8e38001", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.7.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -526,23 +543,6 @@ "type": "github" } }, - "nix-tools-static": { - "flake": false, - "locked": { - "lastModified": 1706266250, - "narHash": "sha256-9t+GRk3eO9muCtKdNAwBtNBZ5dH1xHcnS17WaQyftwA=", - "owner": "input-output-hk", - "repo": "haskell-nix-example", - "rev": "580cb6db546a7777dad3b9c0fa487a366c045c4e", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "nix", - "repo": "haskell-nix-example", - "type": "github" - } - }, "nixlib": { "locked": { "lastModified": 1667696192, @@ -801,11 +801,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1711325399, - "narHash": "sha256-Tx+/n9tBfnTgXj1TbBxgbceqB1TKdYY94BRNF6qSwJY=", + "lastModified": 1713399049, + "narHash": "sha256-BqDuOZMwj3bVfnpjZgCag0VTgY6wCcCJTfLYkt3S/c0=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "81b2725cbf27a23d7e292448072dc1bff976351a", + "rev": "6f7558135ca710c87348f4049758d69b110ce47f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 44e6047136..07207250da 100644 --- a/flake.nix +++ b/flake.nix @@ -15,11 +15,12 @@ outputs = inputs: let supportedSystems = [ "x86_64-linux" + "x86_64-darwin" + # this is slow as we don't have aarch64-linux native builders as of 2024-04-03 # disabling to reduce CI time initially. Uncomment later # When you uncomment, lookup the "TODO generalize" comments in release-upload.yaml - #"x86_64-darwin" - #"aarch64-linux" - #"aarch64-darwin" + # "aarch64-linux" + "aarch64-darwin" ]; in {inherit (inputs) incl;}