mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p): bump NixOS channels to 2021-03-25

Browse source 
OpenSSL released an update which fixes two severity high security
issues:

* https://mta.openssl.org/pipermail/openssl-announce/2021-March/000197.html
* https://mta.openssl.org/pipermail/openssl-announce/2021-March/000198.html

Update to the nixpkgs (currently still master) commits updating OpenSSL.

Other changes:

* Use GHC 8.8.4 for haskell-language-server as GHC 8.8.3 got removed
  from nixpkgs last friday.

Change-Id: Ic1b2f49284e78193a4330da4bb4b718a797f5ab1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2653
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: lukegb <lukegb@tvl.fyi>
Reviewed-by: glittershark <grfn@gws.fyi>
This commit is contained in:
sterni 2021-03-24 18:34:40 +01:00
parent d34c527372
commit 3a49e4f4bf
5 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
third_party/default.nix vendored
View file

@ -5,11 +5,11 @@
{ ... }: { ... }:
let let
# Tracking nixos-unstable as of 2021-03-18. # Tracking nixos-unstable as of 2021-03-25.
nixpkgsCommit = "1f77a4c8c74bbe896053994836790aa9bf6dc5ba"; nixpkgsCommit = "60dd94fb7e01a8288f6638eee71d7cb354c49327";
nixpkgsSrc = fetchTarball { nixpkgsSrc = fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/${nixpkgsCommit}.tar.gz"; url = "https://github.com/NixOS/nixpkgs/archive/${nixpkgsCommit}.tar.gz";
sha256 = "1j62nmzz3w33dplzf1xz1pg1pfkxii7lwdqmsxmc71cs9cm3s7n1"; sha256 = "0skdwk9bdld295kzrymirs8xrzycqmhsclaz8s18jhcz75hb8sk3";
}; };
nixpkgs = import nixpkgsSrc { nixpkgs = import nixpkgsSrc {
config.allowUnfree = true; config.allowUnfree = true;
@ -21,11 +21,11 @@ let
]; ];
}; };
# Tracking nixos-20.09 as of 2021-03-15. # Tracking nixos-20.09 as of 2021-03-25.
stableCommit = "12d9950bf47e0ac20d4d04e189448ee075242117"; stableCommit = "223d0d733a66b46504ea6b4c15f88b7cc4db58fb";
stableNixpkgsSrc = fetchTarball { stableNixpkgsSrc = fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/${stableCommit}.tar.gz"; url = "https://github.com/NixOS/nixpkgs/archive/${stableCommit}.tar.gz";
sha256 = "09wy33zbzxj33296ddrrb79630kxpj1c3kiv38zs4wrw24206c2v"; sha256 = "073327ris0frqa3kpid3nsjr9w8yx2z83xpsc24w898mrs9r7d5v";
}; };
stableNixpkgs = import stableNixpkgsSrc {}; stableNixpkgs = import stableNixpkgsSrc {};

5
third_party/haskell-language-server/default.nix vendored
View file

@ -1,6 +1,9 @@
{ pkgs, ... }: { pkgs, ... }:
# TODO(sterni): replace this with upstream haskell-language-server or
# switch to easy-hls-nix as glittershark planned
rec { rec {
hls-nix = { ghc }: import ./hls.nix { inherit pkgs ghc; }; hls-nix = { ghc }: import ./hls.nix { inherit pkgs ghc; };
ghc883 = hls-nix { ghc = "ghc883"; }; ghc884 = hls-nix { ghc = "ghc884"; };
} }

2
third_party/haskell-language-server/hls.nix vendored
View file

@ -1,5 +1,5 @@
# Pulled from https://github.com/korayal/hls-nix/blob/master/default.nix but # Pulled from https://github.com/korayal/hls-nix/blob/master/default.nix but
# with the hashes updated for our nixpkgs pin and ghc 8.8.3 # with the hashes updated for our nixpkgs pin and ghc 8.8.4
{ pkgs, ghc }: { pkgs, ghc }:
let let
hlib = pkgs.haskell.lib; hlib = pkgs.haskell.lib;

2
users/glittershark/owothia/shell.nix
View file

@ -9,6 +9,6 @@ args@{ pkgs ? (import ../../../. {}).third_party, ... }:
buildInputs = with pkgs.haskellPackages; [ buildInputs = with pkgs.haskellPackages; [
cabal-install cabal-install
hlint hlint
pkgs.haskell-language-server.ghc883 pkgs.haskell-language-server.ghc884
]; ];
} }

2
users/glittershark/xanthous/shell.nix
View file

@ -11,6 +11,6 @@
ghc-prof-flamegraph ghc-prof-flamegraph
hp2pretty hp2pretty
hlint hlint
pkgs.haskell-language-server.ghc883 pkgs.haskell-language-server.ghc884
]; ];
} }