Compare commits

...

3 Commits

Author SHA1 Message Date
coolneng 2b159d74f3
Bump dependencies 2021-11-23 21:34:09 +01:00
coolneng d3a9ce7505
Update soundcloud token 2021-11-23 21:20:54 +01:00
coolneng e10ef1c20d
Revert "Rebuild cyrus-sasl with XOAUTH2 support"
This reverts commit dea7abd19a.
2021-11-23 21:20:02 +01:00
5 changed files with 6 additions and 52 deletions

View File

@ -111,7 +111,6 @@ with pkgs;
./modules/cachix.nix ./modules/cachix.nix
./overlays/emacs.nix ./overlays/emacs.nix
./overlays/nix-direnv.nix ./overlays/nix-direnv.nix
./overlays/cyrus-sasl.nix
]; ];
} }

View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1637458245, "lastModified": 1637625975,
"narHash": "sha256-2k0u5hO0o9p8LmcyDjGAEdZge7GGvZnKkJZEarLI9pA=", "narHash": "sha256-ByDgmhpLykhAVeaFggjqoSRdl2OzTDODnxjPuu97fL4=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "4a93de2bebf58a458611a5918a0ddd82d4ed15b1", "rev": "a0e9ca505c82e762d39e9477a428b537a0aab022",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -20,22 +20,6 @@
"type": "github" "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": { "emacs-overlay": {
"locked": { "locked": {
"lastModified": 1635818927, "lastModified": 1635818927,
@ -53,11 +37,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1635702959, "lastModified": 1637595801,
"narHash": "sha256-ZKxX9DjJJGJqq20pE4dIj1G4ssCLVXXRFerM6lNuF0k=", "narHash": "sha256-LkIMwVFKCuEqidaUdg8uxwpESAXjsPo4oCz3eJ7RaRw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e544ee88fa4590df75e221e645a03fe157a99e5b", "rev": "263ef4cc4146c9fab808085487438c625d4426a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -69,7 +53,6 @@
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"cyrus-sasl-xoauth2": "cyrus-sasl-xoauth2",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }

View File

@ -6,10 +6,6 @@
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs"; agenix.inputs.nixpkgs.follows = "nixpkgs";
emacs-overlay.url = "github:nix-community/emacs-overlay"; emacs-overlay.url = "github:nix-community/emacs-overlay";
cyrus-sasl-xoauth2 = {
url = "github:robn/sasl2-oauth";
flake = false;
};
}; };
outputs = { self, nixpkgs, agenix, ... }@inputs: outputs = { self, nixpkgs, agenix, ... }@inputs:

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: {
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
'';
});
})
];
}

Binary file not shown.