diff --git a/cabal.project b/cabal.project index 5d0b6887d6..05554113c0 100644 --- a/cabal.project +++ b/cabal.project @@ -5,7 +5,7 @@ constraints: zip +disable-bzip2 +disable-zstd source-repository-package type: git location: https://github.com/simplex-chat/simplexmq.git - tag: 7fa4862a8358cd27d85178add5f9017c66d4de95 + tag: a7c3133c35fdf23023a6f1c6c0fc9b951f4387d6 source-repository-package type: git diff --git a/flake.lock b/flake.lock index 7c1fd19982..d2deeaa040 100644 --- a/flake.lock +++ b/flake.lock @@ -133,11 +133,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1655687627, - "narHash": "sha256-E1uyic0vWHC6gtz2FYtnFE3JWhvmmBj1TU93qoJSxdg=", + "lastModified": 1647047557, + "narHash": "sha256-6A7jjz77f53GkvFxqVmeuqqXyDWsU24rUtFtOg68CAg=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "6634069475ef594a8a2be6c33301ba7e59149980", + "rev": "fc07d4d4f2597334caa96f455cec190bdcc931f4", "type": "github" }, "original": { @@ -155,9 +155,7 @@ "cardano-shell": "cardano-shell", "flake-utils": "flake-utils_2", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "hackage": [ - "hackage" - ], + "hackage": "hackage", "hpc-coveralls": "hpc-coveralls", "nix-tools": "nix-tools", "nixpkgs": [ @@ -317,7 +315,6 @@ "root": { "inputs": { "flake-utils": "flake-utils", - "hackage": "hackage", "haskellNix": "haskellNix", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index 2474dcbf78..6e13c24a64 100644 --- a/flake.nix +++ b/flake.nix @@ -3,13 +3,8 @@ inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; #angerman/nixpkgs/patch-1"; # based on 21.11, still need this, until everything is merged into 21.11. inputs.haskellNix.url = "github:input-output-hk/haskell.nix?ref=angerman/try-no-libcharset"; inputs.haskellNix.inputs.nixpkgs.follows = "nixpkgs"; - inputs.hackage = { - url = "github:input-output-hk/hackage.nix"; - flake = false; - }; - inputs.haskellNix.inputs.hackage.follows = "hackage"; inputs.flake-utils.url = "github:numtide/flake-utils"; - outputs = { self, haskellNix, nixpkgs, flake-utils, ... }: + outputs = { self, haskellNix, nixpkgs, flake-utils }: let systems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; in flake-utils.lib.eachSystem systems (system: let pkgs = haskellNix.legacyPackages.${system}; in diff --git a/stack.yaml b/stack.yaml index 956ba979f6..b5df7a2e8b 100644 --- a/stack.yaml +++ b/stack.yaml @@ -38,7 +38,7 @@ extra-deps: - cryptostore-0.2.1.0@sha256:9896e2984f36a1c8790f057fd5ce3da4cbcaf8aa73eb2d9277916886978c5b19,3881 - network-3.1.2.7@sha256:e3d78b13db9512aeb106e44a334ab42b7aa48d26c097299084084cb8be5c5568,4888 - simple-logger-0.1.0@sha256:be8ede4bd251a9cac776533bae7fb643369ebd826eb948a9a18df1a8dd252ff8,1079 - - tls-1.6.0@sha256:7ae39373fd2de27fb80e90f76d22aeeb9a074a0ddd120cbd02c9c52f516a9e55,6987 + - tls-1.5.7@sha256:1cc30253a9696b65a9cafc0317fbf09f7dcea15e3a145ed6c9c0e28c632fa23a,6991 # below hackage dependencies are to update Aeson to 2.0.3 - OneTuple-0.3.1@sha256:a848c096c9d29e82ffdd30a9998aa2931cbccb3a1bc137539d80f6174d31603e,2262 - attoparsec-0.14.4@sha256:79584bdada8b730cb5138fca8c35c76fbef75fc1d1e01e6b1d815a5ee9843191,5810