1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Commit graph

41185 commits

Author SHA1 Message Date
Eelco Dolstra 1c192e1fea Another attempt to fix the installer test
http://hydra.nixos.org/build/9904133
2014-03-30 16:53:23 +02:00
Peter Simons c394d4079d xmonad: fix build with ghc 7.8.1 2014-03-30 16:46:02 +02:00
Vladimir Kirillov bad9de86b6 buildLocalCabal: do not set LANG/LOCALE_ARCHIVE on non-linux machines 2014-03-30 14:51:36 +08:00
Vladimir Kirillov 9186f0b5dd haskell: import persistent-mysql 1.3.0.2 2014-03-30 14:51:36 +08:00
Vladimir Kirillov 390a4b9164 haskell: import git-date 0.2.1 2014-03-30 14:51:36 +08:00
Shea Levy 7612159c06 Merge branch 'mps-fix' of git://github.com/thoughtpolice/nixpkgs
mps: broken on Darwin unfortunately
2014-03-29 22:46:07 -04:00
Rickard Nilsson 61ecf919e1 New package: wal-e
A Postgres WAL-shipping disaster recovery and replication toolkit
2014-03-30 04:34:38 +02:00
Shea Levy fd5d6044c0 Merge branch 'printrun' of git://github.com/ambrop72/nixpkgs
Add Printrun.
2014-03-29 22:19:29 -04:00
Shea Levy 96c3279263 Merge branch 'nvidia-fix' of git://github.com/ambrop72/nixpkgs
nvidia-x11: Fix build with kernel 3.13
2014-03-29 22:17:23 -04:00
Shea Levy 0553bdd148 Merge branch 'cb1cat' of git://github.com/thoughtpolice/nixpkgs
cb0cat is now cb1cat
2014-03-29 22:16:14 -04:00
Shea Levy 84788e75ca Merge branch 'ssdeep' of git://github.com/thoughtpolice/nixpkgs
ssdeep: Fix darwin build
2014-03-29 22:15:26 -04:00
Austin Seipp c038133721 fsharp: fix missing --replace argument
This should fix the Hydra build.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-29 19:55:12 -05:00
Austin Seipp c234740115 mps: broken on Darwin unfortunately
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-29 19:30:13 -05:00
Austin Seipp 81b4248d8d ssdeep: Fix darwin build
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-29 19:28:39 -05:00
Austin Seipp 925cce304f cb0cat is now cb1cat
Submissions for CAESAR are now over, so CBEAMr0 has become CBEAMr1 with
some minor alterations.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-29 18:48:16 -05:00
ambrop7@gmail.com bc2984d77d nvidia-x11: Fix build with kernel 3.13. 2014-03-29 23:35:14 +01:00
ambrop7@gmail.com 9a2758f98d Add Printrun. 2014-03-29 23:17:56 +01:00
ambrop7@gmail.com 090ee41e6b gvfs: Fix build with lightWeight=false (close #2068)
Needed for SMB backend.
2014-03-29 21:51:16 +01:00
Vladimír Čunát e50a76a469 openssh: fix CVE-2014-2653 by a Debian patch 2014-03-29 20:24:13 +01:00
Vladimír Čunát 22c04a2fe1 shishi: minor update to fix build with new libtasn1 2014-03-29 19:44:30 +01:00
Vladimír Čunát a7980953d2 libtasn1: major update 2.14 -> 3.4 2014-03-29 18:38:46 +01:00
Vladimír Čunát 5d26659bb9 nixUnstable: update to avoid the funny --c||es bug :-) 2014-03-29 18:38:46 +01:00
宋文武 5668a70a49 widelands: update to build-18 (close #2062)
@vcunat enabled parallelBuilding.
2014-03-29 18:38:46 +01:00
Bjørn Forsman b5bd583bb8 gcc-arm-embedded: add meta attributes 2014-03-29 18:28:41 +01:00
Shea Levy ee65278d54 Merge branch 'add_n-djbdns' of git://github.com/msackman/nixpkgs
Add New-DJBDNS
2014-03-29 13:06:08 -04:00
Shea Levy 1406226e46 Merge branch 'virtualbox' of git://github.com/Calrama/nixpkgs
Update Virtualbox and Guest Additions to 4.3.10, Oracle Extensions to
93012
2014-03-29 13:01:41 -04:00
ambrop7@gmail.com 8b94e22f33 Add gcc-arm-embedded.
These are packages for precompiled ARM microcontroller compilers from
https://launchpad.net/gcc-arm-embedded.

[Bjørn: modify commit message (add paragraph).]
2014-03-29 17:57:45 +01:00
Shea Levy ac68dc6dc6 Merge branch 'minecraft-server' of git://github.com/thoughtpolice/nixpkgs
nixpkgs: add Minecraft Server & a service module
2014-03-29 12:51:49 -04:00
Matthew Sackman be6a16ccbc Add New-DJBDNS 2014-03-29 16:47:23 +00:00
Maxim Ivanov f949a71aac add libmsgpack C/C++ library (close #2059) 2014-03-29 14:38:53 +01:00
Moritz Maxeiner 99d639d750 Update Virtualbox and Guest Additions to 4.3.10, Oracle Extensions to 93012 2014-03-29 13:44:50 +01:00
Austin Seipp 1acca1c396 nixos: add minecraft-server service
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-29 05:31:27 -05:00
Austin Seipp d60af7f34d minecraft-server: version 1.7.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-29 05:31:24 -05:00
Jaka Hudoklin 227997d8ca nixos/rabbitmq: rewrite
- rewrite from old jobs options to new services
- add simple test
- add dataDir option
2014-03-29 10:56:07 +01:00
Shea Levy c23464672e sloppy sloppy Shea 2014-03-29 05:28:37 -04:00
Shea Levy 38cc80f4d8 D'oh 2014-03-29 05:25:16 -04:00
Shea Levy f6ca125548 buildLocalCabal: Jailbreak by default.
buildLocalCabal is for local convenience anyway
2014-03-29 05:01:50 -04:00
Shea Levy 1eddec9f9b webkitgtk: Fix build with chroot 2014-03-29 05:00:12 -04:00
Michael Raskin 1eb42d9d79 Merge pull request #2048 from echaozh/master
add julia 0.2.1 release
2014-03-28 23:03:04 -07:00
Shea Levy 1d0eb1ae47 Merge branch 'pitivi' of git://github.com/iyzsong/nixpkgs
add pitivi, gstreamer powered non-linear video editor
2014-03-29 00:43:36 -04:00
Shea Levy 4428ed66a2 Merge branch 'webkit' of git://github.com/iyzsong/nixpkgs
webkit: update to 2.4.0, add gtk2 version
2014-03-29 00:41:34 -04:00
Shea Levy 1aa5589eef Merge branch 'virtualbox' of git://github.com/Calrama/nixpkgs
Update VirtualBox (and implicitly VirtualBox Guest Additions) to 4.3.6
and Oracle VM VirtualBox Extension Pack to 91406

Conflicts due to minor upgrade in the mean time

Conflicts:
	nixos/modules/virtualisation/virtualbox-guest.nix
	pkgs/applications/virtualization/virtualbox/default.nix
	pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
2014-03-29 00:23:54 -04:00
Shea Levy 63f97fe9db Merge branch 'slim_fix' of git://github.com/jagajaga/nixpkgs
add normal theme support for slim and slimlock
2014-03-29 00:17:52 -04:00
Shea Levy a0a135d5ef Merge branch 'z3' of git://github.com/thoughtpolice/nixpkgs
z3: version 4.3.1
2014-03-28 23:54:43 -04:00
Shea Levy a82ca6a7f9 Merge branch 'disable-acpid' of git://github.com/ambrop72/nixpkgs
power-management: Don't enable acpid.
2014-03-28 23:52:56 -04:00
Shea Levy 7cebcb995d Merge branch 'cache.pcscd' of git://github.com/wkennington/nixpkgs
Update Smartcard Utils + Fix Daemon Expression
2014-03-28 23:45:00 -04:00
Shea Levy fff798b018 Revert "ccid: Update from 1.4.14 -> 1.4.15"
ccid was already updated in master

This reverts commit a7077973a5.
2014-03-28 23:43:37 -04:00
Shea Levy 701cb6b099 Merge branch 'nixos/containers/fix1' of git://github.com/offlinehacker/nixpkgs
nixos: fix linux containers (systemd-nspawn, lxc, lxc-libvirt)
2014-03-28 23:39:01 -04:00
Shea Levy f3e9e3dea5 Merge branch 'u/icedtea' of git://github.com/wizeman/nixpkgs
icedtea7, icedtea7_web: New packages
2014-03-28 23:25:25 -04:00
Shea Levy e0341475dc Merge branch 'master' of git://github.com/fmap/nixpkgs
Add Mnemosyne 2.2.1
2014-03-28 23:09:25 -04:00