Unverified Commit 685d691d authored by K900's avatar K900 Committed by GitHub
Browse files

nixos/tools: start cleanup (#343075)

parents e433609e 51b47621

nixos/modules/installer/tools/get-version-suffix

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
getVersion() {

    local dir="$1"

    rev=

    gitDir="$dir/.git"

    if [ -e "$gitDir" ]; then

        if [ -z "$(type -P git)" ]; then

            echo "warning: Git not found; cannot figure out revision of $dir" >&2

            return

        fi

        cd "$dir"

        rev=$(git --git-dir="$gitDir" rev-parse --short HEAD)

        if git --git-dir="$gitDir" describe --always --dirty | grep -q dirty; then

            rev+=M

        fi

    fi

}



if nixpkgs=$(nix-instantiate --find-file nixpkgs "$@"); then

    getVersion $nixpkgs

    if [ -n "$rev" ]; then

        echo ".git.$rev"

    fi

fi

nixos/modules/installer/tools/tools.nix

+3 −29
Original line number Diff line number Diff line
@@ -17,26 +17,9 @@ let 
    '';

  });



  nixos-build-vms = makeProg {

    name = "nixos-build-vms";

    src = ./nixos-build-vms/nixos-build-vms.sh;

    inherit (pkgs) runtimeShell;

    manPage = ./manpages/nixos-build-vms.8;

  };



  nixos-install = makeProg {

    name = "nixos-install";

    src = ./nixos-install.sh;

    inherit (pkgs) runtimeShell;

    nix = config.nix.package.out;

    path = makeBinPath [

      pkgs.jq

      nixos-enter

      pkgs.util-linuxMinimal

    ];

    manPage = ./manpages/nixos-install.8;

  };

  inherit (pkgs) nixos-build-vms;



  nixos-install = pkgs.nixos-install.override { nix = config.nix.package; };

  nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; };



  nixos-generate-config = makeProg {
@@ -69,16 +52,7 @@ let 
    manPage = ./manpages/nixos-version.8;

  };



  nixos-enter = makeProg {

    name = "nixos-enter";

    src = ./nixos-enter.sh;

    inherit (pkgs) runtimeShell;

    path = makeBinPath [

      pkgs.util-linuxMinimal

    ];

    manPage = ./manpages/nixos-enter.8;

  };



  inherit (pkgs) nixos-enter;

in



{

nixos/modules/installer/tools/nixos-build-vms/build-vms.nix→pkgs/by-name/ni/nixos-build-vms/build-vms.nix

+3 −2
Original line number Diff line number Diff line 
{ system ? builtins.currentSystem

, config ? {}

, nixpkgs

, networkExpr

}:
@@ -9,9 +10,9 @@ let 
    imports = [ module ];

  }) (import networkExpr);



  pkgs = import ../../../../.. { inherit system config; };

  pkgs = import nixpkgs { inherit system config; };



  testing = import ../../../../lib/testing-python.nix {

  testing = import "${pkgs.path}/nixos/lib/testing-python.nix" {

    inherit system pkgs;

  };

nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh→pkgs/by-name/ni/nixos-build-vms/nixos-build-vms.sh

+3 −2
Original line number Diff line number Diff line
@@ -49,5 +49,6 @@ then 
fi



# Build a network of VMs

nix-build '<nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \

    --argstr networkExpr "$networkExpr" "${nixBuildArgs[@]}"
 
nix-build @buildVms@ \

    --argstr networkExpr "$networkExpr" "${nixBuildArgs[@]}" \

    --arg nixpkgs "<nixpkgs>"