From 86ebd2e6841eb3bbe26bb7b51a85d4ba162ae254 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 6 Oct 2017 23:17:14 +0300 Subject: [PATCH 1/3] kmsxx and pykms: init at 2017-10-03 --- pkgs/development/libraries/kmsxx/default.nix | 27 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 4 +++ 3 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/kmsxx/default.nix diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix new file mode 100644 index 00000000000..7dbe6084dc4 --- /dev/null +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchgit, cmake, pkgconfig, libdrm, pythonBindings ? null }: + +stdenv.mkDerivation rec { + name = "kmsxx-2017-10-03"; + + src = fetchgit { + url = "https://github.com/tomba/kmsxx"; + fetchSubmodules = true; + rev = "35d54fdddd6d7add49efbb0d9dec30816de96c90"; + sha256 = "144gjqz6bxsn4j7k8q8309ph9czmr8rd4vzwfayw3airplnz5zka"; + }; + + enableParallelBuilding = true; + + cmakeFlags = stdenv.lib.optionalString (pythonBindings == null) [ "-DKMSXX_ENABLE_PYTHON=OFF" ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libdrm ] ++ stdenv.lib.optional (pythonBindings != null) pythonBindings; + + meta = with stdenv.lib; { + description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; + homepage = https://github.com/tomba/kmsxx; + license = licenses.mpl20; + maintainers = [ maintainers.gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd3eef00f03..9b783f08de4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12310,6 +12310,8 @@ with pkgs; kmscube = callPackage ../os-specific/linux/kmscube { }; + kmsxx = callPackage ../development/libraries/kmsxx { }; + latencytop = callPackage ../os-specific/linux/latencytop { }; ldm = callPackage ../os-specific/linux/ldm { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4fbf5333917..b575bb59b62 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15604,6 +15604,10 @@ in { pika-pool = callPackage ../development/python-modules/pika-pool { }; platformio = callPackage ../development/python-modules/platformio { }; + pykms = callPackage ../development/libraries/kmsxx { + pythonBindings = python; + }; + pylibconfig2 = buildPythonPackage rec { name = "pylibconfig2-${version}"; version = "0.2.4"; From cf4a2bb111d4e3b414a3e42befef11b51b5944a1 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 8 Oct 2017 14:47:25 +0300 Subject: [PATCH 2/3] kmsxx, pykms: suggestions by @FRidh --- pkgs/development/libraries/kmsxx/default.nix | 9 +++++---- pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index 7dbe6084dc4..06a288ec4de 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pkgconfig, libdrm, pythonBindings ? null }: +{ stdenv, fetchgit, cmake, pkgconfig, libdrm, python }: stdenv.mkDerivation rec { name = "kmsxx-2017-10-03"; @@ -12,10 +12,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = stdenv.lib.optionalString (pythonBindings == null) [ "-DKMSXX_ENABLE_PYTHON=OFF" ]; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libdrm ] ++ stdenv.lib.optional (pythonBindings != null) pythonBindings; + buildInputs = [ libdrm python ]; + + pythonPath = [ ]; + passthru.python = python; meta = with stdenv.lib; { description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b575bb59b62..b990ca52b97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15604,9 +15604,7 @@ in { pika-pool = callPackage ../development/python-modules/pika-pool { }; platformio = callPackage ../development/python-modules/platformio { }; - pykms = callPackage ../development/libraries/kmsxx { - pythonBindings = python; - }; + pykms = callPackage ../development/libraries/kmsxx { }; pylibconfig2 = buildPythonPackage rec { name = "pylibconfig2-${version}"; From 9087f56b32662a98e55adb796c4ade0d02f92736 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 12 Oct 2017 18:01:37 +0300 Subject: [PATCH 3/3] ksmxx: 2017-10-03 -> 2017-10-10 --- pkgs/development/libraries/kmsxx/default.nix | 15 ++++++++------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index 06a288ec4de..490732c3802 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, cmake, pkgconfig, libdrm, python }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm, python }: stdenv.mkDerivation rec { - name = "kmsxx-2017-10-03"; + name = "kmsxx-2017-10-10"; - src = fetchgit { - url = "https://github.com/tomba/kmsxx"; + src = fetchFromGitHub { + owner = "tomba"; + repo = "kmsxx"; fetchSubmodules = true; - rev = "35d54fdddd6d7add49efbb0d9dec30816de96c90"; - sha256 = "144gjqz6bxsn4j7k8q8309ph9czmr8rd4vzwfayw3airplnz5zka"; + rev = "f32b82c17cd357ae1c8ed2636266113955293feb"; + sha256 = "14panqdqq83wh6wym5afdiyrr78mb12ga63pgrppj27kgv398yjj"; }; enableParallelBuilding = true; @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; homepage = https://github.com/tomba/kmsxx; license = licenses.mpl20; - maintainers = [ maintainers.gnidorah ]; + maintainers = with maintainers; [ gnidorah ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b990ca52b97..a8a06bef1e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15604,7 +15604,7 @@ in { pika-pool = callPackage ../development/python-modules/pika-pool { }; platformio = callPackage ../development/python-modules/platformio { }; - pykms = callPackage ../development/libraries/kmsxx { }; + kmsxx = callPackage ../development/libraries/kmsxx { }; pylibconfig2 = buildPythonPackage rec { name = "pylibconfig2-${version}";