lethalman
0622c4a22d
Merge pull request #8350 from bobvanderlinden/drive
...
added drive package
2015-06-18 11:09:13 +02:00
Rok Garbas
ca407f3738
xdg_utils: fixing some of the impurities in xdg-utilso, #8377
2015-06-18 10:51:35 +02:00
Damien Cassou
2a07d430bd
Merge pull request #8378 from DamienCassou/update-coding-conventions-wm
...
Change where window managers should be
2015-06-18 10:50:57 +02:00
Damien Cassou
8297a9eef9
Change where window managers should be
...
This patch reflects current practice.
Fixes issue #8364 .
2015-06-18 10:44:27 +02:00
Vladimír Čunát
c4406c585c
makeDesktopItem: don't generated a deprecated key
...
Fixes #4319 . We even seem we never override it anywhere.
http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.1.html#deprecated-items
2015-06-18 10:31:48 +02:00
William A. Kennington III
8f63b5e89e
Merge pull request #8359 from NixOS/fix-CVE-2015-4143
...
wpa_supplicant: fix CVE-2015-4143
2015-06-17 20:35:41 -07:00
William A. Kennington III
8a13108d42
Merge pull request #8376 from eduarrrd/rsyslog
...
rsyslog: 8.9.0 -> 8.10.0
2015-06-17 20:34:27 -07:00
William A. Kennington III
295846a254
nixos/nix-serve: Run as a separate user and add a signing key parameter
2015-06-17 19:10:39 -07:00
Eduard Bachmakov
e6f81661aa
rsyslog: 8.9.0 -> 8.10.0
2015-06-17 21:59:54 -04:00
William A. Kennington III
2ae75f3a85
gnutls: 3.4.1 -> 3.4.2
2015-06-17 18:33:10 -07:00
William A. Kennington III
ebb2e41611
openldap: Add gcc5 compat patch
2015-06-17 17:51:12 -07:00
Tobias Geerinckx-Rice
4e5e44140b
dpkg, x2goclient: fix evaluation
...
Bed time.
2015-06-17 23:25:09 +02:00
Peter Simons
bb42c215e2
R: improve support for CRAN and Bioconductor package sets
...
- Update the instructions for re-generating each of the package set files.
- Provide test-evaluation.nix expression to verify that the package sets evaluates.
- Update list of known broken packages.
2015-06-17 23:19:56 +02:00
Jeffrey David Johnson
93a742fd28
R: add support for Bioconductor packages
2015-06-17 23:19:56 +02:00
Arseniy Seroka
97db35a3b4
Merge pull request #8375 from andrewrk/typos
...
fix typos in CONTRIBUTING.md
2015-06-17 23:19:01 +02:00
Peter Simons
84235ff763
haskell-xkbcommon test suite has unspecified dependencies.
2015-06-17 23:17:54 +02:00
Peter Simons
b8446a4d85
haskell: update configuration for Cabal 1.22.4.0
2015-06-17 23:17:54 +02:00
Peter Simons
ef421d6f9b
hackage-packages.nix: update to 0a97083894
with hackage2nix revision 1663fb81050a8be440e74263f022c7b04d3ccd6b
2015-06-17 23:17:48 +02:00
Andrew Kelley
c78005aac2
fix typos in CONTRIBUTING.md
2015-06-17 13:58:36 -07:00
Tobias Geerinckx-Rice
c544a2b74b
nxproxy: add patch file...
2015-06-17 22:24:12 +02:00
Tobias Geerinckx-Rice
98b2d7b727
Separate nativeBuildInputs where maintainers |= nckx
2015-06-17 22:21:32 +02:00
William A. Kennington III
8e19ac8d7c
Merge branch 'master.upstream' into staging.upstream
2015-06-17 11:57:40 -07:00
William A. Kennington III
d4fc2b4d99
nixos/install-grub: Fix grub1 installation
2015-06-17 11:47:36 -07:00
Bob van der Linden
361cf81f30
goPackages: oauth2: use propagatedBuildInputs instead of extraSrcs
2015-06-17 20:13:49 +02:00
Bob van der Linden
5093fd9cc9
added drive package
2015-06-17 20:13:48 +02:00
Rushmore Mushambi
911403c9e5
Merge pull request #8372 from rushmorem/virtio-scsi
...
Make it possible to boot NixOS from a SCSI Disk on KVM (Qemu and All Hardware)
2015-06-17 19:31:32 +02:00
rushmorem
d9c56c696f
Replaces https://github.com/NixOS/nixpkgs/pull/8368
2015-06-17 19:26:17 +02:00
Rushmore Mushambi
bc7f28f19a
Merge pull request #8371 from NixOS/revert-8368-virtio-scsi
...
Revert "Make it possible to boot NixOS from a SCSI Disk on KVM"
2015-06-17 19:19:49 +02:00
Rushmore Mushambi
8170e74d9f
Revert "Make it possible to boot NixOS from a SCSI Disk on KVM"
2015-06-17 19:13:08 +02:00
Rok Garbas
3d2a2fdd6f
pythonPackages: pelican upgrade to 3.6.0 and added ghp-import package
...
- added ghc-import, smartypants and typogrify packages. last 2 needed as
a dependency for pelican buildInputs
- updated pelican to 3.6.0 and enable tests
- added myself (garbas) as maintainer to bunch of packages which I use.
- removed usage if python.isPypy and replace it with isPyPy
2015-06-17 17:55:53 +02:00
Rushmore Mushambi
cad2554c96
Merge pull request #8368 from rushmorem/virtio-scsi
...
Make it possible to boot NixOS from a SCSI Disk on KVM
2015-06-17 17:46:44 +02:00
rushmorem
ee3768b9ba
Make it possible to boot NixOS from a SCSI Disk on KVM
...
Currently NixOS can't boot from a SCSI disk as a KVM Guest.
I found this out while installing it on the new [Linode KVM
platform](https://www.linode.com/docs/platform/kvm#custom-kernel-configuration ).
2015-06-17 17:28:07 +02:00
lethalman
ff3972b217
Merge pull request #8349 from berdario/ansible-win
...
Add support for Windows in ansible
2015-06-17 16:09:37 +02:00
Eelco Dolstra
f93d8425c3
Installer test: Fix booting from SCSI
...
This is required by the GRUB 1 test.
2015-06-17 15:47:43 +02:00
Mateusz Kowalczyk
6563dd251f
tibia: update to 10.79
2015-06-17 14:44:44 +01:00
lethalman
72e59b1047
Merge pull request #8362 from bobvanderlinden/fix-grpc
...
goPackages: grpc: fix dependencies so that grpc builds
2015-06-17 15:20:37 +02:00
Peter Simons
75f82f50e6
Merge pull request #5908 from cstrahan/hoogle-local-ng
...
haskell-ng: hoogleLocal support
I believe this code ought to be used as follows:
{
packageOverrides = pkgs : let self = pkgs.pkgs; in rec {
hsEnv = pkgs.haskell-ng.packages.ghc784.ghcWithPackages (p: with p;
(haskellDev p)
++(myPackages p)
# add more packages here
);
hsEnvHoogle = withHoogle hsEnv;
withHoogle = haskellEnv: with pkgs.haskellngPackages;
import <nixpkgs/pkgs/development/libraries/haskell/hoogle/local.nix> {
stdenv = pkgs.stdenv;
inherit hoogle rehoo ghc;
packages = haskellEnv.paths;
};
};
}
2015-06-17 15:07:07 +02:00
Domen Kožar
101cdcc11a
Merge pull request #8361 from brodul/scrolls2
...
Update scrolls client (src hash change)
2015-06-17 15:02:31 +02:00
Tobias Geerinckx-Rice
d7530a0630
nxproxy: nxcomp: fix "negotiation in stage 10" error
...
Apply backported upstream patch.
2015-06-17 14:03:16 +02:00
lethalman
c1f7f6df4c
Merge pull request #8366 from andrewrk/rhash
...
expose librhash
2015-06-17 13:01:18 +02:00
Andrew Kelley
bb2d249706
expose librhash
2015-06-17 03:01:26 -07:00
Peter Simons
fcd7b6829b
nix-repl: bump version to add support for current versions of Nix
2015-06-17 11:11:25 +02:00
William A. Kennington III
8310045b14
Add missing patch
2015-06-16 23:56:15 -07:00
William A. Kennington III
061887e38a
xf86-video-intel: Kernel 4.0 match
2015-06-16 23:37:05 -07:00
William A. Kennington III
e4316b8c17
xorg-server: 1.16.4 -> 1.17.2
2015-06-16 23:36:11 -07:00
Charles Strahan
af21595eca
ghcjs: fix/bump git refs
2015-06-16 21:26:11 -04:00
Ricardo M. Correia
5ab96e6e2b
Merge pull request #8346 from joachifm/electrum-2_3_2
...
electrum: 2.0.4 -> 2.3.2
2015-06-17 02:41:45 +02:00
William A. Kennington III
bc4e1f3c1a
inetutils: 1.9.3 -> 1.9.4
2015-06-16 15:20:28 -07:00
Peter Simons
7d299447ae
Revert "gmp: Use version 6 as the default"
...
This reverts commit 370fc79b94
, because it causes
trouble on both Linux and Darwin, and we probably shouldn't have to worry about
that kind of stuff right now with the 15.06 release being late'ish already.
2015-06-16 23:59:56 +02:00
William A. Kennington III
01c2ad2525
screen: 4.2.1 -> 4.3.0
2015-06-16 14:28:12 -07:00