WIP: Windows support

mediocregopher commented

2025-01-14 16:43:07 +00:00

First-time contributor

I'll be clear up front that I'm not really expecting to get this merged as it is. But I saw that others are interested in windows support (#536), so I thought I'd contribute my work back. What I did here on the rust side overlaps a bit with #891, but I've gone further and gotten cross-compiling from linux to windows apparently working. I say "apparently" because I haven't fully tested it yet, but it does compile and the binary does work in a VM.

Performing the actual cross-compilation cannot be done via flake.nix or default.nix. The default.nix is broken anyway, and flake.nix wants to build a full release binary, but not all features are currently supported, only the base ones, so this fails. To test this you have to do something like:

  let
  
    pkgsSrc = DIY;

    src = builtins.fetchGit {
      name = "garage-v1.0.1-windows";
      url = "git@git.deuxfleurs.fr:mediocregopher/garage.git";
      rev = "8edf5aab228d93b79e2c6b6a3f2402fffdc4c4ab";
    };

    common = (import "${src}/nix/common.nix") {
        system = builtins.currentSystem;
    };

    compile = (import "${src}/nix/compile.nix") {
      system = builtins.currentSystem;
      target = "x86_64-w64-mingw32";
      pkgsSrc = pkgsSrc;

      cargo2nixOverlay = common.cargo2nixOverlay;

      release = true;
      git_version = "windows-debug";

      features = [
        "garage/bundled-libs"
        "garage/lmdb"
        "garage/sqlite"
        "garage/metrics"
        "garage/k2v"
      ];
    };

  in
    compile.workspace.garage {}

In the next few weeks I'll be working on testing this more thoroughly, but in the meantime any feedback would be great.

I'll be clear up front that I'm not really expecting to get this merged as it is. But I saw that others are interested in windows support (#536), so I thought I'd contribute my work back. What I did here on the rust side overlaps a bit with #891, but I've gone further and gotten cross-compiling from linux to windows apparently working. I say "apparently" because I haven't fully tested it yet, but it does compile and the binary does work in a VM. Performing the actual cross-compilation cannot be done via `flake.nix` or `default.nix`. The `default.nix` is broken anyway, and `flake.nix` wants to build a full release binary, but not all features are currently supported, only the base ones, so this fails. To test this you have to do something like: ```nix let pkgsSrc = DIY; src = builtins.fetchGit { name = "garage-v1.0.1-windows"; url = "git@git.deuxfleurs.fr:mediocregopher/garage.git"; rev = "8edf5aab228d93b79e2c6b6a3f2402fffdc4c4ab"; }; common = (import "${src}/nix/common.nix") { system = builtins.currentSystem; }; compile = (import "${src}/nix/compile.nix") { system = builtins.currentSystem; target = "x86_64-w64-mingw32"; pkgsSrc = pkgsSrc; cargo2nixOverlay = common.cargo2nixOverlay; release = true; git_version = "windows-debug"; features = [ "garage/bundled-libs" "garage/lmdb" "garage/sqlite" "garage/metrics" "garage/k2v" ]; }; in compile.workspace.garage {} ``` In the next few weeks I'll be working on testing this more thoroughly, but in the meantime any feedback would be great.

mediocregopher added 7 commits 2025-01-14 16:43:08 +00:00

Allow passing system into common.nix, rather than always using builtin.currentSystem 6a436267a4

windows: Don't set private key perms or update disk usage metrics c2b3cf521a

windows: Don't set mode(0) when syncing directory ee4c19844b

windows: remove support for unix socket listening 4049ba217f

windows: fix allow-world-readable-secrets config compile error 3e65289b85

windows: don't discover default IP, removes winpcap dependency 7221ac5e88

windows: compile.nix fixes

ci/woodpecker/pr/debug Pipeline failed

Details

8edf5aab22

mediocregopher added 1 commit 2025-01-15 10:35:38 +00:00

Merge remote-tracking branch 'origin/main' into windows-v1

ci/woodpecker/pr/debug Pipeline failed

Details

b1c664a8ab

lx added the

labels 2025-02-14 12:58:18 +00:00

mediocregopher added 2 commits 2025-03-20 21:00:30 +00:00

Merge remote-tracking branch 'origin/main' into windows-v1 57810eec5b

windows: compile.nix fixes, post crane refactor

ci/woodpecker/pr/debug Pipeline is pending approval

Details

e99d6b460e

mediocregopher added 1 commit 2025-03-20 21:27:14 +00:00

Ran rustfmt

ci/woodpecker/pr/debug Pipeline is pending approval

Details

5eabd64ca7

mediocregopher commented

2025-03-21 07:00:17 +00:00

Author

First-time contributor

I've updated this MR to account for the build system changes in 1.1.0. The move to crane is a great move, btw, really simplifies everything :)

This MR still requires manually calling compile.nix with the correct target. I could easily add accessible release targets for windows to flake.nix and default.nix, but the release naming in those currently only specifies the CPU architecture and assumes the OS is Linux (I guess). I could add the release name as x86_64-windows, but maybe it'd be better add the OS to the other release names as well for consistency?

I've updated this MR to account for the build system changes in `1.1.0`. The move to crane is a great move, btw, really simplifies everything :) This MR still requires manually calling `compile.nix` with the correct `target`. I could easily add accessible release targets for windows to `flake.nix` and `default.nix`, but the release naming in those currently only specifies the CPU architecture and assumes the OS is Linux (I guess). I could add the release name as `x86_64-windows`, but maybe it'd be better add the OS to the other release names as well for consistency?

ci/woodpecker/pr/debug Pipeline is pending approval

Required

Details

This pull request is marked as a work in progress.

This branch is out-of-date with the base branch

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u windows-v1:mediocregopher-windows-v1

git checkout mediocregopher-windows-v1

Rows
Columns

WIP: Windows support #925

Checkout