diff options
author | Mark H Weaver <mhw@netris.org> | 2015-01-13 12:14:08 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2015-01-13 12:14:08 -0500 |
commit | a813710a5fb0822e9d95088462d70f6522fe8457 (patch) | |
tree | 35299db4712eda92c809635716d530d085223e81 /gnu/packages/linux.scm | |
parent | d8cd15949092b7cd90ee1dcc4aefe87b3ba4a6fb (diff) | |
parent | 765f0ac8f9f67f775a667a4276faf85ddde6d7ea (diff) | |
download | gnu-guix-a813710a5fb0822e9d95088462d70f6522fe8457.tar gnu-guix-a813710a5fb0822e9d95088462d70f6522fe8457.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/linux.scm')
-rw-r--r-- | gnu/packages/linux.scm | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 727d14bbdf..efc7fb7b3f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -905,7 +905,7 @@ transparently through a bridge.") (define-public libnl (package (name "libnl") - (version "3.2.13") + (version "3.2.25") (source (origin (method url-fetch) (uri (string-append @@ -913,7 +913,7 @@ transparently through a bridge.") version ".tar.gz")) (sha256 (base32 - "1ydw42lsd572qwrfgws97n76hyvjdpanwrxm03lysnhfxkna1ssd")))) + "1icfrv8yihcb74as1gcgmp0wfpdq632q2zvbvqqvjms9cy87bswb")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) (home-page "http://www.infradead.org/~tgr/libnl/") @@ -929,6 +929,32 @@ configuration and monitoring interfaces.") ;; 'nl-addr-add.c'), so the result is GPLv2-only. (license gpl2))) +(define-public iw + (package + (name "iw") + (version "3.17") + (source (origin + (method url-fetch) + (uri (string-append + "https://www.kernel.org/pub/software/network/iw/iw-" + version ".tar.xz")) + (sha256 + (base32 + "14zsapqhivk0ws5z21y1ys2c2czi05mzk7bl2yb7qxcfrnsjx9j8")))) + (build-system gnu-build-system) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("libnl" ,libnl))) + (arguments + `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + "CC=gcc") + #:phases (alist-delete 'configure %standard-phases))) + (home-page "http://wireless.kernel.org/en/users/Documentation/iw") + (synopsis "Tool for configuring wireless devices") + (description + "iw is a new nl80211 based CLI configuration utility for wireless +devices. It replaces 'iwconfig', which is deprecated.") + (license isc))) + (define-public powertop (package (name "powertop") |