summary refs log tree commit diff
path: root/pkgs/os-specific/linux/numactl
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-08-22 23:22:09 +0200
committerGitHub <noreply@github.com>2018-08-22 23:22:09 +0200
commit9b136dd5ed17888daf8b188ceaad434643294231 (patch)
tree355a40ae8c597a82f156466996b59b4cf9ccd52a /pkgs/os-specific/linux/numactl
parent1471e865d2f23689b6ff053ea8a4091211e8bf1e (diff)
parent2741c99060424f0a15228ba523b1e008802bc5c1 (diff)
downloadnixlib-9b136dd5ed17888daf8b188ceaad434643294231.tar
nixlib-9b136dd5ed17888daf8b188ceaad434643294231.tar.gz
nixlib-9b136dd5ed17888daf8b188ceaad434643294231.tar.bz2
nixlib-9b136dd5ed17888daf8b188ceaad434643294231.tar.lz
nixlib-9b136dd5ed17888daf8b188ceaad434643294231.tar.xz
nixlib-9b136dd5ed17888daf8b188ceaad434643294231.tar.zst
nixlib-9b136dd5ed17888daf8b188ceaad434643294231.zip
Merge pull request #45461 from markuskowa/numactl-up
 numactl: 2.0.11 -> 2.0.12
Diffstat (limited to 'pkgs/os-specific/linux/numactl')
-rw-r--r--pkgs/os-specific/linux/numactl/default.nix15
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix
index 4506945ffba2..bf21f92bd66d 100644
--- a/pkgs/os-specific/linux/numactl/default.nix
+++ b/pkgs/os-specific/linux/numactl/default.nix
@@ -2,23 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "numactl-${version}";
-  version = "2.0.11";
+  version = "2.0.12";
 
   src = fetchFromGitHub {
     owner = "numactl";
     repo = "numactl";
     rev = "v${version}";
-    sha256 = "0bcffqawwbyrnza8np0whii25mfd0dria35zal9v3l55xcrya3j9";
+    sha256 = "0crhpxwakp0gvd7wwpbkfd3brnrdf89lkbf03axnbrs0b6kaygg2";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  patches = [
-    (fetchpatch {
-      url = https://raw.githubusercontent.com/gentoo/gentoo/b64d15e731e3d6a7671f0ec6c34a20203cf2609d/sys-process/numactl/files/numactl-2.0.11-sysmacros.patch;
-      sha256 = "05277kv3x12n2xlh3fgnmxclxfc384mkwb0v9pd91046khj6h843";
-    })
-  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
+  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
       url = https://git.alpinelinux.org/cgit/aports/plain/testing/numactl/musl.patch?id=0592b128c71c3e70d493bc7a13caed0d7fae91dd;
       sha256 = "080b0sygmg7104qbbh1amh3b322yyiajwi2d3d0vayffgva0720v";
     });
@@ -34,8 +29,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Library and tools for non-uniform memory access (NUMA) machines";
-    homepage = http://oss.sgi.com/projects/libnuma/;
-    license = licenses.gpl2;
+    homepage = https://github.com/numactl/numactl;
+    license = with licenses; [ gpl2 lgpl21 ]; # libnuma is lgpl21
     platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
     maintainers = with maintainers; [ wkennington ];
   };