e628862e97
Main motivation for this is to get the openldap update that fixes 10 CVEs: CVE-2020-36221 to including CVE-2020-36230. See also this issue which lists them all: https://github.com/NixOS/nixpkgs/issues/113490 Someone should also redeploy whitby as soon as this lands in canon and all build failures have been fixed. Things done to resolve upstream breakages: * grpc no longer takes abseil-cpp as an input, it has also been removed in the override. * Upgrade glittershark's kernel to 5.11 since the linuxPackages_5_9 attribute has been removed by upstream and the patch used by them is available for 5.11 as well. * The fixed output hash for third_patry.apereo-cas changed for some reason. * Remove the pin of haskellPackages.vector from the haskell overlay. It broke as the most recent version of vector in nixos-unstable no longer depends on semigroups. This effectively updates vector from 0.12.1.2 to 0.12.2.0. * Align two comments in tvix/libstore/worker-protocol.hh because the updated clang-format now demands that. Change-Id: I2ecf10a98de935e9222acf1feaea447d4c11ed2d Reviewed-on: https://cl.tvl.fyi/c/depot/+/2538 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org>
189 lines
3.1 KiB
Nix
189 lines
3.1 KiB
Nix
# This file has to be in yet another subdir
|
|
# because of how readTree interprets .skip-subtree
|
|
# see https://b.tvl.fyi/issues/89
|
|
{ nixpkgs, stableNixpkgs }:
|
|
{
|
|
# Inherit the packages from nixos-unstable that should be available inside
|
|
# of the repo. They become available under `pkgs.third_party.<name>`
|
|
inherit (nixpkgs)
|
|
age
|
|
autoconf
|
|
autoreconfHook
|
|
avrdude
|
|
avrlibc
|
|
bashInteractive
|
|
bat
|
|
bc
|
|
buildBazelPackage
|
|
buildFHSUserEnv
|
|
buildGoModule
|
|
buildGoPackage
|
|
buildPackages
|
|
buildRustCrate
|
|
buildkite-agent
|
|
busybox
|
|
bzip2
|
|
c-ares
|
|
cacert
|
|
cachix
|
|
cairo
|
|
cargo
|
|
cgit
|
|
clang_11
|
|
cmake
|
|
coreutils
|
|
cudatoolkit
|
|
darwin
|
|
dfu-programmer
|
|
dfu-util
|
|
diffutils
|
|
docker-compose
|
|
dockerTools
|
|
emacs26
|
|
emacs26-nox
|
|
emacsPackages
|
|
emacsPackagesGen
|
|
execline
|
|
fd
|
|
fdtools
|
|
fetchFromGitHub
|
|
fetchgit
|
|
fetchurl
|
|
fetchzip
|
|
findutils
|
|
fira
|
|
fira-code
|
|
fira-mono
|
|
flamegraph
|
|
fontconfig
|
|
freetype
|
|
gettext
|
|
glibc
|
|
gmock
|
|
gnused
|
|
gnutar
|
|
go
|
|
google-cloud-sdk
|
|
graphviz
|
|
gzip
|
|
haskell
|
|
iana-etc
|
|
imagemagickBig
|
|
installShellFiles
|
|
jdk
|
|
jdk11
|
|
jdk11_headless
|
|
jetbrains-mono
|
|
jq
|
|
kontemplate
|
|
lib
|
|
libredirect
|
|
linuxPackages
|
|
linuxPackages_5_11
|
|
luajit
|
|
lutris
|
|
makeFontsConf
|
|
makeWrapper
|
|
mdbook
|
|
meson
|
|
mime-types
|
|
mkShell
|
|
moreutils
|
|
nano
|
|
ncurses
|
|
nginx
|
|
ninja
|
|
nix
|
|
ocamlPackages
|
|
openssh
|
|
openssl
|
|
overrideCC
|
|
pandoc
|
|
parallel
|
|
pkgconfig
|
|
pkgsCross
|
|
postgresql
|
|
pounce
|
|
pulseaudio
|
|
python3
|
|
python3Packages
|
|
quassel
|
|
remarshal
|
|
rink
|
|
ripgrep
|
|
rsync
|
|
runCommand
|
|
runCommandLocal
|
|
runCommandNoCC
|
|
rustPlatform
|
|
rustc
|
|
s6-portable-utils
|
|
sbcl
|
|
shellcheck
|
|
sqlite
|
|
stdenvNoCC
|
|
stern
|
|
symlinkJoin
|
|
systemd
|
|
tdlib
|
|
teensy-loader-cli
|
|
terraform_0_12
|
|
texlive
|
|
thttpd
|
|
tree
|
|
tree-sitter
|
|
which
|
|
writers
|
|
writeShellScript
|
|
writeShellScriptBin
|
|
writeText
|
|
xorg
|
|
xz
|
|
zlib
|
|
zstd;
|
|
|
|
# Inherit packages from the stable channel for things that are
|
|
# broken on unstable
|
|
inherit (stableNixpkgs)
|
|
awscli # TODO(grfn): Move back to unstable once it is fixed
|
|
;
|
|
|
|
# Required by //third_party/nix
|
|
inherit (nixpkgs)
|
|
aws-sdk-cpp
|
|
bison
|
|
boehmgc
|
|
boost # urgh
|
|
brotli
|
|
busybox-sandbox-shell
|
|
curl
|
|
docbook5
|
|
docbook_xsl_ns
|
|
editline
|
|
flex
|
|
libseccomp
|
|
libsodium
|
|
libxml2
|
|
libxslt
|
|
mercurial
|
|
perl
|
|
perlPackages
|
|
;
|
|
|
|
haskellPackages = (nixpkgs.haskellPackages.override {
|
|
overrides = (import ../haskell_overlay { pkgs = nixpkgs; });
|
|
});
|
|
|
|
gradle_6 = (nixpkgs.gradleGen.override {
|
|
java = nixpkgs.jdk11;
|
|
jdk = nixpkgs.jdk11;
|
|
}).gradleGen rec {
|
|
name = "gradle-6.5.1";
|
|
nativeVersion = "0.22-milestone-3";
|
|
|
|
src = builtins.fetchurl {
|
|
url = "https://services.gradle.org/distributions/${name}-bin.zip";
|
|
sha256 = "0jmmipjh4fbsn92zpifa5cqg5ws2a4ha0s4jzqhrg4zs542x79sh";
|
|
};
|
|
};
|
|
}
|