Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fabd3f506cc5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3d67d0284d06
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 11, 2020

  1. open-vm-tools: 10.3.10 -> 11.0.1 

    Also update our downstream patch.
    @CheariX @worldofpeace
    CheariX authored and worldofpeace committed Jan 11, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    316c401 View commit details

  2. Merge pull request #75523 from CheariX/open-vm-tools-11.0.1 

    open-vm-tools: 10.3.10 -> 11.0.1
    @worldofpeace
    worldofpeace authored Jan 11, 2020
    Copy the full SHA
    3d67d02 View commit details
Showing with 17 additions and 16 deletions.
  1. +3 −2 pkgs/applications/virtualization/open-vm-tools/default.nix
  2. +14 −14 pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch
5 changes: 3 additions & 2 deletions pkgs/applications/virtualization/open-vm-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@

stdenv.mkDerivation rec {
pname = "open-vm-tools";
version = "10.3.10";
version = "11.0.1";

src = fetchFromGitHub {
owner = "vmware";
repo = "open-vm-tools";
rev = "stable-${version}";
sha256 = "0x2cyccnb4sycrw7r5mzby2d196f9jiph8vyqi0x8v8r2b4vi4yj";
sha256 = "1p499ilb2j1s0d7qf19b8nig8ggdq7b60xcgb7bc18g8kp5g82lv";
};

sourceRoot = "${src.name}/open-vm-tools";
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
mkdir -p common-agent/etc/config
sed -i 's|.*common-agent/etc/config/Makefile.*|\\|' configure.ac
sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am
sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am
sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am
sed -i 's,$(PAM_PREFIX),''${prefix}/$(PAM_PREFIX),' services/vmtoolsd/Makefile.am
28 changes: 14 additions & 14 deletions pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
diff --git a/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index ef202e3..c7a105d 100644
diff --git a/lib/include/guest_os.h b/lib/include/guest_os.h
index 868dec68..0b9a2ad7 100644
--- a/lib/include/guest_os.h
+++ b/lib/include/guest_os.h
@@ -238,6 +238,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
@@ -278,6 +278,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
#define STR_OS_MANDRAKE_FULL "Mandrake Linux"
#define STR_OS_MANDRIVA "mandriva"
#define STR_OS_MKLINUX "MkLinux"
+#define STR_OS_NIXOS "NixOS"
#define STR_OS_NOVELL "nld9"
#define STR_OS_NOVELL_FULL "Novell Linux Desktop 9"
#define STR_OS_ORACLE6 "oraclelinux6"
diff --git a/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 0f55070..2d8467c 100644
diff --git a/lib/misc/hostinfoPosix.c b/lib/misc/hostinfoPosix.c
index 348a67ec..5f8beb2b 100644
--- a/lib/misc/hostinfoPosix.c
+++ b/lib/misc/hostinfoPosix.c
@@ -195,6 +195,7 @@ static const DistroInfo distroArray[] = {
{"Mandrake", "/etc/mandrake-release"},
{"Mandriva", "/etc/mandriva-release"},
{"MkLinux", "/etc/mklinux-release"},
+ {"NixOS", "/etc/os-release"},
{"Novell", "/etc/nld-release"},
{"OracleLinux", "/etc/oracle-release"},
{"Photon", "/etc/lsb-release"},
@@ -554,6 +555,8 @@ HostinfoGetOSShortName(char *distro, // IN: full distro name
@@ -203,6 +203,7 @@ static const DistroInfo distroArray[] = {
{ "Mandrake", "/etc/mandrake-release" },
{ "Mandriva", "/etc/mandriva-release" },
{ "MkLinux", "/etc/mklinux-release" },
+ { "NixOS", "/etc/os-release" },
{ "Novell", "/etc/nld-release" },
{ "OracleLinux", "/etc/oracle-release" },
{ "Photon", "/etc/lsb-release" },
@@ -865,6 +866,8 @@ HostinfoGetOSShortName(const char *distro, // IN: full distro name
}
} else if (strstr(distroLower, "mandrake")) {
Str_Strcpy(distroShort, STR_OS_MANDRAKE, distroShortSize);