From 5ff96ac3a0a5ae102bc3cd48c57be36b232a1455 Mon Sep 17 00:00:00 2001 From: Piyush thapa Date: Fri, 26 May 2023 20:43:40 +0545 Subject: [PATCH] fix flake --- Setup.hs | 6 ++++ flake.lock | 89 ++++++++++++++++------------------------------------- flake.nix | 6 +++- nix/hix.nix | 12 +++----- 4 files changed, 42 insertions(+), 71 deletions(-) create mode 100644 Setup.hs diff --git a/Setup.hs b/Setup.hs new file mode 100644 index 0000000..6fa548c --- /dev/null +++ b/Setup.hs @@ -0,0 +1,6 @@ +module Main (main) where + +import Distribution.Simple + +main :: IO () +main = defaultMain diff --git a/flake.lock b/flake.lock index 4641635..c0ef77f 100644 --- a/flake.lock +++ b/flake.lock @@ -190,15 +190,12 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems" - }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { @@ -209,16 +206,15 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1679360468, - "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", - "owner": "hamishmack", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", "repo": "flake-utils", - "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { - "owner": "hamishmack", - "ref": "hkm/nested-hydraJobs", + "owner": "numtide", "repo": "flake-utils", "type": "github" } @@ -292,11 +288,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1683159976, - "narHash": "sha256-bEfhRqQjRvYzaNu8vvHZAa31u+8DNYoRlPpQZPrnqbk=", + "lastModified": 1677630516, + "narHash": "sha256-zSsakVyoSuoJWoMtPtm/HlDuGNQ6Exr7AD062KxHwVw=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "525f5a74cbaacd76cf8e005de2ee99f1d544568a", + "rev": "42c981d6ed46749fde63652865ee6159a207c315", "type": "github" }, "original": { @@ -316,7 +312,6 @@ "flake-utils": "flake-utils_2", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", "hackage": "hackage", - "hls-1.10": "hls-1.10", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -335,11 +330,11 @@ "tullia": "tullia" }, "locked": { - "lastModified": 1683195635, - "narHash": "sha256-1mXduNH0Fc/1jEIhy/UaAp7IOe5XwicoYC2GTkUfsp8=", + "lastModified": 1677631875, + "narHash": "sha256-nLOvHsuUYMNu7btpDV0YlF+9b0ZoSUDC2dZJOCkmxk4=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "e491253ba13b8145bcaa8f9af6e41b7ff2c96087", + "rev": "cc6bc46e13f74ce50ff9ad2d38194a774c7d1fbd", "type": "github" }, "original": { @@ -348,23 +343,6 @@ "type": "github" } }, - "hls-1.10": { - "flake": false, - "locked": { - "lastModified": 1680000865, - "narHash": "sha256-rc7iiUAcrHxwRM/s0ErEsSPxOR3u8t7DvFeWlMycWgo=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "b08691db779f7a35ff322b71e72a12f6e3376fd9", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "1.10.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, "hpc-coveralls": { "flake": false, "locked": { @@ -665,11 +643,11 @@ }, "nixpkgs-2205": { "locked": { - "lastModified": 1682600000, - "narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=", + "lastModified": 1672580127, + "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0", + "rev": "0874168639713f547c05947c76124f78441ea46c", "type": "github" }, "original": { @@ -681,11 +659,11 @@ }, "nixpkgs-2211": { "locked": { - "lastModified": 1682682915, - "narHash": "sha256-haR0u/j/nUvlMloYlaOYq1FMXTvkNHw+wGxc+0qXisM=", + "lastModified": 1675730325, + "narHash": "sha256-uNvD7fzO5hNlltNQUAFBPlcEjNG5Gkbhl/ROiX+GZU4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09f1b33fcc0f59263137e23e935c1bb03ec920e4", + "rev": "b7ce17b1ebf600a72178f6302c77b6382d09323f", "type": "github" }, "original": { @@ -713,11 +691,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1682656005, - "narHash": "sha256-fYplYo7so1O+rSQ2/aS+SbTPwLTeoUXk4ekKNtSl4P8=", + "lastModified": 1675758091, + "narHash": "sha256-7gFSQbSVAFUHtGCNHPF7mPc5CcqDk9M2+inlVPZSneg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6806b63e824f84b0f0e60b6d660d4ae753de0477", + "rev": "747927516efcb5e31ba03b7ff32f61f6d47e7d87", "type": "github" }, "original": { @@ -819,11 +797,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1683072567, - "narHash": "sha256-kDkNkFaSIaEmqrxxZK+d7CGHfXzrL6xHqJsU4QjTNkU=", + "lastModified": 1677543037, + "narHash": "sha256-7CPQZZafTQiw7YL+a2KCamb9a3PU0do9iZKy1AaRkBo=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "ed8c3c6c0346de0d62671abafb5977ab48a48266", + "rev": "f4d29fa4403f45541d9f3993523df6027c21fe90", "type": "github" }, "original": { @@ -877,21 +855,6 @@ "type": "github" } }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tullia": { "inputs": { "nix-nomad": "nix-nomad", diff --git a/flake.nix b/flake.nix index 2c01fa5..0e616ee 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,10 @@ outputs = { self, nixpkgs, flake-utils, haskellNix }: let supportedSystems = [ - "x86_64-linux" "x86_64-darwin" + "x86_64-linux" + "x86_64-darwin" + "aarch64-linux" + "aarch64-darwin" ]; in flake-utils.lib.eachSystem supportedSystems (system: @@ -31,6 +34,7 @@ # This sets the flake to use the IOG nix cache. # Nix should ask for permission before using it, # but remove it here if you do not want it to. + extra-substituters = ["https://cache.iog.io"]; allow-import-from-derivation = "true"; }; } diff --git a/nix/hix.nix b/nix/hix.nix index 33b8182..11a595b 100644 --- a/nix/hix.nix +++ b/nix/hix.nix @@ -10,11 +10,9 @@ # ]); # Tools to include in the development shell - shell = { - tools = { - cabal = "latest"; - hlint = "3.4.1"; - haskell-language-server = { version = "1.8.0.0"; index-state = "2022-12-17T00:00:00Z"; }; - }; - }; + shell.tools.cabal = "latest"; + shell.tools.hlint = "3.4.1"; + shell.tools.haskell-language-server = { version = "1.8.0.0"; index-state = "2022-12-17T00:00:00Z"; }; + + shell.buildInputs = with pkgs; [zlib zlib.dev zlib.out]; }