revert(glittershark): "Temporarily skip grfn's subtree"

This reverts commit 475d41f698. I'd like
my derivations back, please.

Changes necessary to get this working:

- Don't depend on `nixpkgs` being in the NIX_PATH for my website - it's
  not necessary anyway since emacs 27 is mainline now
- .skip-subtrees on things that shouldn't be evaluated anyway
- Get rid of system/pkgs, and move the one thing in there that *wasn't*
  already in third_party (alsi) to third_party
- Drop notifymuch for now - it's not working, and I'll probably get it
  landed in nixpkgs before I manage to get it working
- Add __readTree = true to my systems so they get built.
- explicitly disable ci for xanthous, which is failing to build and had
  been omitted previously

Change-Id: I20f5e81d6eb7ffe040091a08d75d0cb15304f707
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1864
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Griffin Smith 2020-08-28 10:25:10 -04:00 committed by glittershark
parent fb0528c5da
commit a7cd92770d
16 changed files with 37 additions and 154 deletions

3
third_party/alsi/OWNERS vendored Normal file
View file

@ -0,0 +1,3 @@
inherit: true
owners:
- glittershark

View file

@ -1,4 +1,7 @@
{ perl, stdenv, fetchFromGitHub }:
{ pkgs, ... }:
with pkgs;
stdenv.mkDerivation {
name = "alsi";
pname = "alsi";

View file

@ -1,6 +0,0 @@
There are a few things in this folder that fail to evaluate under
readTree.
Some of these are nested deeper than things that evaluate fine, which
leads to a problem where the CI build scanner fails to step into
sub-attributes.

View file

@ -1,22 +1,15 @@
{ pkgs ? import <nixpkgs> {}, ... }:
{ pkgs, ... }:
with pkgs;
with lib;
let
emacs-nixpkgs =
(import <nixpkgs> {
overlays = [(import (builtins.fetchTarball {
url = "https://github.com/nix-community/emacs-overlay/archive/54afb061bdd12c61bbfcc13bad98b7a3aab7d8d3.tar.gz";
sha256 = "0hrbg65d5h0cb0nky7a46md7vlvhajq1hf0328l2f7ln9hznqz6j";
}))];
});
emacsWithPackages = (pkgs.emacsPackagesGen pkgs.emacs27).emacsWithPackages;
emacs = (emacs-nixpkgs.emacsPackagesFor emacs-nixpkgs.emacsUnstable)
.emacsWithPackages (p: with p; [
org
]);
emacs = emacsWithPackages (p: with p; [
org
]);
in

View file

@ -10,7 +10,7 @@ rec {
sha256 = "10svwspmsf46rijzsh0h9nmz1mq2998wcml8yp36mwksgi8695pc";
});
home = confPath: import "${home-manager}/modules" {
home = confPath: (import "${home-manager}/modules" {
pkgs = nixpkgs;
configuration = { config, lib, ... }: {
imports = [confPath];
@ -20,7 +20,7 @@ rec {
lib.depot = depot;
};
};
}) // { __readTree = true; };
chupacabra = home ./machines/chupacabra.nix;
}

View file

