diff --git a/Chapters/Background.nix b/Chapters/Background.nix deleted file mode 100644 index e69de29..0000000 diff --git a/Chapters/ChapterTemplate.tex b/Chapters/ChapterTemplate.tex index 9040ee4..0ecc9a3 100755 --- a/Chapters/ChapterTemplate.tex +++ b/Chapters/ChapterTemplate.tex @@ -12,7 +12,7 @@ \section{Main Section 1} Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam -ultricies lacinia euismod. Nam tempus risus in dolor rhoncus in +ultricies lacinia euismod. Name tempus risus in dolor rhoncus in interdum enim tincidunt. Donec vel nunc neque. In condimentum ullamcorper quam non consequat. Fusce sagittis tempor feugiat. Fusce magna erat, molestie eu convallis ut, tempus sed arcu. Quisque @@ -38,7 +38,7 @@ platea dictumst. \subsection{Subsection 2} Morbi rutrum odio eget arcu adipiscing sodales. Aenean et purus a est -pulvinar pellentesque. Cras in elit neque, quis varius elit. +pulvinar pellentesque. Cras in elit neque, quis various elit. Phasellus fringilla, nibh eu tempus venenatis, dolor elit posuere quam, quis adipiscing urna leo nec orci. Sed nec nulla auctor odio aliquet consequat. Ut nec nulla in ante ullamcorper aliquam at sed @@ -63,6 +63,6 @@ Ut hendrerit volutpat vulputate. Morbi condimentum venenatis augue, id porta ipsum vulputate in. Curabitur luctus tempus justo. Vestibulum risus lectus, adipiscing nec condimentum quis, condimentum nec nisl. Aliquam dictum sagittis velit sed iaculis. Morbi tristique -augue sit amet nulla pulvinar id facilisis ligula mollis. Nam elit +augue sit amet nulla pulvinar id facilisis ligula mollis. Name elit libero, tincidunt ut aliquam at, molestie in quam. Aenean rhoncus vehicula hendrerit. diff --git a/Chapters/Methodology.tex b/Chapters/Methodology.tex index 9d68030..3f9235f 100755 --- a/Chapters/Methodology.tex +++ b/Chapters/Methodology.tex @@ -148,7 +148,7 @@ deployment, offering a toolset that enables system administrators and developers to perform automatic deployment of service-oriented systems across a network of machines \cite{van_der_burg_disnix_2014}. Disnix leverages the features of Nix to manage complex intra-dependencies. -Meaning dependencies that exist on a network level instead on a binary levle. +Meaning dependencies that exist on a network level instead on a binary level. The overlap with the Clan framework is evident in the focus on deployment, how they differ will be explored in the evaluation of Clan's deployment system. diff --git a/flake.lock b/flake.lock index 3d33315..9daecc8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,37 +1,5 @@ { "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1627913399, - "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -52,285 +20,7 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "locked": { - "lastModified": 1629481132, - "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "997f7efcb746a9c140ce1f13c72263189225f482", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gitignore": { - "flake": false, - "locked": { - "lastModified": 1611672876, - "narHash": "sha256-qHu3uZ/o9jBHiA3MEKHJ06k7w4heOhA+4HCSIvflRxo=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "211907489e9f198594c0eb0ca9256a1949c9d412", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "jupyenv", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "hls": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", - "gitignore": "gitignore", - "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1637213318, - "narHash": "sha256-ZgxPwV7t4DyGYP7aXoetq+JHtd73XlOV2fYSflQmOXw=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "311107eabbf0537e0c192b2c377d282505b4eff1", - "type": "github" - }, - "original": { - "owner": "haskell", - "repo": "haskell-language-server", - "type": "github" - } - }, - "ihaskell": { - "inputs": { - "flake-compat": [ - "jupyenv" - ], - "flake-utils": [ - "jupyenv", - "flake-utils" - ], - "hls": "hls", - "nixpkgs": [ - "jupyenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1692365546, - "narHash": "sha256-qn8TQezUbA66I7ASnfu0Ib5CWBFfYloKwFxn686VlMw=", - "owner": "ihaskell", - "repo": "ihaskell", - "rev": "d7ad5d57ceb852a19a98266dfb53ec3b3441dda4", - "type": "github" - }, - "original": { - "owner": "ihaskell", - "repo": "ihaskell", - "type": "github" - } - }, - "jupyenv": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "ihaskell": "ihaskell", - "nix-dart": "nix-dart", - "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable", - "npmlock2nix": "npmlock2nix", - "opam-nix": "opam-nix", - "poetry2nix": "poetry2nix", - "pre-commit-hooks": "pre-commit-hooks_2", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1732481790, - "narHash": "sha256-xSwU4PAaDmBM1BsnWYWoZ+af+cHk2ry9cKxUjHVXpIQ=", - "owner": "tweag", - "repo": "jupyenv", - "rev": "59d97bf6715053502d8f13e5fb45342ca80efa09", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "jupyenv", - "type": "github" - } - }, - "mirage-opam-overlays": { - "flake": false, - "locked": { - "lastModified": 1661959605, - "narHash": "sha256-CPTuhYML3F4J58flfp3ZbMNhkRkVFKmBEYBZY5tnQwA=", - "owner": "dune-universe", - "repo": "mirage-opam-overlays", - "rev": "05f1c1823d891ce4d8adab91f5db3ac51d86dc0b", - "type": "github" - }, - "original": { - "owner": "dune-universe", - "repo": "mirage-opam-overlays", - "type": "github" - } - }, - "nix-dart": { - "inputs": { - "flake-utils": [ - "jupyenv", - "flake-utils" - ], - "nixpkgs": [ - "jupyenv", - "nixpkgs" - ], - "pub2nix": "pub2nix" - }, - "locked": { - "lastModified": 1673740150, - "narHash": "sha256-JiZrr75JILHW7IaNW3MwpYn+084Q6/gnXScPR7Pozhs=", - "owner": "djacu", - "repo": "nix-dart", - "rev": "8ee4e1a5ec0cc6c1e15860c4733f741485e8231e", - "type": "github" - }, - "original": { - "owner": "djacu", - "repo": "nix-dart", - "type": "github" - } - }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "jupyenv", - "poetry2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1698974481, - "narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "4bb5e752616262457bc7ca5882192a564c0472d2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixpkgs": { - "locked": { - "lastModified": 1630887066, - "narHash": "sha256-0ecIlrLsNIIa+zrNmzXXmbMBLZlmHU/aWFsa4bq99Hk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5e47a07e9f2d7ed999f2c7943b0896f5f7321ca3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1698288402, - "narHash": "sha256-jIIjApPdm+4yt8PglX8pUOexAdEiAax/DXW3S/Mb21E=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "60b9db998f71ea49e1a9c41824d09aa274be1344", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1702938738, - "narHash": "sha256-O7Vb0xC9s4Dmgxj8APEpuuMj7HsLgPbpy1UKvNVJp7o=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "dd8e82f3b4017b8faa52c2b1897a38d53c3c26cb", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1732014248, "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", @@ -346,7 +36,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_2": { "locked": { "lastModified": 1731890469, "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", @@ -362,279 +52,16 @@ "type": "github" } }, - "npmlock2nix": { - "flake": false, - "locked": { - "lastModified": 1668989938, - "narHash": "sha256-/IxdS0AiqSN0/VEOLnnfHyi4nP17yPrkhGf6KlXVwrc=", - "owner": "nix-community", - "repo": "npmlock2nix", - "rev": "0ba0746d62974403daf717cded3f24c617622bc7", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "npmlock2nix", - "rev": "0ba0746d62974403daf717cded3f24c617622bc7", - "type": "github" - } - }, - "opam-nix": { - "inputs": { - "flake-compat": [ - "jupyenv" - ], - "flake-utils": [ - "jupyenv", - "flake-utils" - ], - "mirage-opam-overlays": "mirage-opam-overlays", - "nixpkgs": [ - "jupyenv", - "nixpkgs" - ], - "opam-overlays": "opam-overlays", - "opam-repository": "opam-repository", - "opam2json": "opam2json" - }, - "locked": { - "lastModified": 1695904678, - "narHash": "sha256-g4ZcyFsQdcDYgBOGKIwFTu050Yw2xvYHpKSLxlA9p2Q=", - "owner": "tweag", - "repo": "opam-nix", - "rev": "d4a42c5ce58d4f0b07ee158867d085def0de33ce", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "opam-nix", - "type": "github" - } - }, - "opam-overlays": { - "flake": false, - "locked": { - "lastModified": 1654162756, - "narHash": "sha256-RV68fUK+O3zTx61iiHIoS0LvIk0E4voMp+0SwRg6G6c=", - "owner": "dune-universe", - "repo": "opam-overlays", - "rev": "c8f6ef0fc5272f254df4a971a47de7848cc1c8a4", - "type": "github" - }, - "original": { - "owner": "dune-universe", - "repo": "opam-overlays", - "type": "github" - } - }, - "opam-repository": { - "flake": false, - "locked": { - "lastModified": 1695894792, - "narHash": "sha256-7Llico807vq14AkqAaDIWogC50xLxU38nuNEH06YNPE=", - "owner": "ocaml", - "repo": "opam-repository", - "rev": "33fcf32f269ee5af70b31e27442397a0cdaf28b2", - "type": "github" - }, - "original": { - "owner": "ocaml", - "repo": "opam-repository", - "type": "github" - } - }, - "opam2json": { - "inputs": { - "nixpkgs": [ - "jupyenv", - "opam-nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1671540003, - "narHash": "sha256-5pXfbUfpVABtKbii6aaI2EdAZTjHJ2QntEf0QD2O5AM=", - "owner": "tweag", - "repo": "opam2json", - "rev": "819d291ea95e271b0e6027679de6abb4d4f7f680", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "opam2json", - "type": "github" - } - }, - "poetry2nix": { - "inputs": { - "flake-utils": [ - "jupyenv", - "flake-utils" - ], - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "jupyenv", - "nixpkgs" - ], - "systems": "systems_2", - "treefmt-nix": [ - "jupyenv" - ] - }, - "locked": { - "lastModified": 1703076010, - "narHash": "sha256-VaoDgib09zqtF0rREUvD2inmE9N4ECT1i02DVAhmOPk=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "b76e91da74ad7af0bc397561a59a19fcbc2ad488", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-utils": [ - "jupyenv", - "ihaskell", - "hls", - "flake-utils" - ], - "nixpkgs": [ - "jupyenv", - "ihaskell", - "hls", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1624971177, - "narHash": "sha256-Amf/nBj1E77RmbSSmV+hg6YOpR+rddCbbVgo5C7BS0I=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "397f0713d007250a2c7a745e555fa16c5dc8cadb", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks_2": { - "inputs": { - "flake-compat": [ - "jupyenv" - ], - "flake-utils": [ - "jupyenv", - "flake-utils" - ], - "gitignore": "gitignore_2", - "nixpkgs": [ - "jupyenv", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1698227354, - "narHash": "sha256-Fi5H9jbaQLmLw9qBi/mkR33CoFjNbobo5xWdX4tKz1Q=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "bd38df3d508dfcdff52cd243d297f218ed2257bf", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pub2nix": { - "flake": false, - "locked": { - "lastModified": 1594192744, - "narHash": "sha256-pDvcXSG1Mh2BpwkqAcNDJzcupV3pIAAtZJLfkiHMAz4=", - "owner": "paulyoung", - "repo": "pub2nix", - "rev": "0c7ecca590fcd1616db8c6468f799ffef36c85e9", - "type": "github" - }, - "original": { - "owner": "paulyoung", - "repo": "pub2nix", - "type": "github" - } - }, "root": { "inputs": { "flake-parts": "flake-parts", - "jupyenv": "jupyenv", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "treefmt-nix": "treefmt-nix" } }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "jupyenv", - "flake-utils" - ], - "nixpkgs": [ - "jupyenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696126582, - "narHash": "sha256-uo4cn/d2rHPy/fpKZKFBOaVO531zs/Doxz43imrpqZM=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "fc6fe50d9a4540a1111731baaa00f207301fdeb7", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "id": "systems", - "type": "indirect" - } - }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1732488702, diff --git a/flake.nix b/flake.nix index d65a7b6..4eeb13f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,20 +1,13 @@ { description = "Your jupyenv project"; - nixConfig.extra-substituters = [ - "https://tweag-jupyter.cachix.org" - ]; - nixConfig.extra-trusted-public-keys = [ - "tweag-jupyter.cachix.org-1:UtNH4Zs6hVUFpFBTLaA4ejYavPo5EFFqgd7G7FxGW9g=" - ]; - inputs = { #treefmt-nix.url = "github:Qubasa/treefmt-nix"; treefmt-nix.url = "github:qubasa/treefmt-nix"; flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - jupyenv.url = "github:tweag/jupyenv"; + }; outputs = @@ -27,33 +20,16 @@ ]; perSystem = { - lib, - system, pkgs, ... }: - let - inherit (inputs.jupyenv.lib.${system}) mkJupyterlabNew; - jupyterlab = mkJupyterlabNew ( - { ... }: - { - # nixpkgs = nixpkgs; - imports = [ (import ./kernels.nix) ]; - } - ); - in + { devShells.default = pkgs.mkShell { buildInputs = with pkgs; [ python3 ]; }; - packages = { - inherit jupyterlab; - }; - packages.default = jupyterlab; - apps.default.program = "${jupyterlab}/bin/jupyter-lab"; - apps.default.type = "app"; }; }; } diff --git a/kernels.nix b/kernels.nix deleted file mode 100644 index 102a5b3..0000000 --- a/kernels.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ pkgs, ... }: -{ - kernel.python.minimal = { - enable = true; - }; - - kernel.nix.minimal = { - enable = true; - }; - - kernel.bash.minimal = { - enable = true; - runtimePackages = [ - pkgs.python3 - pkgs.nix - pkgs.git - ]; - }; -} diff --git a/main.tex b/main.tex index 31ca094..ddf47d4 100644 --- a/main.tex +++ b/main.tex @@ -264,7 +264,7 @@ and Management}} % Your department's name and URL, this is used in \addchaptertocentry{\acknowledgementname} % Add the % acknowledgements to the table of contents - I am very grateful to my work collegues Mic92, Lassulus, W, Hsjobeki, + I am very grateful to my work colleagues Mic92, Lassulus, W, Hsjobeki, DavHau and Pinpox with whom I worked together to create the Clan framework. As well as my supervisor, Ber Lorke, for his guidance and support during my research. @@ -291,15 +291,6 @@ and Management}} % Your department's name and URL, this is used in % ABBREVIATIONS %---------------------------------------------------------------------------------------- -% \begin{abbreviations}{ll} % Include a list of abbreviations (a table -% % of two columns) - -% \textbf{LAH} & \textbf{L}ist \textbf{A}bbreviations \textbf{H}ere\\ -% \textbf{WSF} & \textbf{W}hat (it) \textbf{S}tands \textbf{F}or\\ -% \textbf{P2P} & \textbf{P}eer \textbf{T}o \textbf{P}eer\\ - -% \end{abbreviations} - \section*{Abbreviations} \begin{acronym}[P2P] % [P2P] aligns entries to the longest label \acro{P2P}{Peer to Peer} diff --git a/treefmt.nix b/treefmt.nix index d8d09a7..eabb1ac 100644 --- a/treefmt.nix +++ b/treefmt.nix @@ -17,7 +17,7 @@ "AI_Data/**" "Figures/**" ]; - treefmt.programs.typos = { + programs.typos = { enable = true; threads = 4; configFile = "./_typos.toml";