From 006d7838df6bb70503524c42417e34a448975522 Mon Sep 17 00:00:00 2001 From: Matthias Fischmann Date: Fri, 22 Nov 2024 10:34:36 +0100 Subject: [PATCH] Bump dependencies; prepare release. --- .github/workflows/ci.yml | 4 +-- CHANGELOG.md | 4 +++ ldap-scim-bridge.cabal | 58 ++++++++++++++++++++-------------------- shell.nix | 6 ++--- 4 files changed, 38 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00b71ba..71a7b52 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,8 +24,8 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - ghc-version: ['9.4'] - cabal: ['3.10.2.1'] + ghc-version: ['9.4', '9.6.6'] + cabal: ['3.10.3.0'] steps: - uses: actions/checkout@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 56e8107..28cd218 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ `ldap-scim-bridge` uses [PVP][1]-compatible versioning. The changelog is available [on GitHub][2]. +## 0.10 + +- More helpful error messages on bad LDAP input records. + ## 0.9 - Map ldap attribute to SCIM roles (#26) diff --git a/ldap-scim-bridge.cabal b/ldap-scim-bridge.cabal index ffa9528..fb18bb5 100644 --- a/ldap-scim-bridge.cabal +++ b/ldap-scim-bridge.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: ldap-scim-bridge -version: 0.9 +version: 0.10 synopsis: See README for synopsis description: See README for description homepage: https://github.com/wireapp/ldap-scim-bridge @@ -22,7 +22,7 @@ extra-source-files: examples/wire-server/run.sh examples/wire-server/runlog -tested-with: GHC ==8.8.3 +tested-with: GHC ==9.6.6 source-repository head type: git @@ -30,27 +30,27 @@ source-repository head common common-options build-depends: - , aeson >=2.1.2 && <2.2 - , aeson-pretty >=0.8.10 && <0.9 - , base >=4.17.2 && <4.18 - , bytestring >=0.11.5 && <0.12 - , containers >=0.6.7 && <0.7 - , email-validate >=2.3.2 && <2.4 - , hscim >=0.4.0.2 && <0.5 - , http-client >=0.7.16 && <0.8 - , http-client-tls >=0.3.6 && <0.4 - , http-types >=0.12.4 && <0.13 - , ldap-client >=0.4.2 && <0.5 - , network >=3.1.4 && <3.2 - , relude >=1.2.1 && <1.3 - , servant >=0.19.1 && <0.20 - , servant-client >=0.19 && <0.20 - , servant-client-core >=0.19 && <0.20 - , string-conversions >=0.4.0 && <0.5 - , text >=2.0.2 && <2.1 - , tinylog >=0.15.0 && <0.16 - , unordered-containers >=0.2.20 && <0.3 - , yaml >=0.11.11 && <0.12 + , aeson >=2.1.2 + , aeson-pretty >=0.8.10 + , base + , bytestring >=0.11.5 + , containers >=0.6.7 + , email-validate >=2.3.2 + , hscim >=0.4.0.4 + , http-client >=0.7.16 + , http-client-tls >=0.3.6 + , http-types >=0.12.4 + , ldap-client >=0.4.2 + , network >=3.1.4 + , relude >=1.2.1 + , servant >=0.19.1 + , servant-client >=0.19 + , servant-client-core >=0.19 + , string-conversions >=0.4.0 + , text >=2.0.2 + , tinylog >=0.15.0 + , unordered-containers >=0.2.20 + , yaml >=0.11.11 mixins: base hiding (Prelude), @@ -123,16 +123,16 @@ test-suite ldap-scim-bridge-test type: exitcode-stdio-1.0 build-depends: , base - , bytestring >=0.11.5 && <0.12 - , email-validate >=2.3.2 && <2.4 - , hscim >=0.4.0.2 && <0.5 + , bytestring >=0.11.5 + , email-validate >=2.3.2 + , hscim >=0.4.0.2 , hspec - , ldap-client >=0.4.2 && <0.5 + , ldap-client >=0.4.2 , ldap-scim-bridge , QuickCheck , string-conversions - , text >=2.0.2 && <2.1 - , yaml >=0.11.11 && <0.12 + , text >=2.0.2 + , yaml >=0.11.11 hs-source-dirs: test default-language: Haskell2010 diff --git a/shell.nix b/shell.nix index 05d8c75..2d84003 100644 --- a/shell.nix +++ b/shell.nix @@ -1,7 +1,7 @@ let nixpkgs = fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/7eeacecff44e05a9fd61b9e03836b66ecde8a525.tar.gz"; - sha256 = "sha256:0f6nv0pgk58d1962r8vswi7ks59fryh0yrdk99d30b3qj11a2045"; + url = "https://github.com/NixOS/nixpkgs/archive/4f31540079322e6013930b5b2563fd10f96917f0.tar.gz"; + sha256 = "sha256:12748r3h44hy3a41slm5hcihn1nhrxjlgp75qz6iwzazkxnclx00"; }; pkgs = import nixpkgs { config = { }; overlays = [ ]; }; in @@ -13,7 +13,7 @@ pkgs.mkShellNoCC rec { ghcid ghc zlib - (haskell.lib.justStaticExecutables pkgs.haskell.packages.ghc94.ormolu_0_5_2_0) + (haskell.lib.justStaticExecutables haskellPackages.ormolu) (haskell.lib.justStaticExecutables haskellPackages.cabal-fmt) nixpkgs-fmt treefmt