move to singular form

toastal

Dec 7, 2025, 6:07 PM

VJ2OEE7WD53KHRLAZQW25N2OV3NIQT6C2J37H3D2XZD556BWNELAC

Dependencies

• [2] SDLMBP73 Only append $FACTOR_ROOTS if it’s non-empty
• [3] H5TE46JD begin
• [4] ZTYMQSFK my patch upstreamed to fix vocabs in Nix

Change contents

• replacement in release.nix at line 15
  [3.697]→[3.697:791](∅→∅)
  − (import ./nix/overlays/default.nix)

  − (import ./nix/overlays/development.nix)
  [3.697]

  [3.791]
  + (import ./nix/overlay/default.nix)

  + (import ./nix/overlay/development.nix)
• file move: packages (d--r------) → package (d--r------)
  [3.914]

  [3.936]
• file move: overlays (d--r------) → overlay (d--r------)
  [3.914]

  [3.2430]
• edit in nix/overlay/development.nix at line 4
  [3.2589]

  [3.2589]
  + factor-wrapped = final.writeTextFile {

  + name = "factor-scoped";

  + executable = true;

  + destination = "/bin/factor";

  + text =

  + let

  + factor-reroot = final.writeTextFile {

  + name = "rerooted-ui-listener.factor";

  + destination = "rerooted-ui-listener.factor";

  + text = # factor

  + ''

  + USING: environment io.directories namespaces system ;

  +

  + "FACTOR_PROJECT_ROOT" os-env

  + [ set-current-directory ] when

  +

  + "listener" run

  + '';

  + };

  + in

  + # sh

  + ''

  + #!${final.lib.getExe final.dash}

  + exec ${final.factorPackages.factor-lang}/bin/factor "$@"

  + '';

  + checkPhase = ''

  + ${final.stdenv.shellDryRun} "$target"

  + '';

  + meta.mainProgram = "factor";

  + };

  +
• replacement in nix/overlay/development.nix at line 41
  [3.2740]→[3.2740:2776](∅→∅)
  − factorPackages.factor-lang
  [3.2740]

  [3.2776]
  + factor-wrapped
• replacement in nix/overlay/development.nix at line 47
  [2.78]→[3.2932:2983](∅→∅),[3.2932]→[3.2932:2983](∅→∅)
  − export FACTOR_IMAGE="$(pwd)/factor.image"
  [2.78]

  [3.2983]
  + export FACTOR_PROJECT_ROOT="$(pwd)"

  + export FACTOR_IMAGE="$FACTOR_PROJECT_ROOT/factor.image"
• edit in nix/overlay/development.nix at line 66
  [3.3417]→[3.3417:3418](∅→∅)
  −
• replacement in nix/overlay/default.nix at line 6
  [3.3637]→[3.3637:3699](∅→∅)
  − fello = final.callPackage ../packages/vocab.nix { };
  [3.3637]

  [3.3699]
  + fello = final.callPackage ../package/vocab.nix { };
• replacement in nix/overlay/default.nix at line 9
  [3.3713]→[3.3713:3767](∅→∅)
  − fello = final.callPackage ../packages/bin.nix { };
  [3.3713]

  [3.3767]
  + fello = final.callPackage ../package/bin.nix { };
• replacement in flake.nix at line 28
  [3.4795]→[3.4795:4907](∅→∅)
  − (import ./nix/overlays/default.nix)

  − (import ./nix/overlays/development.nix)
  [3.4795]

  [3.4907]
  + (import ./nix/overlay/default.nix)

  + (import ./nix/overlay/development.nix)
• replacement in flake.nix at line 47
  [3.5282]→[3.5282:5402](∅→∅)
  − default = import ./nix/overlays/default.nix;

  − dev-tools = import ./nix/overlays/development.nix;
  [3.5282]

  [3.5402]
  + default = import ./nix/overlay/default.nix;

  + dev-tools = import ./nix/overlay/development.nix;