Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ packages:
, libs/metrics-core/
, libs/metrics-wai/
, libs/polysemy-wire-zoo/
, libs/proteus-bindings/
, libs/saml2-web-sso
, libs/schema-profunctor/
, libs/sodium-crypto-sign/
Expand Down
4 changes: 2 additions & 2 deletions integration/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
, cql
, cql-io
, criterion
, cryptobox-haskell
, crypton
, crypton-x509
, cryptostore
Expand Down Expand Up @@ -59,6 +58,7 @@
, optparse-applicative
, pem
, process
, proteus-bindings
, proto-lens
, random
, raw-strings-qq
Expand Down Expand Up @@ -132,7 +132,6 @@ mkDerivation {
cql
cql-io
criterion
cryptobox-haskell
crypton
crypton-x509
cryptostore
Expand Down Expand Up @@ -164,6 +163,7 @@ mkDerivation {
optparse-applicative
pem
process
proteus-bindings
proto-lens
random
raw-strings-qq
Expand Down
2 changes: 1 addition & 1 deletion integration/integration.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ library
, cql
, cql-io
, criterion
, cryptobox-haskell
, proteus-bindings
, crypton
, crypton-x509
, cryptostore
Expand Down
8 changes: 1 addition & 7 deletions nix/haskell-pins.nix
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,7 @@ let
# maintained by us
# ----------------

cryptobox-haskell = {
src = fetchgit {
url = "https://github.com/wireapp/cryptobox-haskell";
rev = "7546a1a25635ef65183e3d44c1052285e8401608";
hash = "sha256-9mMVgmMB1NWCPm/3inLeF4Ouiju0uIb/92UENoP88TU=";
};
};
# None

# --------------------
# END maintained by us
Expand Down
1 change: 1 addition & 0 deletions nix/local-haskell-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
jwt-tools = hself.callPackage ../libs/jwt-tools/default.nix { inherit gitignoreSource; };
metrics-core = hself.callPackage ../libs/metrics-core/default.nix { inherit gitignoreSource; };
metrics-wai = hself.callPackage ../libs/metrics-wai/default.nix { inherit gitignoreSource; };
proteus-bindings = hself.callPackage ../libs/proteus-bindings/default.nix { inherit gitignoreSource; };
polysemy-wire-zoo = hself.callPackage ../libs/polysemy-wire-zoo/default.nix { inherit gitignoreSource; };
saml2-web-sso = hself.callPackage ../libs/saml2-web-sso/default.nix { inherit gitignoreSource; };
schema-profunctor = hself.callPackage ../libs/schema-profunctor/default.nix { inherit gitignoreSource; };
Expand Down
2 changes: 1 addition & 1 deletion nix/overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ in

self: super: {

cryptobox = self.callPackage ./pkgs/cryptobox { };
proteus-bindings = self.callPackage ./pkgs/proteus-bindings { };
zauth = self.callPackage ./pkgs/zauth { };
mls-test-cli = self.callPackage ./pkgs/mls-test-cli { };

Expand Down
1 change: 0 additions & 1 deletion nix/pkgs/cryptobox/.gitignore

This file was deleted.

Loading