From a7cd92770d3d2f35ae04713fb5e245536a1a95e9 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Fri, 28 Aug 2020 10:25:10 -0400 Subject: revert(glittershark): "Temporarily skip grfn's subtree" This reverts commit 475d41f698415919093ca98f676ffcda218093ac. 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 --- users/glittershark/.skip-subtree | 6 --- users/glittershark/gws.fyi/orgExportHTML.nix | 19 +++----- users/glittershark/system/home/.skip-subtree | 0 users/glittershark/system/home/default.nix | 4 +- users/glittershark/system/home/modules/alsi.nix | 4 +- users/glittershark/system/home/modules/email.nix | 24 +++++----- users/glittershark/system/pkgs/alsi/default.nix | 22 --------- users/glittershark/system/pkgs/argocd.nix | 1 - users/glittershark/system/pkgs/clang-tools.nix | 15 ------ .../system/pkgs/clang-tools/default.nix | 24 ---------- users/glittershark/system/pkgs/clang-tools/wrapper | 20 -------- users/glittershark/system/pkgs/notifymuch.nix | 55 ---------------------- users/glittershark/system/system/.skip-subtree | 0 users/glittershark/system/system/default.nix | 6 ++- users/glittershark/xanthous/default.nix | 7 ++- 15 files changed, 31 insertions(+), 176 deletions(-) delete mode 100644 users/glittershark/.skip-subtree create mode 100644 users/glittershark/system/home/.skip-subtree delete mode 100644 users/glittershark/system/pkgs/alsi/default.nix delete mode 100644 users/glittershark/system/pkgs/argocd.nix delete mode 100644 users/glittershark/system/pkgs/clang-tools.nix delete mode 100644 users/glittershark/system/pkgs/clang-tools/default.nix delete mode 100644 users/glittershark/system/pkgs/clang-tools/wrapper delete mode 100644 users/glittershark/system/pkgs/notifymuch.nix create mode 100644 users/glittershark/system/system/.skip-subtree (limited to 'users/glittershark') diff --git a/users/glittershark/.skip-subtree b/users/glittershark/.skip-subtree deleted file mode 100644 index 8df5bc3f78..0000000000 --- a/users/glittershark/.skip-subtree +++ /dev/null @@ -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. diff --git a/users/glittershark/gws.fyi/orgExportHTML.nix b/users/glittershark/gws.fyi/orgExportHTML.nix index 153036789f..ad5a247958 100644 --- a/users/glittershark/gws.fyi/orgExportHTML.nix +++ b/users/glittershark/gws.fyi/orgExportHTML.nix @@ -1,22 +1,15 @@ -{ pkgs ? import {}, ... }: +{ pkgs, ... }: with pkgs; with lib; let - emacs-nixpkgs = - (import { - overlays = [(import (builtins.fetchTarball { - url = "https://github.com/nix-community/emacs-overlay/archive/54afb061bdd12c61bbfcc13bad98b7a3aab7d8d3.tar.gz"; - sha256 = "0hrbg65d5h0cb0nky7a46md7vlvhajq1hf0328l2f7ln9hznqz6j"; - }))]; - }); - - emacs = (emacs-nixpkgs.emacsPackagesFor emacs-nixpkgs.emacsUnstable) - .emacsWithPackages (p: with p; [ - org - ]); + emacsWithPackages = (pkgs.emacsPackagesGen pkgs.emacs27).emacsWithPackages; + + emacs = emacsWithPackages (p: with p; [ + org + ]); in diff --git a/users/glittershark/system/home/.skip-subtree b/users/glittershark/system/home/.skip-subtree new file mode 100644 index 0000000000..e69de29bb2 diff --git a/users/glittershark/system/home/default.nix b/users/glittershark/system/home/default.nix index 949def1542..d896ba340d 100644 --- a/users/glittershark/system/home/default.nix +++ b/users/glittershark/system/home/default.nix @@ -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; } diff --git a/users/glittershark/system/home/modules/alsi.nix b/users/glittershark/system/home/modules/alsi.nix index 19ec68efd2..cf8b0bebe7 100644 --- a/users/glittershark/system/home/modules/alsi.nix +++ b/users/glittershark/system/home/modules/alsi.nix @@ -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; diff --git a/users/glittershark/system/home/modules/email.nix b/users/glittershark/system/home/modules/email.nix index 62c8be19a2..48d6b5f3cc 100644 --- a/users/glittershark/system/home/modules/email.nix +++ b/users/glittershark/system/home/modules/email.nix @@ -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, ... }: { diff --git a/users/glittershark/system/pkgs/alsi/default.nix b/users/glittershark/system/pkgs/alsi/default.nix deleted file mode 100644 index d4da8ff38e..0000000000 --- a/users/glittershark/system/pkgs/alsi/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ perl, stdenv, fetchFromGitHub }: -stdenv.mkDerivation { - name = "alsi"; - pname = "alsi"; - version = "0.4.8"; - - src = fetchFromGitHub { - owner = "trizen"; - repo = "alsi"; - rev = "fe2a925caad38d4cc7afe10d74ba60c5db09ee66"; - sha256 = "060xlalfclrda5f1h3svj4v2gr19mdrsc62vrg7hgii0f3lib7j5"; - }; - - buildInputs = [ - (perl.withPackages (ps: with ps; [ DataDump ])) - ]; - - installPhase = '' - mkdir -p $out/bin - cp alsi $out/bin/alsi - ''; -} diff --git a/users/glittershark/system/pkgs/argocd.nix b/users/glittershark/system/pkgs/argocd.nix deleted file mode 100644 index 5ab0e95d44..0000000000 --- a/users/glittershark/system/pkgs/argocd.nix +++ /dev/null @@ -1 +0,0 @@ -(import {}).argocd diff --git a/users/glittershark/system/pkgs/clang-tools.nix b/users/glittershark/system/pkgs/clang-tools.nix deleted file mode 100644 index d13fbd4457..0000000000 --- a/users/glittershark/system/pkgs/clang-tools.nix +++ /dev/null @@ -1,15 +0,0 @@ -with import {}; -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 -'' diff --git a/users/glittershark/system/pkgs/clang-tools/default.nix b/users/glittershark/system/pkgs/clang-tools/default.nix deleted file mode 100644 index 7c1009665e..0000000000 --- a/users/glittershark/system/pkgs/clang-tools/default.nix +++ /dev/null @@ -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 -'' diff --git a/users/glittershark/system/pkgs/clang-tools/wrapper b/users/glittershark/system/pkgs/clang-tools/wrapper deleted file mode 100644 index 949a4243e0..0000000000 --- a/users/glittershark/system/pkgs/clang-tools/wrapper +++ /dev/null @@ -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) "$@" diff --git a/users/glittershark/system/pkgs/notifymuch.nix b/users/glittershark/system/pkgs/notifymuch.nix deleted file mode 100644 index 065bcddd07..0000000000 --- a/users/glittershark/system/pkgs/notifymuch.nix +++ /dev/null @@ -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; - }; -} diff --git a/users/glittershark/system/system/.skip-subtree b/users/glittershark/system/system/.skip-subtree new file mode 100644 index 0000000000..e69de29bb2 diff --git a/users/glittershark/system/system/default.nix b/users/glittershark/system/system/default.nix index 7c241de86b..f6710eff7b 100644 --- a/users/glittershark/system/system/default.nix +++ b/users/glittershark/system/system/default.nix @@ -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"; diff --git a/users/glittershark/xanthous/default.nix b/users/glittershark/xanthous/default.nix index 0b89a50afb..8dfd0bce4b 100644 --- a/users/glittershark/xanthous/default.nix +++ b/users/glittershark/xanthous/default.nix @@ -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; +} -- cgit 1.4.1