From 88d2a7cbb59a26bb32e0a22e4ff27b4be8d6a81e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 27 May 2021 00:08:33 +0200 Subject: vdo: init at 8.1.1.287 --- pkgs/os-specific/linux/vdo/default.nix | 64 ++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 pkgs/os-specific/linux/vdo/default.nix (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/vdo/default.nix b/pkgs/os-specific/linux/vdo/default.nix new file mode 100644 index 0000000000000..522468c57e2f6 --- /dev/null +++ b/pkgs/os-specific/linux/vdo/default.nix @@ -0,0 +1,64 @@ +{ lib, stdenv +, fetchFromGitHub +, installShellFiles +, libuuid +, lvm2_dmeventd # +, zlib +, python3 +}: + +stdenv.mkDerivation rec { + pname = "vdo"; + version = "8.1.1.287"; # kvdo uses this! + + src = fetchFromGitHub { + owner = "dm-vdo"; + repo = pname; + rev = version; + sha256 = "1dmfz1rfc7hzqbqmhlk0x4vsp7jivww19gmj5z1gg4fsl9g26wn8"; + }; + + nativeBuildInputs = [ + installShellFiles + ]; + + buildInputs = [ + libuuid + lvm2_dmeventd + zlib + python3.pkgs.wrapPython + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pyyaml + ]; + + pythonPath = propagatedBuildInputs; + + makeFlags = [ + "DESTDIR=${placeholder "out"}" + "INSTALLOWNER=" + # all of these paths are relative to DESTDIR and have defaults that don't work for us + "bindir=/bin" + "defaultdocdir=/share/doc" + "mandir=/share/man" + "python3_sitelib=${python3.sitePackages}" + ]; + + enableParallelBuilding = true; + + postInstall = '' + installShellCompletion --bash $out/bash_completion.d/* + rm -r $out/bash_completion.d + + wrapPythonPrograms + ''; + + meta = with lib; { + homepage = "https://github.com/dm-vdo/vdo"; + description = "A set of userspace tools for managing pools of deduplicated and/or compressed block storage"; + platforms = platforms.linux; + license = with licenses; [ gpl2Plus ]; + maintainers = with maintainers; [ ajs124 ]; + }; +} -- cgit 1.4.1 From 39b3db85f1a60be5a2c28d04bd0b9276e73b2ac3 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 14 Jan 2022 05:07:11 +0100 Subject: lvm2_vdo: init --- pkgs/os-specific/linux/lvm2/common.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index 07e8c9cb02da2..7ba08e7d90342 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -11,6 +11,7 @@ , enableDmeventd ? false , udevSupport ? !stdenv.hostPlatform.isStatic, udev ? null , onlyLib ? stdenv.hostPlatform.isStatic +, enableVDO ? false, vdo ? null , nixosTests }: @@ -18,7 +19,7 @@ assert enableDmeventd -> enableCmdlib; stdenv.mkDerivation rec { - pname = "lvm2" + lib.optionalString enableDmeventd "-with-dmeventd"; + pname = "lvm2" + lib.optionalString enableDmeventd "-with-dmeventd" + lib.optionalString enableVDO "-with-vdo"; inherit version; src = fetchurl { @@ -33,6 +34,8 @@ stdenv.mkDerivation rec { udev ] ++ lib.optionals (!onlyLib) [ libuuid + ] ++ lib.optionals enableVDO [ + vdo ]; configureFlags = [ @@ -58,6 +61,8 @@ stdenv.mkDerivation rec { "--enable-udev_sync" ] ++ lib.optionals stdenv.hostPlatform.isStatic [ "--enable-static_link" + ] ++ lib.optionals enableVDO [ + "--enable-vdo" ]; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d549f884e27bf..93e532580b7ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22978,6 +22978,9 @@ with pkgs; enableDmeventd = true; enableCmdlib = true; }; + lvm2_vdo = lvm2_dmeventd.override { + enableVDO = true; + }; maddy = callPackage ../servers/maddy { }; -- cgit 1.4.1 From 47240ce17480e1aa67ccedb39c9ed3fca419759c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 14 Jan 2022 05:15:03 +0100 Subject: kvdo: init at 8.1.1.287 --- pkgs/os-specific/linux/kvdo/default.nix | 31 +++++++++++++++++++++++++++++++ pkgs/top-level/linux-kernels.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/os-specific/linux/kvdo/default.nix (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kvdo/default.nix b/pkgs/os-specific/linux/kvdo/default.nix new file mode 100644 index 0000000000000..88343e1c8b091 --- /dev/null +++ b/pkgs/os-specific/linux/kvdo/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, vdo, kernel }: + +stdenv.mkDerivation rec { + inherit (vdo) version; + pname = "kvdo"; + + src = fetchFromGitHub { + owner = "dm-vdo"; + repo = "kvdo"; + rev = version; + sha256 = "1plzvw68x16q8a65cyy0pbycajrl03siyh3yh7qr8kmd2i1p1mxc"; + }; + + dontConfigure = true; + enableParallelBuilding = true; + + KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + INSTALL_MOD_PATH = placeholder "out"; + + preBuild = '' + makeFlags="$makeFlags -C ${KSRC} M=$(pwd)" +''; + installTargets = [ "modules_install" ]; + + meta = with lib; { + inherit (vdo.meta) license maintainers; + homepage = "https://github.com/dm-vdo/kvdo"; + description = "A pair of kernel modules which provide pools of deduplicated and/or compressed block storage"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index bd7bacf300044..b0657b01a19b4 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -317,6 +317,8 @@ in { ena = callPackage ../os-specific/linux/ena {}; + kvdo = callPackage ../os-specific/linux/kvdo {}; + liquidtux = callPackage ../os-specific/linux/liquidtux {}; v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; -- cgit 1.4.1 From 29350716d490d390c04ba31a8967211f0f82455f Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 13 Feb 2022 15:29:24 +0100 Subject: (k)vdo: 8.1.1.287 -> 8.1.1.360 --- pkgs/os-specific/linux/kvdo/default.nix | 2 +- pkgs/os-specific/linux/vdo/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kvdo/default.nix b/pkgs/os-specific/linux/kvdo/default.nix index 88343e1c8b091..74895e11bd5aa 100644 --- a/pkgs/os-specific/linux/kvdo/default.nix +++ b/pkgs/os-specific/linux/kvdo/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "dm-vdo"; repo = "kvdo"; rev = version; - sha256 = "1plzvw68x16q8a65cyy0pbycajrl03siyh3yh7qr8kmd2i1p1mxc"; + sha256 = "1xl7dwcqx00w1gbpb6vlkn8nchyfj1fsc8c06vgda0sgxp7qs5gn"; }; dontConfigure = true; diff --git a/pkgs/os-specific/linux/vdo/default.nix b/pkgs/os-specific/linux/vdo/default.nix index 522468c57e2f6..1904445d4c2c5 100644 --- a/pkgs/os-specific/linux/vdo/default.nix +++ b/pkgs/os-specific/linux/vdo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "vdo"; - version = "8.1.1.287"; # kvdo uses this! + version = "8.1.1.360"; # kvdo uses this! src = fetchFromGitHub { owner = "dm-vdo"; repo = pname; rev = version; - sha256 = "1dmfz1rfc7hzqbqmhlk0x4vsp7jivww19gmj5z1gg4fsl9g26wn8"; + sha256 = "1zp8aaw0diramnlx5z96jcpbm6x0r204xf1vwq6k21rzcazczkwv"; }; nativeBuildInputs = [ -- cgit 1.4.1