Commit Graph

3631 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