Compare commits

..

6 Commits

Author SHA1 Message Date
coolneng 35d0196e66
flake.lock: Update
Flake lock file updates:

• Updated input 'nix-index-database':
    'github:Mic92/nix-index-database/757114749d4613cf71f3748e780a1be8a67a5d3c' (2023-07-09)
  → 'github:Mic92/nix-index-database/f4d70d098f066a30c7087144063dca179495f7d6' (2023-08-13)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/6e287913f7b1ef537c97aa301b67c34ea46b640f' (2023-08-14)
  → 'github:NixOS/nixpkgs/8353344d3236d3fda429bb471c1ee008857d3b7c' (2023-08-15)
• Updated input 'openconnect-sso':
    'github:vlaci/openconnect-sso/54263c09110125e6b78f2f46ea2ab32c6fbd49f8' (2023-05-22)
  → 'github:vlaci/openconnect-sso/51e1eb727a93cf8b063157b7e9453dd21d3ba85f' (2023-07-14)
2023-08-16 01:01:18 +02:00
coolneng d470cbf4e6 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/100a1550b0e7a64b960c625b656f9229bdef5f87' (2023-08-13)
  → 'github:NixOS/nixpkgs/6e287913f7b1ef537c97aa301b67c34ea46b640f' (2023-08-14)
2023-08-15 22:31:07 +02:00
coolneng 5cd3cb7b2b
Build isync with oauth2 support natively 2023-08-15 03:45:56 +02:00
coolneng ac896b654a flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e' (2023-08-10)
  → 'github:NixOS/nixpkgs/100a1550b0e7a64b960c625b656f9229bdef5f87' (2023-08-13)
2023-08-14 22:33:32 +02:00
coolneng d254c1f2b4 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/41c7605718399dcfa53dd7083793b6ae3bc969ff' (2023-08-08)
  → 'github:NixOS/nixpkgs/ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e' (2023-08-10)
2023-08-11 20:28:08 +02:00
coolneng 6d74d2be70 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/5a8e9243812ba528000995b294292d3b5e120947' (2023-08-07)
  → 'github:NixOS/nixpkgs/41c7605718399dcfa53dd7083793b6ae3bc969ff' (2023-08-08)
2023-08-09 22:31:38 +02:00
6 changed files with 13 additions and 51 deletions

View File

@ -179,8 +179,6 @@ with pkgs;
./modules/monitoring.nix ./modules/monitoring.nix
./overlays/nix-direnv.nix ./overlays/nix-direnv.nix
./overlays/openconnect-sso.nix ./overlays/openconnect-sso.nix
./overlays/cyrus-sasl-oauth2.nix
./overlays/isync-oauth2.nix
./overlays/emacs-vterm.nix ./overlays/emacs-vterm.nix
]; ];

View File

@ -101,11 +101,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1688874465, "lastModified": 1691897365,
"narHash": "sha256-BUwl+tq40EjkufTZkqf3lWFzxOA/mYBTHz+p5uJtjaY=", "narHash": "sha256-jvWIU4ht3YAmF8TDVM2Ps2+Gf4MtNGLL1zEWQZdTrzU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "757114749d4613cf71f3748e780a1be8a67a5d3c", "rev": "f4d70d098f066a30c7087144063dca179495f7d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -116,11 +116,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1691368598, "lastModified": 1692084312,
"narHash": "sha256-ia7li22keBBbj02tEdqjVeLtc7ZlSBuhUk+7XTUFr14=", "narHash": "sha256-Za++qKVK6ovjNL9poQZtLKRM/re663pxzbJ+9M4Pgwg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5a8e9243812ba528000995b294292d3b5e120947", "rev": "8353344d3236d3fda429bb471c1ee008857d3b7c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -132,11 +132,11 @@
"openconnect-sso": { "openconnect-sso": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1684767793, "lastModified": 1689349020,
"narHash": "sha256-ZeF4n3M066SiMuoCmBTgbMVvWEWLJq4UwXjaS45eNiU=", "narHash": "sha256-2UVtOb0gD6wqEY/BeLZ2BCrR/qyb6M0mgf8CRNxflPA=",
"owner": "vlaci", "owner": "vlaci",
"repo": "openconnect-sso", "repo": "openconnect-sso",
"rev": "54263c09110125e6b78f2f46ea2ab32c6fbd49f8", "rev": "51e1eb727a93cf8b063157b7e9453dd21d3ba85f",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -2,7 +2,9 @@
with pkgs; with pkgs;
{ let isync-oauth2 = (isync.override { withCyrusSaslXoauth2 = true; });
in {
# Upgrade Doom Emacs daily # Upgrade Doom Emacs daily
systemd.user.services.doom-upgrade = { systemd.user.services.doom-upgrade = {
description = "Upgrade Doom Emacs"; description = "Upgrade Doom Emacs";

View File

@ -73,7 +73,7 @@ in {
pdfgrep pdfgrep
# Mail stack # Mail stack
mu mu
isync-oauth2 (isync.override { withCyrusSaslXoauth2 = true; })
msmtp msmtp
# Media # Media
gimp gimp

View File

@ -1,24 +0,0 @@
{ config, lib, pkgs, inputs, ... }:
let
cyrus-sasl-xoauth2 = with pkgs;
stdenv.mkDerivation {
name = "cyrus-sasl-xoauth2";
src = inputs.cyrus-sasl-xoauth2;
nativeBuildInputs =
[ autoreconfHook inputs.nixpkgs.legacyPackages."${system}".cyrus_sasl ];
};
in {
nixpkgs.overlays = [
(final: prev: {
patched-cyrus-sasl-oauth2 = prev.cyrus_sasl.overrideAttrs (div: rec {
postInstall = ''
for lib in ${cyrus-sasl-xoauth2}/lib/sasl2/*; do
ln -sf $lib $out/lib/sasl2/
done
'';
});
})
];
}

View File

@ -1,14 +0,0 @@
{ config, lib, pkgs, ... }:
with pkgs;
{
nixpkgs.overlays = [
(final: prev: {
isync-oauth2 = isync.overrideAttrs (div: rec {
buildInputs = [ openssl db patched-cyrus-sasl-oauth2 zlib ];
});
})
];
}