Skip to content

Commit

Permalink
fixed packages
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcelCoding committed Mar 29, 2024
1 parent 32b70dd commit c5cc734
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 21 deletions.
26 changes: 13 additions & 13 deletions derivation.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@ let
};
in
{
pkgs.writeShellApplication {
name = "ddix-ixp-deploy";
ddix-ixp-deploy = pkgs.writeShellApplication {
name = "ddix-ixp-deploy";

runtimeInputs = with pkgs; [
arouteserver
bgpq4
openssh
];
runtimeInputs = with pkgs; [
arouteserver
bgpq4
openssh
];

text = ''
export PYTHONPATH="${python3}/${python3.sitePackages}"
cd ${ddix-ansible-ixp}/plays
exec ${pkgs.util-linux}/bin/flock /tmp/ddix-ansible-ixp.lock -c "${pkgs.ansible}/bin/ansible-playbook deploy.yml ''$*"
'';
text = ''
export PYTHONPATH="${python3}/${python3.sitePackages}"
cd ${ddix-ansible-ixp}/plays
exec ${pkgs.util-linux}/bin/flock /tmp/ddix-ansible-ixp.lock -c "${pkgs.ansible}/bin/ansible-playbook deploy.yml ''$*"
'';
};
pkgs.writeShellApplication {
ddix-ixp-commit = pkgs.writeShellApplication {
name = "ddix-ixp-commit";

runtimeInputs = with pkgs; [
Expand Down
15 changes: 7 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,20 @@
flake-utils.lib.eachDefaultSystem
(system:
let
pkgs = (import nixpkgs) {
inherit system;
pkgs = (import nixpkgs) { inherit system; };
derivation = pkgs.callPackage ./derivation.nix {
arouteserver = arouteserver.packages."${system}".arouteserver;
};
in
{
packages = rec {
ddix-ansible-ixp = pkgs.callPackage ./derivation.nix {
arouteserver = arouteserver.packages."${system}".arouteserver;
};
default = ddix-ansible-ixp;
packages = {
inherit (derivation) ddix-ixp-deploy ddix-ixp-commit;
};
}
) // {
overlays.default = _: prev: {
ddix-ansible-ixp = self.packages."${prev.system}".default;
ddix-ixp-deploy = self.packages."${prev.system}".ddix-ixp-deploy;
ddix-ixp-commit = self.packages."${prev.system}".ddix-ixp-commit;
};
};
}

0 comments on commit c5cc734

Please sign in to comment.