shimun/brownpaper
1
0
Fork 0
Code Issues Pull Requests Releases Activity

added: offer pinned overlay

Browse Source
This commit is contained in:
shimun 2021-04-06 21:45:33 +02:00
parent 9a95cee1fa
commit b752304908
Signed by: shimun
GPG Key ID: E81D8382DC2F971B
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
flake.lock generated
View File

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1609246779, "lastModified": 1614513358,
"narHash": "sha256-eq6ZXE/VWo3EMC65jmIT6H/rrUc9UWOWVujkzav025k=", "narHash": "sha256-LakhOx3S1dRjnh0b5Dg3mbZyH0ToC9I8Y2wKSkBaTzU=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "08c7ad4a0844adc4a7f9f5bb3beae482e789afa4", "rev": "5466c5bbece17adaab2d82fae80b46e807611bf3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -17,11 +17,12 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1609187327, "lastModified": 1617130537,
"narHash": "sha256-6lCwWpGpZxbSYclryv4ixsxxbISe7HuLyyQnGWCC8ZQ=", "narHash": "sha256-AHzQ2fQUs5pDPy/jJsJjzl8S0ftRjKVjIzBnHFxxacg=",
"path": "/nix/store/dcmj4p477fgzxz33rxss9wnmslnsahgx-source", "owner": "NixOS",
"rev": "e065200fc90175a8f6e50e76ef10a48786126e1c", "repo": "nixpkgs",
"type": "path" "rev": "446a2ffb5b9caa4d57cefda05961c1f2bbbfe0aa",
"type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",

14
flake.nix
View File

@ -25,5 +25,17 @@
) // rec { ) // rec {
nixosModules.brownpaper = import ./mod.nix; nixosModules.brownpaper = import ./mod.nix;
nixosModule = nixosModules.brownpaper; nixosModule = nixosModules.brownpaper;
}); }) // rec {
overlay = final: prev:
let
bp = final.callPackage ./default.nix { pkgs = final; src = self; };
in
{
brownpaper = bp.client;
brownpaper-server = bp.server;
};
overlays = {
pinned = final: prev: (overlay (import nixpkgs { inherit (final) system; }) { });
};
};
} }

2
mod.nix
View File

@ -3,7 +3,7 @@ with lib;
let let
cfg = config.services.brownpaper; cfg = config.services.brownpaper;
cfgc = config.programs.brownpaper; cfgc = config.programs.brownpaper;
package = pkgs.callPackage ./. { inherit pkgs; src = ./.; }; package = if pkgs ? brownpaper-server && pkgs ? brownpaper then { server = pkgs.brownpaper-server; client = pkgs.brownpaper; } else (pkgs.callPackage ./. { inherit pkgs; src = ./.; });
keyDir = pkgs.runCommand "brownpaper-keys" { } '' keyDir = pkgs.runCommand "brownpaper-keys" { } ''
mkdir -p $out mkdir -p $out
${concatStringsSep " && " (builtins.map (key: "cp ${key} $out/") cfg.pgpKeys)} ${concatStringsSep " && " (builtins.map (key: "cp ${key} $out/") cfg.pgpKeys)}