From e10ef1c20d6b537b1babbda35171341e23d295c7 Mon Sep 17 00:00:00 2001 From: coolneng Date: Tue, 23 Nov 2021 21:20:02 +0100 Subject: [PATCH] Revert "Rebuild cyrus-sasl with XOAUTH2 support" This reverts commit dea7abd19a88de90cdaadb6d1300f0159b362dc1. --- configuration.nix | 1 - flake.lock | 17 ----------------- flake.nix | 4 ---- overlays/cyrus-sasl.nix | 24 ------------------------ 4 files changed, 46 deletions(-) delete mode 100644 overlays/cyrus-sasl.nix diff --git a/configuration.nix b/configuration.nix index d42befa..6d9227f 100644 --- a/configuration.nix +++ b/configuration.nix @@ -111,7 +111,6 @@ with pkgs; ./modules/cachix.nix ./overlays/emacs.nix ./overlays/nix-direnv.nix - ./overlays/cyrus-sasl.nix ]; } diff --git a/flake.lock b/flake.lock index d279dd8..2224d83 100644 --- a/flake.lock +++ b/flake.lock @@ -20,22 +20,6 @@ "type": "github" } }, - "cyrus-sasl-xoauth2": { - "flake": false, - "locked": { - "lastModified": 1611713742, - "narHash": "sha256-IaH8tNUhM0lUOmFiG4G9cGzsuM9mTWfQrzoQ78MIgZ0=", - "owner": "robn", - "repo": "sasl2-oauth", - "rev": "4236b6fb904d836b85b55ba32128b843fd8c2362", - "type": "github" - }, - "original": { - "owner": "robn", - "repo": "sasl2-oauth", - "type": "github" - } - }, "emacs-overlay": { "locked": { "lastModified": 1635818927, @@ -69,7 +53,6 @@ "root": { "inputs": { "agenix": "agenix", - "cyrus-sasl-xoauth2": "cyrus-sasl-xoauth2", "emacs-overlay": "emacs-overlay", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index f37b3d5..0aa48e3 100644 --- a/flake.nix +++ b/flake.nix @@ -6,10 +6,6 @@ agenix.url = "github:ryantm/agenix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; emacs-overlay.url = "github:nix-community/emacs-overlay"; - cyrus-sasl-xoauth2 = { - url = "github:robn/sasl2-oauth"; - flake = false; - }; }; outputs = { self, nixpkgs, agenix, ... }@inputs: diff --git a/overlays/cyrus-sasl.nix b/overlays/cyrus-sasl.nix deleted file mode 100644 index 392d340..0000000 --- a/overlays/cyrus-sasl.nix +++ /dev/null @@ -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: { - cyrus_sasl = prev.cyrus_sasl.overrideAttrs (div: rec { - postInstall = '' - for lib in ${cyrus-sasl-xoauth2}/lib/sasl2/*; do - ln -sf $lib $out/lib/sasl2/ - done - ''; - }); - }) - ]; -}