From 11a9865117052aa5e7e3256d72816791874d3323 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 8 Nov 2022 11:37:27 +0100 Subject: [PATCH] Bump nixpkgs to latest unstable, unpin openssl (#2828) * Bump nixpkgs to latest unstable, stop using forked nixpkgs * Use openssl 3.0.7 for HsOpenSSL Latest nixpkgs unstable contains the fixed version of openssl. * nix/sources.json: Update description and homepage `niv update` misses this: https://github.com/nmattia/niv/issues/358 --- changelog.d/5-internal/nixpkgs-bump | 1 + nix/manual-overrides.nix | 4 +--- nix/sources.json | 14 +++++++------- nix/wire-server.nix | 1 - 4 files changed, 9 insertions(+), 11 deletions(-) create mode 100644 changelog.d/5-internal/nixpkgs-bump diff --git a/changelog.d/5-internal/nixpkgs-bump b/changelog.d/5-internal/nixpkgs-bump new file mode 100644 index 00000000000..86b659bfcb8 --- /dev/null +++ b/changelog.d/5-internal/nixpkgs-bump @@ -0,0 +1 @@ +Bump nixpkgs to latest unstable. Stop using forked nixpkgs. \ No newline at end of file diff --git a/nix/manual-overrides.nix b/nix/manual-overrides.nix index 3a38a4435a3..0cecced5165 100644 --- a/nix/manual-overrides.nix +++ b/nix/manual-overrides.nix @@ -1,4 +1,4 @@ -{ libsodium, protobuf, hlib, mls-test-cli, openssl }: +{ libsodium, protobuf, hlib, mls-test-cli }: # FUTUREWORK: Figure out a way to detect if some of these packages are not # actually marked broken, so we can cleanup this file on every nixpkgs bump. hself: hsuper: { @@ -58,6 +58,4 @@ hself: hsuper: { # Make hoogle static to reduce size of the hoogle image hoogle = hlib.justStaticExecutables hsuper.hoogle; - - HsOpenSSL = hsuper.HsOpenSSL.override { inherit openssl; }; } diff --git a/nix/sources.json b/nix/sources.json index 5c08ee0357e..2c25068a169 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -1,14 +1,14 @@ { "nixpkgs": { - "branch": "hls-hlint-plugin-workaround", - "description": "Wire's fork of NixOS/nixpkgs. Use until HLS > 1.7.0.0 is available in NixOS/nixpkgs", - "homepage": "https://github.com/wireapp/nixpkgs", - "owner": "wireapp", + "branch": "nixpkgs-unstable", + "description": "Nix Packages collection", + "homepage": "https://github.com/NixOS/nixpkgs", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "0f8a37f54f802a9e8bcf3bcfa89c5ab2017d9498", - "sha256": "1g28g6m3bs8axwkih8ihnv2h8g53s267l7kpaghwxzr65bz6hj7w", + "rev": "1f3ebb2bd1a353a42e8f833895c26d8415c7b791", + "sha256": "03y1a3lv44b4fdnykyms5nd24v2mqn8acz1xa4jkbmryc29rsgcw", "type": "tarball", - "url": "https://github.com/wireapp/nixpkgs/archive/0f8a37f54f802a9e8bcf3bcfa89c5ab2017d9498.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/1f3ebb2bd1a353a42e8f833895c26d8415c7b791.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/nix/wire-server.nix b/nix/wire-server.nix index c3270518e42..03005e5bc02 100644 --- a/nix/wire-server.nix +++ b/nix/wire-server.nix @@ -123,7 +123,6 @@ let lib = pkgs.lib; ]; manualOverrides = import ./manual-overrides.nix (with pkgs; { inherit hlib libsodium protobuf mls-test-cli; - openssl = openssl_1_1; }); executables = hself: hsuper: