From c5e8fa4ca280b6bef4dbdd4ada588647700b91d2 Mon Sep 17 00:00:00 2001 From: Even Brenden Date: Mon, 2 Oct 2023 14:54:14 +0200 Subject: [PATCH] Update all and track nixos-23.05 --- flake.lock | 84 +++++++++++++++++++++++++----------- flake.nix | 4 +- unleash-client-haskell.cabal | 19 +++++--- 3 files changed, 74 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index e47f25b..3410e50 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1696248941, + "narHash": "sha256-kKckR0W4w3UVReO2WTBaXT6A+vH1Wc38Cno3hN96tAY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "e654cc30bf766535a28a95ad5683f50d1b5cf84a", "type": "github" }, "original": { @@ -19,11 +19,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -33,12 +33,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -48,12 +51,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -64,32 +70,32 @@ }, "nixpkgs": { "locked": { - "lastModified": 1671190014, - "narHash": "sha256-NW385LW4Nj53Hbv3LXr458s4NL2/wcARC8rzK7vSWkw=", + "lastModified": 1696983906, + "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fbcb61bd7eb19914cbd88789c3586a63ff46b72b", + "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1671190014, - "narHash": "sha256-NW385LW4Nj53Hbv3LXr458s4NL2/wcARC8rzK7vSWkw=", + "lastModified": 1696983906, + "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fbcb61bd7eb19914cbd88789c3586a63ff46b72b", + "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -102,6 +108,36 @@ "unleash-client-haskell-core": "unleash-client-haskell-core" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "unleash-client-haskell-core": { "inputs": { "flake-compat": "flake-compat_2", @@ -109,16 +145,16 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1694683505, - "narHash": "sha256-X74/TFFSK1sspvZlqHacT8nySQnaR7FEZ6hzRE9oxp8=", + "lastModified": 1697189294, + "narHash": "sha256-ra3DndeeV2TFDSUEjyXJBs8gcAgPaMvt4RmGexGyOJs=", "owner": "finn-no", "repo": "unleash-client-haskell-core", - "rev": "04a0260404616fc95a891ddaf94556c54bd4c683", + "rev": "3212bab2558ef181ff6937618a937194d0131de5", "type": "github" }, "original": { "owner": "finn-no", - "ref": "0.8.9", + "ref": "0.9.0", "repo": "unleash-client-haskell-core", "type": "github" } diff --git a/flake.nix b/flake.nix index 930b094..9df3033 100644 --- a/flake.nix +++ b/flake.nix @@ -6,9 +6,9 @@ flake = false; }; flake-utils.url = "github:numtide/flake-utils"; - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; unleash-client-haskell-core.url = - "github:finn-no/unleash-client-haskell-core?ref=0.8.9"; + "github:finn-no/unleash-client-haskell-core?ref=0.9.0"; }; outputs = { self, nixpkgs, flake-compat, flake-utils, unleash-client-haskell-core }: diff --git a/unleash-client-haskell.cabal b/unleash-client-haskell.cabal index 6b8e2ec..223afbc 100644 --- a/unleash-client-haskell.cabal +++ b/unleash-client-haskell.cabal @@ -27,25 +27,30 @@ extra-source-files: README.md common all build-depends: base >=4.7 && <5, - record-dot-preprocessor >= 0.2.15 && < 0.3, - record-hasfield >= 1.0 && < 1.1 default-extensions: BlockArguments + DataKinds DeriveFoldable DeriveFunctor DeriveTraversable DerivingStrategies + DuplicateRecordFields + ExplicitNamespaces + FlexibleInstances LambdaCase + MultiParamTypeClasses + OverloadedRecordDot OverloadedStrings RankNTypes ScopedTypeVariables + TypeOperators + TypeApplications ghc-options: -W -Wno-unused-top-binds -Wredundant-constraints -Wunused-packages -haddock - -F -pgmF=record-dot-preprocessor default-language: Haskell2010 library @@ -60,15 +65,15 @@ library hs-source-dirs: src build-depends: aeson >= 2.0.3 && < 2.1, - containers >= 0.6.4 && < 0.7, + containers >= 0.6.5 && < 0.7, http-client-tls >= 0.3.6 && < 0.4, http-media >= 0.8.0 && < 0.9, mtl >= 2.2.2 && < 2.3, servant >= 0.19.1 && < 0.20, servant-client >= 0.19 && < 0.20, text >= 1.2.5 && < 1.3, - time >= 1.9.3 && < 1.10, - unleash-client-haskell-core >= 0.8.9 && < 0.9 + time >= 1.11.1 && < 1.12, + unleash-client-haskell-core >= 0.9.0 && < 0.10, executable example import: all @@ -80,4 +85,4 @@ executable example text, unleash-client-haskell, unleash-client-haskell-core, - unliftio >= 0.2.23 && < 0.3 + unliftio >= 0.2.24 && < 0.3,