inputs: drop caddy-nix as it has been upstreamed
This commit is contained in:
parent
3a95611183
commit
cf0238677f
16
flake.lock
16
flake.lock
|
@ -1,20 +1,5 @@
|
|||
{
|
||||
"nodes": {
|
||||
"caddy-nix": {
|
||||
"locked": {
|
||||
"lastModified": 1735284852,
|
||||
"narHash": "sha256-mQu3IwEO294DuB7XAXOvOLriElDgRTf6rTLoDh3tMFQ=",
|
||||
"owner": "vincentbernat",
|
||||
"repo": "caddy-nix",
|
||||
"rev": "b421380ded7c000f432092df0f1a7afd9e187173",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "vincentbernat",
|
||||
"repo": "caddy-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
@ -419,7 +404,6 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"caddy-nix": "caddy-nix",
|
||||
"devshell": [
|
||||
"rebmit",
|
||||
"devshell"
|
||||
|
|
|
@ -64,7 +64,6 @@
|
|||
url = "github:nix-community/nixpkgs-terraform-providers-bin";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
caddy-nix.url = "github:vincentbernat/caddy-nix";
|
||||
|
||||
# libraries
|
||||
|
||||
|
|
|
@ -7,22 +7,13 @@ let
|
|||
inputs.rebmit.overlays.default
|
||||
inputs.nixpkgs-terraform-providers-bin.overlay
|
||||
|
||||
# TODO: wait for https://nixpkgs-tracker.ocfox.me/?pr=358586
|
||||
inputs.caddy-nix.overlays.default
|
||||
|
||||
(final: prev: {
|
||||
(_final: prev: {
|
||||
libadwaita = prev.libadwaita.overrideAttrs (old: {
|
||||
patches = (old.patches or [ ]) ++ [
|
||||
../patches/libadwaita-without-adwaita-theme.patch
|
||||
];
|
||||
doCheck = false;
|
||||
});
|
||||
# TODO: wait for https://nixpkgs-tracker.ocfox.me/?pr=360101
|
||||
xdg-desktop-portal-gnome = prev.xdg-desktop-portal-gnome.overrideAttrs (_old: {
|
||||
propagatedUserEnvPkgs = [
|
||||
final.nautilus
|
||||
];
|
||||
});
|
||||
})
|
||||
];
|
||||
in
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
foliate
|
||||
libreoffice-fresh
|
||||
loupe
|
||||
nautilus
|
||||
nheko
|
||||
papers
|
||||
seahorse
|
||||
|
|
|
@ -9,8 +9,8 @@
|
|||
enable = true;
|
||||
enableReload = true;
|
||||
package = pkgs.caddy.withPlugins {
|
||||
plugins = [ "github.com/mholt/caddy-l4@3c6cc2c0ee0875899fde271fbdef95be3fef7a92" ];
|
||||
hash = "sha256-s5LzVOAvVsZxbhdgIdpe1OBSHIAc/tCi+1pEofeQx6k=";
|
||||
plugins = [ "github.com/mholt/caddy-l4@v0.0.0-20250102174933-6e5f5e311ead" ];
|
||||
hash = "sha256-F7SZRTkJ2f/khJb1OCdbGNjxp95sN4Pl+Scir3PSKec=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue