mirrors_public/oddlama_nix-config
1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-11 07:10:39 +02:00
Code Activity

refactor(screenshots): use separate scripts package

Browse source
This commit is contained in:
oddlama 2023-10-16 00:46:30 +02:00
parent 3e0e03fc31
commit 6e8aae7d8d
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
15 changed files with 216 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

23
pkgs/default.nix
View file

@ -1,21 +1,22 @@
[
(import ./caddy.nix)
(import ./oauth2-proxy)
(_self: super: {
deploy = super.callPackage ./deploy.nix {};
git-fuzzy = super.callPackage ./git-fuzzy {};
kanidm-secret-manipulator = super.callPackage ./kanidm-secret-manipulator.nix {};
segoe-ui-ttf = super.callPackage ./segoe-ui-ttf.nix {};
zsh-histdb-skim = super.callPackage ./zsh-skim-histdb.nix {};
(import ./scripts)
(_final: prev: {
deploy = prev.callPackage ./deploy.nix {};
git-fuzzy = prev.callPackage ./git-fuzzy {};
kanidm-secret-manipulator = prev.callPackage ./kanidm-secret-manipulator.nix {};
segoe-ui-ttf = prev.callPackage ./segoe-ui-ttf.nix {};
zsh-histdb-skim = prev.callPackage ./zsh-skim-histdb.nix {};
kanidm = super.kanidm.overrideAttrs (_finalAttrs: _previousAttrs: {
kanidm = prev.kanidm.overrideAttrs (_finalAttrs: _previousAttrs: {
patches = [
(super.fetchpatch {
(prev.fetchpatch {
name = "group-list-json-output.patch";
url = "https://patch-diff.githubusercontent.com/raw/kanidm/kanidm/pull/2016.patch";
hash = "sha256-gc75KBzhth4fZvuvRa3Rjg1J7DIGy25mzUPCf2aha80=";
})
(super.fetchpatch {
(prev.fetchpatch {
name = "person-and-oauth-json-output.patch";
url = "https://patch-diff.githubusercontent.com/raw/kanidm/kanidm/pull/2017.patch";
hash = "sha256-fZgJ7dY2LHvBi64A/6o7kfArUAsLqjWRRpH2q1GL5ic=";
@ -26,9 +27,9 @@
});
formats =
super.formats
prev.formats
// {
ron = import ./ron.nix {inherit (super) lib pkgs;};
ron = import ./ron.nix {inherit (prev) lib pkgs;};
};
})
]