Skip to content

flake.lock: Update #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

flake.lock: Update #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
827afeb
flake.lock: Update
max-privatevoid Apr 24, 2025
f23ed68
cluster/services/ipfs: use upstream ipfs-cluster module
max-privatevoid Apr 24, 2025
a123895
packages/npins: use upstream version
max-privatevoid Apr 24, 2025
6c46378
packages: replace npins.mkSource with mkNpinsSource
max-privatevoid Apr 24, 2025
5c185fb
packages/keycloak: jre -> jre_headless
max-privatevoid Apr 24, 2025
60ccae1
packages/npins: don't override nix-prefetch-git
max-privatevoid Apr 24, 2025
abfe6df
flake.lock: Update
hercules-ci[bot] Apr 25, 2025
ec2e33c
flake.lock: Update
hercules-ci[bot] May 2, 2025
646ff82
flake.lock: Update
hercules-ci[bot] May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions cluster/services/ipfs/cluster.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ let
pinSvcSocket = "/run/ipfs-cluster/ipfs-pinning-service-api.sock";
proxySocket = "/run/ipfs-cluster/ipfs-api-proxy.sock";
in {
imports = [
depot.nixosModules.ipfs-cluster
];

system.ascensions.ipfs-cluster = {
requiredBy = [ "ipfs-cluster.service" ];
incantations = i: [ ];
Expand Down
61 changes: 30 additions & 31 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

169 changes: 0 additions & 169 deletions modules/ipfs-cluster/default.nix
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion modules/part.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ in
fail2ban = ./fail2ban;
hyprspace = ./hyprspace;
ipfs = ./ipfs;
ipfs-cluster = ./ipfs-cluster;
maintenance = ./maintenance;
minimal = ./minimal;
motd = ./motd;
Expand Down
2 changes: 2 additions & 0 deletions packages/build-support/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
hydrateAssetDirectory = pkgs.callPackage ./hydrate-asset-directory {
inherit fetchAsset;
};

mkNpinsSource = pkgs.callPackage ./make-npins-source { };
};
};
}
0 packages/tools/npins/source.nix → ...ild-support/make-npins-source/default.nix
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions packages/data/stevenblack/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenvNoCC, npins, pins }:
{ stdenvNoCC, mkNpinsSource, pins }:

let
src = npins.mkSource pins.stevenblack-hosts;
src = mkNpinsSource pins.stevenblack-hosts;
in

stdenvNoCC.mkDerivation {
Expand Down
2 changes: 1 addition & 1 deletion packages/patched-derivations.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ super: rec {
kanidm = patch super.kanidm "patches/base/kanidm";

keycloak = super.keycloak.override {
jre = jre17_standard;
jre_headless = jre17_standard;
};

postgresql = super.postgresql_14;
Expand Down
Loading