diff --git a/ci-root.nix b/ci-root.nix index d780ad8f17..d12dbae1cf 100644 --- a/ci-root.nix +++ b/ci-root.nix @@ -8,8 +8,9 @@ let lib = pkgs.lib; prefixAttrs = prefix: lib.mapAttrsToList (name: value: { name = "${prefix}-${name}"; path = value; }); ciMachines = prefixAttrs "machine" depot.ops.nixos.systems; - ciPackages = prefixAttrs "pkg" (builtins.removeAttrs depot.nix.pkgs [ "grafana-plugins" ]); + ciPackages = prefixAttrs "pkg" (builtins.removeAttrs depot.nix.pkgs [ "grafana-plugins" "windows" ]); ciGrafanaPlugins = prefixAttrs "pkg-grafana-plugins" depot.nix.pkgs.grafana-plugins; + ciWindows = prefixAttrs "pkg-windows" depot.nix.pkgs.windows; ciDocker = prefixAttrs "docker" ((import ./docker-images.nix).images); ciWeb = prefixAttrs "web" depot.web; @@ -19,4 +20,4 @@ let twitternuke = depot.go.twitternuke; }; in -pkgs.linkFarm "ci" (ciMachines ++ ciPackages ++ ciGrafanaPlugins ++ ciDocker ++ ciWeb ++ ciOther) +pkgs.linkFarm "ci" (ciMachines ++ ciPackages ++ ciWindows ++ ciGrafanaPlugins ++ ciDocker ++ ciWeb ++ ciOther) diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix index 4ba5bc7710..fc4266fd20 100644 --- a/nix/pkgs/default.nix +++ b/nix/pkgs/default.nix @@ -21,5 +21,6 @@ tiny-remapper = import ./tiny-remapper.nix args; django-allauth = pkgs.python3Packages.callPackage ./django-allauth.nix {}; django-tailwind = pkgs.python3Packages.callPackage ./django-tailwind.nix {}; + windows = import ./windows args; } // (import ./heptapod-runner.nix args) // (import ./lightspeed args) diff --git a/nix/pkgs/windows/default.nix b/nix/pkgs/windows/default.nix new file mode 100644 index 0000000000..f9d940f6de --- /dev/null +++ b/nix/pkgs/windows/default.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: + +rec { + serverISO = pkgs.requireFile { + name = "en_windows_server_2019_updated_jan_2021_x64_dvd_5ef22372.iso"; + url = "https://my.visualstudio.com/Downloads"; + sha256 = "9976B3E125050542CA50DE3C7347D132113834EDC151C64C55F9E30BC4D2160F"; + }; + clientISO = pkgs.requireFile { + name = "en_windows_10_consumer_editions_version_20h2_updated_jan_2021_x64_dvd_00152b46.iso"; + url = "https://my.visualstudio.com/Downloads"; + sha256 = "18C05A70676F9AA8C7CE9A90BB63F6105CCDD630538DA03D24547089E7DA19D2"; + }; +}