Commit Graph

3682 Commits

Author SHA1 Message Date
Vladimír Čunát
4495d06a7f Merge branch 'master' into staging
Conflicts (simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/top-level/all-packages.nix
2015-02-04 22:00:07 +01:00
Nikolay Amiantov
a6050c9268 Merge pull request #6153 from abbradar/android-udev
android-udev-rules: add package
2015-02-04 23:30:01 +03:00
Nikolay Amiantov
104d7e7e62 android-udev-rules: add package 2015-02-04 23:09:47 +03:00
Vladimír Čunát
6517e5c0a8 kernel: 3.4.105 -> 3.4.106 2015-02-04 19:55:47 +01:00
Eric Seidel
ebb8d03f96 darwin-specific stuff 2015-02-03 14:06:13 -08:00
Peter Simons
003896dfe7 Merge pull request #6109 from j-keck/libcap_progs
libcap_progs: fix bash path
2015-02-03 11:17:14 +01:00
j-keck
73ec7f243f libcap_progs: fix bash path
* in progs/capsh.c is the bash path hardcoded to '/bin/bash'.
  * this fix removes the absolute path und use 'execvpe' to call 'bash'.
2015-02-03 11:11:17 +01:00
j-keck
236f7fd20d libcap_progs: fix bash path
* in progs/capsh.c is the bash path hardcoded to '/bin/bash'.
  * this fix set's the bash path from PATH.
2015-02-03 10:25:16 +01:00
Vladimír Čunát
740c6ae240 iwlwifi, iwlegacy: finally fix 404 URLs
Resolved after discussion with upstream, CC #6105.
2015-02-03 10:07:07 +01:00
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
j-keck
eb54864494 libcap_progs: fix bash path
* in progs/capsh.c is the bash path hardcoded to '/bin/bash'
  * this fix set's the path to '/var/run/current-system/sw/bin/bash'
2015-02-02 22:07:23 +01:00
Kosyrev Serge
b9cc04329b fix 404 URLs (close #6105) 2015-02-02 22:05:51 +01:00
aszlig
78bbd6f7c6
linux-testing: Update to version 3.19-rc7.
Running -rc6 always feels kinda rusty and old, so there is the pressing
urge to update... into the future... swooooooosh!

Signature verified against key with fingerprint:

ABAF 11C6 5A29 70B1 30AB  E3C4 79BE 3E43 0041 1886

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-02-02 19:50:56 +01:00
William A. Kennington III
4ddf8af525 zfs_git: Update 2015-02-01 16:00:10 -08:00
William A. Kennington III
c7268fb4bf spl_git: Update 2015-02-01 16:00:03 -08:00
William A. Kennington III
12378faab2 kernel: 3.19-rc5 -> 3.19-rc6 2015-02-01 15:53:48 -08:00
Michael Raskin
5477ccdb7f Update firejail 2015-02-01 18:41:32 +03:00
Michael Raskin
4a29a4baac kernel: 3.12.36 -> 3.12.37 2015-02-01 10:57:47 +03:00
William A. Kennington III
bbd6384f62 kernel: 3.14.29 -> 3.14.31 2015-01-31 18:55:09 -08:00
William A. Kennington III
8a2f7375d6 kernel: 3.18.3 -> 3.18.5 2015-01-31 18:54:59 -08:00
William A. Kennington III
3e1b504cbe kernel: 3.10.65 -> 3.10.67 2015-01-31 17:46:04 -08:00
Vladimír Čunát
dbae4f109f Merge branch 'master' into staging
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-01-31 19:34:57 +01:00
Domen Kožar
2d19af84de Revert "Update path in udev rule of mdadm"
This reverts commit c9364fdbb7.

See https://github.com/NixOS/nixpkgs/pull/6006
2015-01-30 20:55:02 +01:00
Mayeu
5dab625862 Patch kbd to add the dvorak programmer (dvp) keymap 2015-01-30 16:47:08 +01:00
Edward O'Callaghan
32e9704b61 zd1211fw: update from 1.4 to 1.5
Potentially fixes CVE-2012-2187.

Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
2015-01-29 23:54:01 +11:00
Domen Kožar
54f0b25d92 Merge pull request #6006 from ts468/mdadm
Update path in udev rule of mdadm
2015-01-29 10:47:29 +01:00
Thomas Strobel
c9364fdbb7 Update path in udev rule of mdadm 2015-01-29 10:44:06 +01:00
Rob Vermaas
d8cba34bea Update sysdig to 0.1.95 2015-01-28 21:37:09 +01:00
Tobias Geerinckx-Rice
94a600772e Add freefall: hard drive protection on HP/Dell laptops 2015-01-28 15:59:20 +01:00
Peter Simons
76a0ee1945 lxc: update from 1.0.6 to 1.0.7 2015-01-27 14:04:54 +01:00
Tobias Geerinckx-Rice
93faf4cc33 Update sdparm 1.08 -> 1.09
Also specify licence & maintain
2015-01-26 04:35:18 +01:00
Cillian de Róiste
c40a5a4322 xf86_input_wacom: update from 0.27.0 to 0.28.0 2015-01-24 11:23:22 +01:00
aszlig
8ac1765e28
linux-testing: Update to version 3.19-rc5.
Using linux-testing for a bunch of machines, I'd actually expect it to
be more recent than the latest stable, but until now it actually was
behind.

Since torvalds/linux@464ed18ebd, the option
PM_RUNTIME doesn't exist anymore, so we need to remove it from our
common config.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-22 09:56:37 +01:00
Ricardo M. Correia
23ffd6ad22 grsecurity: Update stable and test patches
stable: 3.0-3.14.29-201501182217 -> 3.0-3.14.29-201501211943
test:   3.0-3.18.3-201501182219  -> 3.0-3.18.3-201501211944
2015-01-22 05:39:01 +01:00
Sebastián Bernardo Galkin
3c04907206 Fixup zfs python scripts
zfs ships with a couple of python scripts that needed shebang rewriting. Adding
python as a build dependency enables fixup to do the rewrite. This change
complements 390c838c7f by applying the same to the
git derivation.
2015-01-21 10:00:09 -08:00
Sebastián Bernardo Galkin
390c838c7f Fixup zfs python scripts
zfs ships with a couple of python scripts that needed shebang rewriting. Adding
python as a build dependency enables fixup to do the rewrite.
2015-01-20 23:54:51 -08:00
bbarker
d013149b59 dmtcp: major update (close #5229)
@vcunat: correct location of patched files, use license attribute,
remove file with the older version.
2015-01-20 15:25:39 +01:00
Peter Simons
ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
William A. Kennington III
fb921695b6 kernel: Fix grsec patch for 3.18.3 2015-01-18 21:11:07 -08:00
William A. Kennington III
2c02b7caff kernel: 3.14.28 -> 3.14.29 2015-01-18 21:11:07 -08:00
William A. Kennington III
f23cb7d925 kernel: 3.12.35 -> 3.12.36 2015-01-18 21:11:07 -08:00
William A. Kennington III
9fce7cced9 kernel: 3.10.64 -> 3.10.65 2015-01-18 21:11:07 -08:00
Ricardo M. Correia
e0336a504e spl: Fix mtime going backwards in time
Fixes #5652.
2015-01-18 18:21:35 +01:00
Franz Pletz
9db669d66d alfred: Add new package 2015-01-18 00:02:56 +01:00
Franz Pletz
52c1be07b9 batctl: Update to 2014.4.0 2015-01-18 00:02:53 +01:00
Franz Pletz
0cc2f6ec40 batman-adv: Update to 2014.4.0 2015-01-18 00:02:25 +01:00
Aristid Breitkreuz
46a938ad3a linux 3.18.3 2015-01-17 16:31:13 +00:00
Vladimír Čunát
88089559b9 Merge #5676: gcc-wrapper -> cc-wrapper and related 2015-01-17 08:43:04 +01:00
Ricardo M. Correia
1f28bfa284 grsecurity: Update stable and test patches
stable: 3.0-3.14.28-201501120819 -> 3.0-3.14.28-201501142323
test:   3.0-3.18.2-201501120821  -> 3.0-3.18.2-201501142325
2015-01-16 02:47:12 +01:00
cillianderoiste
1b753579a1 Merge pull request #5775 from nckx/jfbview
Add jfbview 0.4.2: framebuffer PDF/image viewer
2015-01-15 10:26:32 +01:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Tobias Geerinckx-Rice
cf22b82b6c Add jfbview 0.4.2: framebuffer PDF/image viewer 2015-01-14 23:31:47 +01:00
William A. Kennington III
1ec68e0d13 kernel: Fix path to stp bridge helper 2015-01-14 10:34:28 -08:00
William A. Kennington III
3d4b315d91 Revert "kernel: Add a patch to remove checks for bridge stp helpers"
This reverts commit f64c3ce18d.
2015-01-13 15:34:26 -08:00
William A. Kennington III
f64c3ce18d kernel: Add a patch to remove checks for bridge stp helpers 2015-01-13 15:24:02 -08:00
Ludovic Courtès
41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Vladimír Čunát
1575bc652e Merge branch 'master' into staging
Conflicts (simple):
	pkgs/os-specific/linux/util-linux/default.nix

It seems this merge creates a new stdenv hash,
because we had changes on both branches :-/
2015-01-13 18:07:11 +01:00
Ricardo M. Correia
757071af5b grsecurity: Update stable and test patches
stable: 3.0-3.14.28-201501111421 -> 3.0-3.14.28-201501120819
test:   3.0-3.18.2-201501111422  -> 3.0-3.18.2-201501120821
2015-01-12 18:21:22 +01:00
Jaka Hudoklin
e2edf1e01d Merge pull request #5650 from nckx/radeontop2
readeontop: build without patches & include some git bugfixes
2015-01-12 18:14:56 +01:00
Tobias Geerinckx-Rice
40ed9007f1 readeontop: build without patches & include some git bugfixes
Also add my initial longDescription, and build in parallel.
2015-01-12 16:30:28 +01:00
William A. Kennington III
97783b87c0 kernel: 3.14.27 -> 3.14.28 2015-01-11 23:59:13 -08:00
William A. Kennington III
33651bb865 kernel: 3.18.1 -> 3.18.2 2015-01-11 23:58:19 -08:00
William A. Kennington III
6521141d09 kernel: Remove 3.16 2015-01-11 23:55:38 -08:00
William A. Kennington III
ba6648b142 kernel: 3.2.65 -> 3.2.66 2015-01-11 23:55:37 -08:00
William A. Kennington III
980758bdee kernel: 3.17.7 -> 3.17.8 2015-01-11 23:55:37 -08:00
William A. Kennington III
38eb7af3cd kernel: 3.10.63 -> 3.10.64 2015-01-11 23:55:37 -08:00
Ryan Mulligan
2f1a9ef41f afuse: change from git to tarball source 2015-01-11 13:21:37 -08:00
Ryan Mulligan
be4704da66 update afuse to version 0.4.1
addresses #5670, needs testing!
2015-01-10 15:44:31 -08:00
Domen Kožar
9b7b2ce8eb Revert "Introduce patchShebangsPhase ran in preConfigurePhases"
This reverts commit 512fbb280f.

See #5368
2015-01-08 10:26:49 +01:00
Domen Kožar
156b7804b0 Merge pull request #5603 from abbradar/iwlwifi
iwlwifi: re-enable 7265 firmware for 3.17+
2015-01-08 01:53:21 +01:00
William A. Kennington III
bf227494ee mstpd: Fix patch 2015-01-07 13:44:15 -08:00
William A. Kennington III
7c6cbdc145 mstpd: Add derivation 2015-01-07 13:38:04 -08:00
William A. Kennington III
e0098e8408 Revert "linux kernel: set VFIO_PCI_VGA to y for versions > 3.9"
This reverts commit 774486a149.
2015-01-07 10:55:06 -08:00
Jan Malakhovski
774486a149 linux kernel: set VFIO_PCI_VGA to y for versions > 3.9
This allows to passthrough PCI video adapters to KVM virtual machines.
VFIO_PCI is set to `m` by default, which means this will not affect
non-users.
2015-01-07 11:08:58 +00:00
Ricardo M. Correia
e90bfba2f6 grsecurity: Update stable and test patches
stable: 3.0-3.14.27-201412280859 -> 3.0-3.14.27-201501042018
test:   3.0-3.18.1-201412281149  -> 3.0-3.18.1-201501042021
2015-01-07 05:49:56 +01:00
Nikolay Amiantov
635d335b83 iwlwifi: re-enable 7265 firmware for 3.17+ 2015-01-06 16:03:16 +03:00
Peter Simons
c6f9de8932 Merge pull request #5602 from abbradar/iwlwifi
iwlwifi: update firmware
2015-01-06 13:56:23 +01:00
Nikolay Amiantov
fb277ec1ac iwlwifi: update firmware 2015-01-06 15:53:54 +03:00
Nikolay Amiantov
e9d868de63 kernel: enable intel_pstate 2015-01-06 03:07:32 +03:00
William A. Kennington III
b721c27277 pam_krb5: Use the eyrie version 4.7 2015-01-04 22:39:22 -08:00
Arseniy Seroka
6b8b0fd544 Merge pull request #5556 from rycee/package/flashbench
Add package 'flashbench'.
2015-01-04 01:04:40 +03:00
Robert Helgesson
9a3b8068f8 Add package 'flashbench'. 2015-01-03 22:49:08 +01:00
Domen Kožar
d03e88b865 Merge pull request #5560 from rycee/package/radeontop
Add package 'radeontop'.
2015-01-03 21:37:57 +01:00
Robert Helgesson
f9afb8e6cb Add package 'radeontop'. 2015-01-03 21:18:54 +01:00
Vladimír Čunát
6671aff83e linux kernel determinism: unify timestamp style
Testing showed the linux build is sensitive to /usr/include/ncursesw
unless chrooted (on non-nixos).
On a single chrooted nixos machine, -A linux is binary reproducible.

CC #2281 & @alexanderkjeldaas.
2015-01-03 13:54:32 +01:00
William A. Kennington III
6ffde6cd15 cifs-utils: Add more useful dependencies 2015-01-02 17:22:37 -08:00
William A. Kennington III
e0a5b75d9c zfs: Update git version 2015-01-02 12:46:36 -08:00
William A. Kennington III
a47b064595 spl: Update git 2015-01-02 11:38:31 -08:00
Peter Simons
68ab9b7958 Merge pull request #5523 from nckx/util-linux-path
util-linux: fix rtcwake(8) to search $PATH for shutdown(8)
2015-01-02 18:10:51 +01:00
Nikolay Amiantov
c0d95c2f80 linux-firmware: add ibt-hw firmware 2015-01-02 18:26:31 +03:00
Domen Kožar
c510f3da49 fix eval /cc @vcunat 2015-01-02 13:55:19 +01:00
Domen Kožar
512fbb280f Introduce patchShebangsPhase ran in preConfigurePhases
(cherry picked from commit 91c7e8747af1fdc2a70cd98594ccbb12a5c6902d)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-02 02:58:32 +01:00
Tobias Geerinckx-Rice
14eff8f7fa util-linux: fix rtcwake(8) to search $PATH for shutdown(8)
This makes "rtcwake -m off" actually work on NixOS without breaking it
on other platforms.
2015-01-01 22:23:22 +01:00
Peter Simons
37ae6de95d s6: don't depend on GNU Make 4.0
The website gives no indication that version 4.x is required to build
this package, and even it if were, then there should be an override in
all-packages.nix instead of referring to the 'gnumake40' attribute
directly in this expression.
2015-01-01 20:36:58 +01:00
Michael Raskin
fdb785f4d1 Merge pull request #5453 from pmahoney/skarnet-2.0
Update skarnet.org software for 2.0 release.
2015-01-01 16:14:17 +03:00
Vladimír Čunát
d8c5d95330 determinism: change some fixed timestamp to != (time_t)0
vcunat removed the unrelated glib change.
Conflicts:
	pkgs/development/libraries/glib/default.nix
	pkgs/os-specific/linux/kernel/generic.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
2014-12-30 17:03:39 +01:00
Vladimír Čunát
88fd7f4527 Re-Revert merge #5505: util-linux: use /run/current-system/sw/bin/*
This reverts commit 6222093eec.
2014-12-30 10:53:41 +01:00
Vladimír Čunát
6222093eec Revert "merge #5505: use /run/current-system/sw/bin/*"
I didn't realize it causes a nontrivial rebuild (through systemd).
I'll re-push to staging.

This reverts commit 8cf4ef7ab7.
2014-12-30 10:51:36 +01:00
Tobias Geerinckx-Rice
8cf4ef7ab7 merge #5505: use /run/current-system/sw/bin/*
A working /sbin/shutdown (usually provided by systemd) is required by
"rtcwake -m off". Creating a circular dependency on systemd for this
just isn't worth the trouble, so take the straightforward way out.

One could easily make the argument that rtcwake wants to shut down the
*currently running system*, and that the correct API for that *is* in
fact /run/current-system. And it makes a very tempting sort of sense.

@vcunat moved to postPatch and added #FIXME.
2014-12-30 10:31:20 +01:00
William A. Kennington III
afeef240dc kerberos: Use default kerberos instead of krb5 2014-12-30 00:05:12 -08:00