Skip to content

Update Nix env #5032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
supersven merged 5 commits into from
Feb 17, 2026
Merged

Update Nix env #5032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1bd69c0
Update Nix env
supersven Feb 16, 2026
855e6e4
Janitor nix pins
supersven Feb 16, 2026
9ae923b
Add changelog entry
supersven Feb 16, 2026
5aed3d5
Fix path to CA cert
supersven Feb 16, 2026
f1c66a4
Fetch hsaml2 from Hackage
supersven Feb 17, 2026
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 changelog.d/5-internal/update-nix-env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade wire-server's Nix env. Switch to nixpkgs `nixos-25.11` (the release branch).
26 changes: 4 additions & 22 deletions flake.lock
View file
Open in desktop

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

6 changes: 1 addition & 5 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

inputs = {
self.submodules = true;
nixpkgs.url = "github:nixos/nixpkgs?rev=09b8fda8959d761445f12b55f380d90375a1d6bb";
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.11";
nixpkgs_24_11.url = "github:nixos/nixpkgs?ref=nixos-24.11";
flake-utils.url = "github:numtide/flake-utils";
tom-bombadil = {
Expand All @@ -16,10 +16,6 @@
url = "github:wireapp/bloodhound?ref=wire-fork";
flake = false;
};
hsaml2 = {
url = "github:dylex/hsaml2?ref=main";
flake = false;
};
hedis = {
url = "github:wireapp/hedis?ref=wire-changes";
flake = false;
Expand Down
2 changes: 1 addition & 1 deletion integration/scripts/integration-dynamic-backends-vhosts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ DOMAIN=$2

echo 'Creating RabbitMQ resources'

curl --cacert /certs/rabbitmq-ca/ca.pem -u "$RABBITMQ_USERNAME:$RABBITMQ_PASSWORD" -X PUT "$ENDPOINT_URL/$DOMAIN"
curl --cacert /certs/rabbitmq-ca/ca.crt -u "$RABBITMQ_USERNAME:$RABBITMQ_PASSWORD" -X PUT "$ENDPOINT_URL/$DOMAIN"

echo "RabbitMQ vhost created successfully for $DOMAIN"
30 changes: 5 additions & 25 deletions nix/haskell-pins.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@ let
src = inputs.bloodhound;
};

# Merged PR https://github.com/dylex/hsaml2/pull/20
hsaml2 = {
src = inputs.hsaml2;
};

# PR: https://github.com/informatikr/hedis/pull/224
# PR: https://github.com/informatikr/hedis/pull/226
# PR: https://github.com/informatikr/hedis/pull/227
Expand Down Expand Up @@ -170,23 +165,6 @@ let
};

hackagePins = {
# start pinned dependencies for http2
http-semantics = {
version = "0.4.0";
sha256 = "sha256-rh0z51EKvsu5rQd5n2z3fSRjjEObouNZSBPO9NFYOF0=";
};

network-run = {
version = "0.5.0";
sha256 = "sha256-vbXh+CzxDsGApjqHxCYf/ijpZtUCApFbkcF5gyN0THU=";
};

time-manager = {
version = "0.2.4";
sha256 = "sha256-sAt/331YLQ2IU3z90aKYSq1nxoazv87irsuJp7ZG3pw=";
};
# end pinned dependencies for http2

# This pin should not be necessary. However, without it, Nix tries to fetch
# the sources from the `amazonka` package and fails.
# Fix: https://github.com/NixOS/nixpkgs/pull/409098
Expand All @@ -205,9 +183,11 @@ let
version = "3.4.12";
sha256 = "sha256-Y9xQ1wBbBtSZ4qw3yTGSYX27qi2uFRDJVtAdmQqRnFQ=";
};
http2 = {
version = "5.4.0";
sha256 = "sha256-PeEWVd61bQ8G7LvfLeXklzXqNJFaAjE2ecRMWJZESPE=";

# Version freshly released, thus not in nixpkgs, yet: https://github.com/dylex/hsaml2/issues/21
hsaml2 = {
version = "0.2.0";
sha256 = "sha256-kEalrs79uI8CMaVa7suYEzeer/YqFoJOqkV+LhiUwY4=";
};
};
# Name -> Source -> Maybe Subpath -> Drv
Expand Down
7 changes: 7 additions & 0 deletions nix/manual-overrides.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ hself: hsuper: {
hasql-transaction = hlib.dontCheck hsuper.hasql-transaction; # users 1.2.1 from nixpkgs
postgresql-binary = hlib.dontCheck (hsuper.postgresql-binary);

# Test fixtures don't seem to be bundled for Hackage
hsaml2 = hlib.dontCheck (hsuper.hsaml2);

# ---------------------
# need to be jailbroken
# (these need to be fixed upstream eventually)
Expand Down Expand Up @@ -86,6 +89,10 @@ hself: hsuper: {
# warp requires curl in its testsuite
warp = hlib.addTestToolDepends hsuper.warp [ curl ];

http-semantics = hsuper.http-semantics_0_4_0;
network-run = hsuper.network-run_0_5_0;
http2 = hsuper.http2_5_4_0;

# -----------------
# flags and patches
# (these are fine)
Expand Down