Skip to content

Commit

Permalink
update flakes
Browse files Browse the repository at this point in the history
  • Loading branch information
@deemp
deemp committed Jul 23, 2023
1 parent 0b432fd commit d72faea
Show file tree
Hide file tree
Showing 16 changed files with 410 additions and 561 deletions.
87 changes: 37 additions & 50 deletions F22/total-virtualization/flake.nix
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,47 @@
{
inputs = { };
outputs = inputs:
let
inputs_ =
let flakes = (import ../..).outputs.inputs.flakes; in
{
inherit (flakes.source-flake) nixpkgs flake-utils;
inherit (flakes) drv-tools devshell codium;
python-tools = flakes.language-tools.python;
};

outputs = outputs_ { } // { inputs = inputs_; outputs = outputs_; };
let flakes = (import ../../.).outputs.inputs.flakes; in
flakes.makeFlake {
inputs = { inherit (flakes.all) nixpkgs drv-tools devshell codium python-tools; };
perSystem = { inputs, system }:
let
pkgs = inputs.nixpkgs.legacyPackages.${system};
inherit (inputs.codium.lib.${system}) mkCodium writeSettingsJSON;
inherit (inputs.codium.lib.${system}) extensions extensionsCommon settingsNix settingsCommonNix;
inherit (inputs.devshell.lib.${system}) mkShell mkCommands mkRunCommands;

outputs_ =
inputs__:
let inputs = inputs_ // inputs__; in
inputs.flake-utils.lib.eachDefaultSystem
(system:
let
pkgs = inputs.nixpkgs.legacyPackages.${system};
inherit (inputs.codium.lib.${system}) mkCodium writeSettingsJSON;
inherit (inputs.codium.lib.${system}) extensions extensionsCommon settingsNix settingsCommonNix;
inherit (inputs.devshell.lib.${system}) mkShell mkCommands mkRunCommands;

packages = {
writeSettings = writeSettingsJSON (settingsCommonNix // {
inherit (settingsNix) python kubernetes;
});
createVenvs = inputs.python-tools.lib.${system}.createVenvs [ "lab5" "lab6" ];
codium = mkCodium {
extensions = extensionsCommon // { inherit (extensions) docker python kubernetes; };
};
packages = {
writeSettings = writeSettingsJSON (settingsCommonNix // {
inherit (settingsNix) python kubernetes;
});
createVenvs = inputs.python-tools.lib.${system}.createVenvs [ "lab5" "lab6" ];
codium = mkCodium {
extensions = extensionsCommon // { inherit (extensions) docker python kubernetes; };
};
};

tools = [
pkgs.rabbitmq-server
pkgs.hadolint
pkgs.poetry
];
tools = [
pkgs.rabbitmq-server
pkgs.hadolint
pkgs.poetry
];

devShells.default = mkShell {
packages = tools;
bash.extra = '''';
commands =
mkCommands "tools" tools
++ mkRunCommands "ide" {
"codium ." = packages.codium;
inherit (packages) writeSettings createVenvs;
};
};
in
{
inherit packages devShells;
});
in
outputs;
devShells.default = mkShell {
packages = tools;
bash.extra = '''';
commands =
mkCommands "tools" tools
++ mkRunCommands "ide" {
"codium ." = packages.codium;
inherit (packages) writeSettings createVenvs;
};
};
in
{
inherit packages devShells;
};
};

nixConfig = {
extra-trusted-substituters = [
Expand Down
101 changes: 45 additions & 56 deletions blockchain/flake.nix
View file
Original file line number Diff line number Diff line change
@@ -1,67 +1,56 @@
{
inputs = { };
outputs = inputs:
let
inputs_ =
let flakes = (import ../.).outputs.inputs.flakes; in
{
inherit (flakes.source-flake) nixpkgs flake-utils formatter nix-vscode-extensions;
inherit (flakes) drv-tools devshell codium;
python-tools = flakes.language-tools.python;
};

outputs = outputs_ { } // { inputs = inputs_; outputs = outputs_; };

outputs_ =
inputs__:
let inputs = inputs_ // inputs__; in
inputs.flake-utils.lib.eachDefaultSystem
(system:
let
pkgs = inputs.nixpkgs.legacyPackages.${system};
inherit (inputs.codium.lib.${system})
settingsNix mkCodium writeSettingsJSON
extensionsCommon extensions;
inherit (inputs.drv-tools.lib.${system}) mkShellApp;
inherit (inputs.python-tools.lib.${system}) activateVenv;
inherit (inputs.devshell.lib.${system}) mkShell mkCommands mkRunCommands;
inherit (inputs.nix-vscode-extensions.extensions.${system}) vscode-marketplace;
let flakes = (import ../.).outputs.inputs.flakes; in
flakes.makeFlake {
inputs = {
inherit (flakes.all)
nixpkgs formatter nix-vscode-extensions drv-tools
devshell codium python-tools;
};
perSystem = { inputs, system }:
let
pkgs = inputs.nixpkgs.legacyPackages.${system};
inherit (inputs.codium.lib.${system}) settingsNix mkCodium writeSettingsJSON extensionsCommon extensions;
inherit (inputs.drv-tools.lib.${system}) mkShellApp;
inherit (inputs.python-tools.lib.${system}) activateVenv;
inherit (inputs.devshell.lib.${system}) mkShell mkCommands mkRunCommands;
inherit (inputs.nix-vscode-extensions.extensions.${system}) vscode-marketplace;

packages = {
codium = mkCodium {
extensions = extensionsCommon // {
inherit (extensions) python sql;
other = {
inherit (vscode-marketplace.nomicfoundation) hardhat-solidity;
};
packages = {
codium = mkCodium {
extensions = extensionsCommon // {
inherit (extensions) python sql;
other = {
inherit (vscode-marketplace.nomicfoundation) hardhat-solidity;
};
};
writeSettings = writeSettingsJSON settingsNix;
createVenvs = inputs.python-tools.lib.${system}.createVenvs [ "." ];
};
writeSettings = writeSettingsJSON settingsNix;
createVenvs = inputs.python-tools.lib.${system}.createVenvs [ "." ];
};

tools = [
pkgs.docker
pkgs.poetry
pkgs.rustup
pkgs.nodePackages.near-cli
];
devShells.default = mkShell {
bash.extra = ''
${pkgs.lib.getExe packages.createVenvs}
${activateVenv}
'';
packages = tools;
commands =
mkCommands "tools" tools
++ mkRunCommands "ide" { "codium ." = packages.codium; inherit (packages) createVenvs; };
};
in
{
inherit packages devShells;
});
in
outputs;
tools = [
pkgs.docker
pkgs.poetry
pkgs.rustup
pkgs.nodePackages.near-cli
];
devShells.default = mkShell {
bash.extra = ''
${pkgs.lib.getExe packages.createVenvs}
${activateVenv}
'';
packages = tools;
commands =
mkCommands "tools" tools
++ mkRunCommands "ide" { "codium ." = packages.codium; inherit (packages) createVenvs; };
};
in
{
inherit packages devShells;
};
};

nixConfig = {
extra-trusted-substituters = [
Expand Down
6 changes: 3 additions & 3 deletions flake.lock
View file

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

Loading

0 comments on commit d72faea

Please sign in to comment.