diff --git a/pa-06/a1/a.c b/pa-06/a2/a.c similarity index 100% rename from pa-06/a1/a.c rename to pa-06/a2/a.c diff --git a/pa-06/a1/b.c b/pa-06/a2/b.c similarity index 100% rename from pa-06/a1/b.c rename to pa-06/a2/b.c diff --git a/pa-06/a1/c.c b/pa-06/a2/c.c similarity index 100% rename from pa-06/a1/c.c rename to pa-06/a2/c.c diff --git a/pa-06/a1/d.c b/pa-06/a2/d.c similarity index 100% rename from pa-06/a1/d.c rename to pa-06/a2/d.c diff --git a/pa-06/a1/flake.lock b/pa-06/a2/flake.lock similarity index 100% rename from pa-06/a1/flake.lock rename to pa-06/a2/flake.lock diff --git a/pa-06/a1/flake.nix b/pa-06/a2/flake.nix similarity index 73% rename from pa-06/a1/flake.nix rename to pa-06/a2/flake.nix index 43d2c83..3771dbb 100644 --- a/pa-06/a1/flake.nix +++ b/pa-06/a2/flake.nix @@ -23,28 +23,28 @@ pkgs, system, ... - }: let - mkTask = part: - pkgs.stdenv.mkDerivation { - name = "a1-${part}"; - src = ./.; - buildPhase = '' - cc ${part}.c -o ${part}.out - ''; - installPhase = '' - mkdir -p $out/bin/ - mv ${part}.out $out/bin/ - ''; - meta = { - mainProgram = "${part}.out"; - }; - }; - in { + }: { # Per-system attributes can be defined here. The self' and inputs' # module parameters provide easy access to attributes of the same # system. - packages = { + packages = let + mkTask = part: + pkgs.stdenv.mkDerivation { + name = "a1-${part}"; + src = ./.; + buildPhase = '' + cc ${part}.c -o ${part}.out + ''; + installPhase = '' + mkdir -p $out/bin/ + mv ${part}.out $out/bin/ + ''; + meta = { + mainProgram = "${part}.out"; + }; + }; + in { a = mkTask "a"; b = mkTask "b"; c = mkTask "c";