Skip to content
Open
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
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -499,10 +499,6 @@ kube-integration-test:
kube-integration-teardown:
export NAMESPACE=$(NAMESPACE); export HELM_PARALLELISM=$(HELM_PARALLELISM); ./hack/bin/integration-teardown-federation.sh

.PHONY: kube-integration-e2e-telepresence
kube-integration-e2e-telepresence:
./services/brig/federation-tests.sh $(NAMESPACE)

.PHONY: helm-oci-login
helm-oci-login:
./hack/bin/helm-oci-login.sh
Expand Down
77 changes: 38 additions & 39 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 15 additions & 12 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@

inputs = {
self.submodules = true;
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.11";
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-26.05";
nixpkgs_24_11.url = "github:nixos/nixpkgs?ref=nixos-24.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
tom-bombadil = {
url = "github:wireapp/tom-bombadil";
Expand All @@ -21,10 +20,6 @@
url = "github:wireapp/bloodhound?ref=wire-fork";
flake = false;
};
hedis = {
url = "github:wireapp/hedis?ref=wire-changes";
flake = false;
};

http-client = {
url = "github:wireapp/http-client?ref=master";
Expand Down Expand Up @@ -82,7 +77,7 @@
};

amazonka = {
url = "github:brendanhay/amazonka?rev=a7d699be1076e2aad05a1930ca3937ffea954ad8";
url = "github:brendanhay/amazonka";
flake = false;
};

Expand All @@ -95,9 +90,20 @@
url = "github:wireapp/postgresql-connection-string?ref=expose-from-key-value-params";
flake = false;
};

cryptostore = {
# Use master because the released version doesn't work with the latest version of cyrpton.
url = "git+https://codeberg.org/ocheron/cryptostore.git";
flake = false;
};

hsaml2 = {
url = "github:wireapp/hsaml2/use-crypton-asn1";
flake = false;
};
};

outputs = inputs@{ nixpkgs, nixpkgs_24_11, nixpkgs-unstable, flake-utils, tom-bombadil, sbomnix, ... }:
outputs = inputs@{ nixpkgs, nixpkgs_24_11, flake-utils, tom-bombadil, sbomnix, ... }:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = import nixpkgs {
Expand All @@ -110,9 +116,6 @@
pkgs_24_11 = import nixpkgs_24_11 {
inherit system;
};
pkgs_unstable = import nixpkgs-unstable {
inherit system;
};
bomDependenciesDrv = tom-bombadil.lib.${system}.bomDependenciesDrv;
wireServerPkgs = import ./nix { inherit pkgs pkgs_24_11 inputs bomDependenciesDrv; };
in
Expand Down Expand Up @@ -145,7 +148,7 @@

# Container and SBOM tools
pkgs.cyclonedx-cli
pkgs_unstable.syft
pkgs.syft
pkgs.kubernetes-helm
pkgs.helmfile
sbomnix.packages.${system}.default
Expand Down
22 changes: 11 additions & 11 deletions integration/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
, aeson-pretty
, amqp
, array
, asn1-encoding
, asn1-types
, async
, attoparsec
, base
Expand All @@ -25,6 +23,9 @@
, cql-io
, criterion
, crypton
, crypton-asn1-encoding
, crypton-asn1-types
, crypton-pem
, crypton-x509
, cryptostore
, data-default
Expand All @@ -39,7 +40,6 @@
, filepath
, haskell-src-exts
, hex
, hourglass
, HsOpenSSL
, http-client
, http-types
Expand All @@ -48,16 +48,15 @@
, lens
, lens-aeson
, lib
, memory
, mime
, monad-control
, mtl
, network
, network-uri
, optparse-applicative
, pem
, process
, proto-lens
, ram
, random
, raw-strings-qq
, regex
Expand All @@ -78,6 +77,7 @@
, temporary
, text
, time
, time-hourglass
, transformers
, transformers-base
, unix
Expand Down Expand Up @@ -115,8 +115,6 @@ mkDerivation {
aeson-pretty
amqp
array
asn1-encoding
asn1-types
async
attoparsec
base
Expand All @@ -131,6 +129,9 @@ mkDerivation {
cql-io
criterion
crypton
crypton-asn1-encoding
crypton-asn1-types
crypton-pem
crypton-x509
cryptostore
data-default
Expand All @@ -144,24 +145,22 @@ mkDerivation {
extra
filepath
hex
hourglass
HsOpenSSL
http-client
http-types
interpolate
kan-extensions
lens
lens-aeson
memory
mime
monad-control
mtl
network
network-uri
optparse-applicative
pem
process
proto-lens
ram
random
raw-strings-qq
regex
Expand All @@ -182,6 +181,7 @@ mkDerivation {
temporary
text
time
time-hourglass
transformers
transformers-base
unix
Expand All @@ -199,5 +199,5 @@ mkDerivation {
xml-conduit
yaml
];
license = lib.licenses.agpl3Only;
license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
}
Loading