Commit graph

64527 commits

Author SHA1 Message Date
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
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
William A. Kennington III 57ee8d6131 xorgserver: Add gcc5 compat patch 2015-06-16 14:21:54 -07:00
Bob van der Linden 6cd67cb218 goPackages: grpc: fix dependencies so that grpc builds 2015-06-16 22:20:00 +02:00
Andraz Brodnik 21bb2caf78 Update scrolls client (src hash change) 2015-06-16 21:02:48 +02:00
Pascal Wittmann f8df92efbe scala-mode2: fix hash 2015-06-16 20:22:55 +02:00
Pascal Wittmann 7d7a5e9f0e add osmo, a handy personal organizer 2015-06-16 20:13:20 +02:00
Pascal Wittmann b73a9a0b68 add libgringotts, a library to encapsulate data in an encrypted structure 2015-06-16 20:13:20 +02:00
Vladimír Čunát f2c84ffeb2 libarchive: fix CVE-2015-1197 by upstream patch
Fixes #6799.
2015-06-16 18:35:13 +02:00
Luca Bruno e37340b49a gnome-pomodoro: move from apps to misc 2015-06-16 15:26:37 +00:00
Luca Bruno 3b2c44fc74 vinagre: add new gnome app 2015-06-16 15:14:41 +00:00
Luca Bruno de142fe63e gtk-vnc: add new lib for gnome 2015-06-16 15:14:41 +00:00
Jascha Geerds 55227b330f khal: 0.4.0 -> 0.5.0 2015-06-16 15:16:06 +02:00
Jascha Geerds 07cdc40222 Merge pull request #7872 from matthiasbeyer/fix-khal_python
Fix: khal 0.4.0 does not work with python 3
2015-06-16 15:06:42 +02:00
Pascal Wittmann d2ad04cd38 add california, a calendar application for gnome 2015-06-16 14:57:20 +02:00
Peter Simons b333a2cb19 openssl: remove some cruft 2015-06-16 14:19:25 +02:00
Domen Kožar ea77ecc2be Merge pull request #7237 from jagajaga/addition/contributing
CONTRIBUTING.md: initial
2015-06-16 14:16:52 +02:00
Eelco Dolstra a4178b1b8a openssl: Update to 1.0.1o
From https://www.openssl.org/news/openssl-1.0.1-notes.html:

"Fix HMAC ABI incompatibility"
2015-06-16 14:16:08 +02:00
Luca Bruno d5628c982d Bypass /etc/gdm/Xsession. Closes #8351 2015-06-16 11:20:20 +00:00
Peter Simons 8a8ed5fa1b ghcjs: unbreak syntax highlighting in Emacs 2015-06-16 13:02:28 +02:00
Peter Simons fbe153989c ghcjs: mark broken
The build has been failing for quite some time.
2015-06-16 13:02:28 +02:00
Peter Simons 90c3d380d1 haskell-wai-session: package is broken 2015-06-16 13:02:27 +02:00
Peter Simons 6390ea5026 haskell-serversession-backend-redis: disable failing test suite 2015-06-16 13:02:27 +02:00
Peter Simons 614769a9ed haskell-serversession: disable failing test suite 2015-06-16 13:02:27 +02:00
Peter Simons 19c5b0a8cd hackage-packages.nix: update to a6e45bb640 with hackage2nix revision 6c4694e3e3d2f6135be35b967f6f459a01789604 2015-06-16 13:02:22 +02:00