@ -1,8 +1,6 @@
{ config, lib, pkgs, ... }:
let alsi = pkgs.callPackage ../../pkgs/alsi {};
in
{
home.packages = [ alsi ];
home.packages = [ config.lib.depot.third_party.alsi ];
xdg.configFile."alsi/alsi.logo" = {
source = ./nixos-logo.txt;

View file

@ -36,26 +36,26 @@ in {
msmtp
];
nixpkgs.overlays = [(self: super: {
notifymuch = self.python3Packages.callPackage ../../pkgs/notifymuch.nix {};
})];
# nixpkgs.overlays = [(self: super: {
# notifymuch = self.python3Packages.callPackage ../../pkgs/notifymuch.nix {};
# })];
systemd.user.services = mapAttrs' (name: account: {
name = escapeUnitName "lieer-${name}";
value.Service.ExecStart = mkForce "${pkgs.writeShellScript "sync-${name}" ''
${pkgs.gmailieer}/bin/gmi sync
${pkgs.notifymuch}/bin/notifymuch
''}";
# ${pkgs.notifymuch}/bin/notifymuch
}) accounts;
xdg.configFile."notifymuch/notifymuch.cfg".text = generators.toINI {} {
notifymuch = {
query = "is:unread and is:important";
mail_client = "";
recency_interval_hours = "48";
hidden_tags = "inbox unread attachment replied sent encrypted signed";
};
};
# xdg.configFile."notifymuch/notifymuch.cfg".text = generators.toINI {} {
# notifymuch = {
# query = "is:unread and is:important";
# mail_client = "";
# recency_interval_hours = "48";
# hidden_tags = "inbox unread attachment replied sent encrypted signed";
# };
# };
accounts.email.maildirBasePath = "mail";
accounts.email.accounts = mapAttrs (_: params@{ passEntry, ... }: {

View file

@ -1 +0,0 @@
(import <nixpkgs-unstable> {}).argocd

View file

@ -1,15 +0,0 @@
with import <nixpkgs> {};
runCommand "clang-tools" {} ''
mkdir -p $out/bin
for file in ${clang-tools}/bin/*; do
if [ $(basename "$file") != "clangd" ]; then
ln -s "$file" $out/bin
fi
done
sed \
-e "18iexport CPLUS_INCLUDE_PATH=${llvmPackages.libcxx}/include/c++/v1\\''${CPATH:+':'}\\''${CPATH}" \
-e '/CPLUS_INCLUDE_PATH/d' \
< ${clang-tools}/bin/clangd \
> $out/bin/clangd
''

View file

@ -1,24 +0,0 @@
{ pkgs }:
with pkgs;
runCommand "clang-tools" {} ''
mkdir -p $out/bin
export libc_includes="${stdenv.lib.getDev stdenv.cc.libc}/include"
export libcpp_includes="${llvmPackages.libcxx}/include/c++/v1"
export clang=${llvmPackages.clang-unwrapped}
echo $clang
substituteAll ${./wrapper} $out/bin/clangd
chmod +x $out/bin/clangd
for tool in \
clang-apply-replacements \
clang-check \
clang-format \
clang-rename \
clang-tidy
do
ln -s $out/bin/clangd $out/bin/$tool
done
''

View file

@ -1,20 +0,0 @@
#!/bin/sh
buildcpath() {
local path
while (( $# )); do
case $1 in
-isystem)
shift
path=$path${path:+':'}$1
esac
shift
done
echo $path
}
export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE})
export CPATH=${CPATH}${CPATH:+':'}@libc_includes@
export CPLUS_INCLUDE_PATH=@libcpp_includes@${CPATH:+':'}${CPATH}
exec -a "$0" @clang@/bin/$(basename $0) "$@"

View file

@ -1,55 +0,0 @@
{ stdenv
, buildPythonApplication
, isPy3k
, fetchFromGitHub
, notmuch
, pygobject3
, gobject-introspection
, libnotify
, wrapGAppsHook
, gtk3
}:
buildPythonApplication rec {
pname = "notifymuch";
version = "0.1";
disabled = ! isPy3k;
src = fetchFromGitHub {
owner = "kspi";
repo = "notifymuch";
rev = "9d4aaf54599282ce80643b38195ff501120807f0";
sha256 = "1lssr7iv43mp5v6nzrfbqlfzx8jcc7m636wlfyhhnd8ydd39n6k4";
};
propagatedBuildInputs = [
notmuch
pygobject3
libnotify
gtk3
];
nativeBuildInputs = [
gobject-introspection
wrapGAppsHook
];
dontWrapGApps = true;
preFixup = ''
echo "wrapper args"
echo "''${makeWrapperArgs[@]}"
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
echo "wrapper args again"
echo "''${makeWrapperArgs[@]}"
'';
strictDeps = false;
meta = with stdenv.lib; {
description = "Display desktop notifications for unread mail in a notmuch database";
homepage = "https://github.com/kspi/notifymuch";
maintainers = with maintainers; [ glittershark ];
license = licenses.gpl3;
};
}

View file

@ -1,8 +1,12 @@
{ depot, ... }:
{ depot, pkgs, ... }:
rec {
chupacabra = import ./machines/chupacabra.nix;
chupacabraSystem = (pkgs.nixos {
configuration = chupacabra;
}).system // { __readTree = true; };
rebuilder =
let
depotPath = "/home/grfn/code/depot";

View file

@ -2,6 +2,9 @@
, lib ? pkgs.lib
, ...
}:
pkgs.haskell.lib.failOnAllWarnings (
(pkgs.haskell.lib.failOnAllWarnings (
pkgs.haskellPackages.callPackage (import ./pkg.nix { inherit pkgs; }) {}
)
)) // {
# TODO(grfn): Get this passing (see https://buildkite.com/tvl/depot/builds/3055)
meta.ci = false;
}