chore(3p): Bump channels to 2021-04-09

Fixes included:

* exposed gtest in the package set, required for protobuf
* pinned SBCL to version 2.0.8: The channel moved it to >2.1, and a
  bunch of warnings seemed to be killing our builds - we should
  investigate this later.
* removed kernel patches from //users/tazjin/frog: this machine is
  currently out of service anyways, not worth fixing while it's offline
* removed steam & lutris from frog (they're currently broken)
* removed Haskell overrides for hedgehog-classes & hgeometry-combinatorial
* use gRPC sources from upstream and inject Abseil via Nix instead
* fix for renamed grpc import in //third_party/nix
* use libfprint-tod from upstream nixpkgs in glittershark/yeren and
  delete glittershark/pkgs/fprintd entirely, since all of the patches used
  there are available and working from upstream now (and stopped working
  here after the bump)

Change-Id: Ia90e6f774f7b88bc9e60d28351b900ca43ee2695
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2901
Reviewed-by: glittershark <grfn@gws.fyi>
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: lukegb <lukegb@tvl.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2021-04-07 14:34:13 +02:00 committed by tazjin
parent 9073ac18c4
commit 7deabb8c8d
11 changed files with 25 additions and 389 deletions

View file

@ -3,17 +3,8 @@
(pkgs.grpc.override { (pkgs.grpc.override {
protobuf = depot.third_party.protobuf; protobuf = depot.third_party.protobuf;
stdenv = pkgs.llvmPackages.libcxxStdenv; stdenv = pkgs.llvmPackages.libcxxStdenv;
abseil-cpp = depot.third_party.abseil_cpp;
}).overrideAttrs(orig: rec { }).overrideAttrs(orig: rec {
version = "1.30.0";
src = pkgs.fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
sha256 = "01w5jdp318i7ncxbkfv75q0mf0rd3qwfr1ycdd3850nv6mprv7n0";
fetchSubmodules = true;
};
cmakeFlags = orig.cmakeFlags ++ [ cmakeFlags = orig.cmakeFlags ++ [
"-DCMAKE_CXX_STANDARD=17" "-DCMAKE_CXX_STANDARD=17"
"-DCMAKE_CXX_STANDARD_REQUIRED=ON" "-DCMAKE_CXX_STANDARD_REQUIRED=ON"

View file

@ -27,7 +27,7 @@ ABSL_FLAG(bool, pipe, false, "Use pipes for daemon communication");
namespace nix::daemon { namespace nix::daemon {
using grpc::Server; using grpc::Server;
using grpc_impl::ServerBuilder; using grpc::ServerBuilder;
namespace { namespace {

View file

@ -13,16 +13,16 @@ let
# nixos-unstable, and the current stable channel of the latest NixOS # nixos-unstable, and the current stable channel of the latest NixOS
# release. # release.
# Tracking nixos-unstable as of 2021-03-25. # Tracking nixos-unstable as of 2021-04-09.
unstableHashes = { unstableHashes = {
commit = "60dd94fb7e01a8288f6638eee71d7cb354c49327"; commit = "9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2";
sha256 = "0skdwk9bdld295kzrymirs8xrzycqmhsclaz8s18jhcz75hb8sk3"; sha256 = "1r3ll77hyqn28d9i4cf3vqd9v48fmaa1j8ps8c4fm4f8gqf4kpl1";
}; };
# Tracking nixos-20.09 as of 2021-03-25. # Tracking nixos-20.09 as of 2021-04-09.
stableHashes = { stableHashes = {
commit = "223d0d733a66b46504ea6b4c15f88b7cc4db58fb"; commit = "d6f63659a7021051a46035373ed50fbea7e4e924";
sha256 = "073327ris0frqa3kpid3nsjr9w8yx2z83xpsc24w898mrs9r7d5v"; sha256 = "0vblhzg57sfzqpdm24lgs08vjv2204lzcp6hv4cbjd20rz0mxs4y";
}; };
# import the nixos-unstable package set, or optionally use the # import the nixos-unstable package set, or optionally use the

View file

@ -20,18 +20,6 @@ let
hashable = doJailbreak hsSuper.hashable; hashable = doJailbreak hsSuper.hashable;
test-framework-quickcheck2 = doJailbreak hsSuper.test-framework-quickcheck2; test-framework-quickcheck2 = doJailbreak hsSuper.test-framework-quickcheck2;
pandoc = doJailbreak hsSuper.pandoc; pandoc = doJailbreak hsSuper.pandoc;
# can be removed if we have the following PR or equivalent
# https://github.com/NixOS/nixpkgs/pull/116931
hedgehog-classes = overrideCabal hsSuper.hedgehog-classes (attrs: {
# remove version bound on semirings which is inside a
# conditional, so doJailbreak doesn't work
prePatch = ''
sed -i 's|semirings.*0.6|semirings|g' hedgehog-classes.cabal
'';
});
hgeometry-combinatorial = dontCheck hsSuper.hgeometry-combinatorial;
}; };
in { in {
haskellPackages = super.haskellPackages.override { haskellPackages = super.haskellPackages.override {

View file

@ -24,4 +24,8 @@ self: super: {
clang-tools = (super.clang-tools.override { clang-tools = (super.clang-tools.override {
llvmPackages = self.llvmPackages_11; llvmPackages = self.llvmPackages_11;
}); });
# Pick an older version of SBCL as the default, to avoid issues with
# warnings in newer SBCL.
sbcl = super.sbcl_2_0_8;
} }

View file

@ -1,130 +0,0 @@
{ depot, pkgs, ... }:
let
nixpkgs = import pkgs.path {
config.allowUnfree = true;
overlays = [(self: super: {
# TODO(grfn): Can we not override this here? It bootstraps
# rustc, builds firefox, and many other things.
gcc = super.gcc9;
})];
};
inherit (nixpkgs)
stdenv
fetchFromGitLab
fetchpatch
pkgconfig
meson
ninja
perl
gettext
cairo
gtk-doc
libxslt
docbook-xsl-nons
docbook_xml_dtd_412
glib
dbus
dbus-glib
polkit
nss
pam
systemd
python3;
libfprint-tod = nixpkgs.callPackage ./libfprint-tod.nix {};
in
stdenv.mkDerivation rec {
pname = "fprintd";
version = "1.90.1";
outputs = [ "out" "devdoc" ];
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "libfprint";
repo = pname;
rev = version;
sha256 = "0mbzk263x7f58i9cxhs44mrngs7zw5wkm62j5r6xlcidhmfn03cg";
};
patches = [
# Fixes issue with ":" when there is multiple paths (might be the case on NixOS)
# https://gitlab.freedesktop.org/libfprint/fprintd/-/merge_requests/50
(fetchpatch {
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/d7fec03f24d10f88d34581c72f0eef201f5eafac.patch";
sha256 = "0f88dhizai8jz7hpm5lpki1fx4593zcy89iwi4brsqbqc7jp9ls0";
})
# Fix locating libpam_wrapper for tests
(fetchpatch {
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/merge_requests/40.patch";
sha256 = "0qqy090p93lzabavwjxzxaqidkcb3ifacl0d3yh1q7ms2a58yyz3";
})
(fetchpatch {
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f401f399a85dbeb2de165b9b9162eb552ab6eea7.patch";
sha256 = "1bc9g6kc95imlcdpvp8qgqjsnsxg6nipr6817c1pz5i407yvw1iy";
})
];
nativeBuildInputs = [
pkgconfig
meson
ninja
perl
gettext
gtk-doc
libxslt
dbus
docbook-xsl-nons
docbook_xml_dtd_412
];
buildInputs = [
glib
dbus-glib
polkit
nss
pam
systemd
libfprint-tod
];
checkInputs = with python3.pkgs; [
python-dbusmock
dbus-python
pygobject3
pycairo
pypamtest
];
mesonFlags = [
"-Dgtk_doc=true"
"-Dpam_modules_dir=${placeholder "out"}/lib/security"
"-Dsysconfdir=${placeholder "out"}/etc"
"-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/system-services"
"-Dsystemd_system_unit_dir=${placeholder "out"}/lib/systemd/system"
];
PKG_CONFIG_DBUS_1_INTERFACES_DIR = "${placeholder "out"}/share/dbus-1/interfaces";
PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
PKG_CONFIG_DBUS_1_DATADIR = "${placeholder "out"}/share";
# FIXME: Ugly hack for tests to find libpam_wrapper.so
LIBRARY_PATH = stdenv.lib.makeLibraryPath [ python3.pkgs.pypamtest ];
doCheck = true;
postPatch = ''
patchShebangs po/check-translations.sh
'';
meta = with stdenv.lib; {
homepage = "https://fprint.freedesktop.org/";
description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar elyhaka ];
};
}

View file

@ -1,81 +0,0 @@
{ stdenv
, pkgs
, fetchFromGitLab
, fetchurl
, pkgconfig
, meson
, ninja
, libusb
, gusb
, pixman
, gobject-introspection
, glib
, nss
, gtk3
, python3
, umockdev
, coreutils
, gtk-doc
, docbook_xsl
, docbook_xml_dtd_43
}:
stdenv.mkDerivation rec {
pname = "libfprint-tod-clean";
version = "1.90.2";
outputs = [ "out" "devdoc" ];
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "3v1n0";
repo = "libfprint";
rev = "0e123d0752538d834ee2cca8b471373369ad5e89";
sha256 = "11yl3nikdyykamafqf3ys1wg7zx3rb81lf11ndd8sf9rkwwfgpn6";
};
checkInputs = [ (python3.withPackages (ps: with ps; [ pycairo gobject ])) umockdev ];
nativeBuildInputs = [
pkgconfig
meson
gobject-introspection
ninja
gtk-doc
docbook_xsl
docbook_xml_dtd_43
];
buildInputs = [
libusb
gusb
pixman
glib
nss
gtk3
];
mesonFlags = [
"-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"
"-Dx11-examples=false"
];
doChecks = true;
checkPhase = ''
meson test -C build --print-errorlogs
'';
postPatch = ''
substituteInPlace libfprint/meson.build \
--replace /bin/echo ${coreutils}/bin/echo
'';
meta = with stdenv.lib; {
homepage = https://fprint.freedesktop.org/;
description = "A library designed to make it easy to add support for consumer fingerprint readers";
license = licenses.lgpl21;
platforms = platforms.linux;
maintainers = with maintainers; [ jobojeha ];
};
}

View file

@ -1,47 +0,0 @@
{ stdenv
, pkgs
, fetchgit
, libfprint-tod ? (pkgs.callPackage ./libfprint-tod-clean.nix {})
, git
, autoPatchelfHook
, libusb
, glibc
,
}:
stdenv.mkDerivation rec {
pname = "libfprint-2-tod1-xps9300-bin";
version = "0.0.6";
src = fetchgit {
url = "git://git.launchpad.net/~oem-solutions-engineers/libfprint-2-tod1-goodix/+git/libfprint-2-tod1-goodix/";
rev = "882735c6366fbe30149eea5cfd6d0ddff880f0e4";
sha256 = "1x9h5x027s2avdhjhnfmmhdpgyf9x79fz8skcjd3rm3phnpr3zsj";
};
buildInputs = [
libfprint-tod
git
libusb
autoPatchelfHook
glibc
];
installPhase = ''
install -dm 755 "$out/lib/udev/rules.d/"
install -dm 755 "$out/usr/lib/libfprint-2/tod-1/"
sed -n -r '/Shenzhen/,/^\s*$/p' debian/copyright > LICENSE
install -Dm644 LICENSE "$out/usr/share/licenses/libfprint-2-tod1-xps9300-bin/LICENSE"
install -Dm 755 usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-53xc-0.0.6.so "$out/usr/lib/libfprint-2/tod-1/"
install -Dm 0755 lib/udev/rules.d/60-libfprint-2-tod1-goodix.rules "$out/lib/udev/rules.d/"
'';
meta = with stdenv.lib; {
homepage = "https://git.launchpad.net/~oem-solutions-engineers/libfprint-2-tod1-goodix/+git/libfprint-2-tod1-goodix";
description = "Goodix driver module for libfprint-2 Touch OEM Driver";
license = licenses.unfreeRedistributable;
platforms = platforms.linux;
maintainers = with maintainers; [ jobojeha ];
};
}

View file

@ -1,89 +0,0 @@
{ stdenv
, pkgs
, fetchFromGitLab
, fetchurl
, pkgconfig
, meson
, ninja
, libusb
, gusb
, pixman
, gobject-introspection
, glib
, nss
, gtk3
, python3
, umockdev
, coreutils
, gtk-doc
, docbook_xsl
, docbook_xml_dtd_43
, libfprint-tod-goodix ? (pkgs.callPackage ./libfprint-tod-goodix.nix {})
}:
stdenv.mkDerivation rec {
pname = "libfprint-tod";
version = "1.90.2";
outputs = [ "out" "devdoc" ];
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "3v1n0";
repo = "libfprint";
rev = "0e123d0752538d834ee2cca8b471373369ad5e89";
sha256 = "11yl3nikdyykamafqf3ys1wg7zx3rb81lf11ndd8sf9rkwwfgpn6";
};
checkInputs = [ (python3.withPackages (ps: with ps; [ pycairo gobject ])) umockdev ];
nativeBuildInputs = [
pkgconfig
meson
gobject-introspection
ninja
gtk-doc
docbook_xsl
docbook_xml_dtd_43
];
buildInputs = [
libusb
gusb
pixman
glib
nss
gtk3
libfprint-tod-goodix
];
mesonFlags = [
"-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"
"-Dx11-examples=false"
];
doChecks = true;
checkPhase = ''
meson test -C build --print-errorlogs
'';
postPatch = ''
substituteInPlace libfprint/meson.build \
--replace /bin/echo ${coreutils}/bin/echo
'';
postInstall = ''
mkdir -p $out/lib/libfprint-2/tod-1/
ln -s ${libfprint-tod-goodix}/usr/lib/libfprint-2/tod-1/libfprint-tod-goodix-53xc-0.0.6.so $out/lib/libfprint-2/tod-1/
ln -s ${libfprint-tod-goodix}/lib/udev/rules.d/60-libfprint-2-tod1-goodix.rules $out/lib/udev/rules.d/
'';
meta = with stdenv.lib; {
homepage = https://fprint.freedesktop.org/;
description = "A library designed to make it easy to add support for consumer fingerprint readers";
license = licenses.lgpl21;
platforms = platforms.linux;
maintainers = with maintainers; [ jobojeha ];
};
}

View file

@ -85,16 +85,14 @@
intel-media-driver intel-media-driver
]; ];
# the fprintd module hardcodes pkgs.fprintd :'(
nixpkgs.overlays = [(_: _: {
fprintd = depot.users.glittershark.pkgs.fprintd;
})];
services.fprintd = { services.fprintd = {
enable = true; enable = true;
package = depot.users.glittershark.pkgs.fprintd; package = pkgs.fprintd-tod;
}; };
systemd.services.fprintd.environment.FP_TOD_DRIVERS_DIR =
"${pkgs.libfprint-2-tod1-goodix}/usr/lib/libfprint-2/tod-1";
security.pam.loginLimits = [ security.pam.loginLimits = [
{ {
domain = "grfn"; domain = "grfn";

View file

@ -39,9 +39,11 @@ in lib.fix(self: {
"kernel.perf_event_paranoid" = -1; "kernel.perf_event_paranoid" = -1;
}; };
kernelPatches = [ # Enable this again if frog is put back into use ...
depot.third_party.kernelPatches.trx40_usb_audio #
]; # kernelPatches = [
# depot.third_party.kernelPatches.trx40_usb_audio
# ];
}; };
hardware = { hardware = {
@ -239,7 +241,6 @@ in lib.fix(self: {
emacs27 # mostly for emacsclient emacs27 # mostly for emacsclient
exa exa
fd fd
ffmpeg-full
file file
gdb gdb
gnupg gnupg
@ -254,7 +255,6 @@ in lib.fix(self: {
jq jq
kubectl kubectl
linuxPackages.perf linuxPackages.perf
# lutris
manpages manpages
miller miller
msmtp msmtp
@ -272,12 +272,10 @@ in lib.fix(self: {
pmutils pmutils
pwgen pwgen
ripgrep ripgrep
rr
rustup rustup
screen screen
scrot scrot
spotify spotify
steam
tokei tokei
transmission transmission
tree tree
@ -290,6 +288,10 @@ in lib.fix(self: {
yubico-piv-tool yubico-piv-tool
yubikey-personalization yubikey-personalization
zoxide zoxide
# Commented out because of interim breakage:
# steam
# lutris
]); ]);
# ... and other nonsense. # ... and other nonsense.