Skip to content
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

Jump to bottom

wb | simplify and remove dependencies #5957

Merged
merged 7 commits into from
Sep 12, 2024
Merged

wb | simplify and remove dependencies #5957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8d5a946
wb | remove nomad podman backend
fmaste Aug 20, 2024
2ff7643
Remove nix2container from flake
fmaste Sep 6, 2024
745f5ec
wb | update openssh version
fmaste Sep 9, 2024
0515ca5
wb | don't use nomad version from nixpkgs
fmaste Sep 2, 2024
d4f1d7c
wb | Remove publish functionality dependencies while the new infrastr…
fmaste Sep 3, 2024
17977d3
wb | remove vault
fmaste Sep 9, 2024
da7dee7
wb | code cleanups
fmaste Sep 10, 2024
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ trace-documentation:
###
### Workbench
###
workbench-ci: workbench-ci-test ci-test-auto ci-test-autonix ci-test-autonomadpodman
workbench-ci: workbench-ci-test ci-test-auto ci-test-autonix
CI_TARGETS := hlint workbench-ci haddock-hoogle
ci: ci-report ci-targets
ci-report:
Expand Down
72 changes: 2 additions & 70 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.

5 changes: 1 addition & 4 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@

std.url = "github:divnix/std";

nix2container.url = "github:nlewo/nix2container";

cardano-automation = {
url = "github:input-output-hk/cardano-automation";
inputs = {
Expand All @@ -78,7 +76,6 @@
, ops-lib
, cardano-mainnet-mirror
, std
, nix2container
, cardano-automation
, em
, ...
Expand Down Expand Up @@ -106,7 +103,7 @@
iohkNix.overlays.cardano-lib
iohkNix.overlays.utils
(final: prev: {
inherit customConfig nix2container;
inherit customConfig;
bench-data-publish = cardano-automation.outputs.packages.${final.system}."bench-data-publish:exe:bench-data-publish";
em = import em { inherit (final) system;
nixpkgsSrcs = nixpkgs.outPath;
Expand Down
2 changes: 0 additions & 2 deletions lib.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ $$(foreach prof,$(1),$$(eval $$(call proftgt,$$(prof)-nix, $$(prof)
$$(foreach prof,$(1),$$(eval $$(call proftgt,$$(prof)-autonix, $$(prof), true,false, true,false, false, supervisor)))
$$(foreach prof,$(1),$$(eval $$(call proftgt,$$(prof)-nomadexec, $$(prof), true,false,false,false, false, nomadexec)))
$$(foreach prof,$(1),$$(eval $$(call proftgt,$$(prof)-nomadexec-auto, $$(prof), true,false, true,false, false, nomadexec)))
$$(foreach prof,$(1),$$(eval $$(call proftgt,$$(prof)-nomadpodman, $$(prof), true,false,false,false, false, nomadpodman)))
$$(foreach prof,$(1),$$(eval $$(call proftgt,$$(prof)-nomadpodman-auto, $$(prof), true,false, true,false, false, nomadpodman)))
endef

define define_profile_targets_nomadcloud
Expand Down
2 changes: 0 additions & 2 deletions nix/pkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ let
import ./workbench/backend/nomad/cloud.nix params;
nomadexec = params:
import ./workbench/backend/nomad/exec.nix params;
nomadpodman = params:
import ./workbench/backend/nomad/podman.nix params;
supervisor = params:
import ./workbench/backend/supervisor.nix params;
}
Expand Down
Loading
Loading