mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 06:01:15 +00:00
Code Issues Wiki Activity
41106 commits 325 branches 124 tags 6.8 GiB
Commit graph

34915 commits

Author SHA1 Message Date
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
Maxim Ivanov f949a71aac add libmsgpack C/C++ library (close #2059) 2014-03-29 14:38:53 +01: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
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 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
Shea Levy 269dc17329 Merge branch 'bsdiff' of git://github.com/thoughtpolice/nixpkgs 
bsdiff: adopt and clean up
 2014-03-28 23:08:32 -04:00
Shea Levy 8a15cfdaec Merge branch 'mps' of git://github.com/thoughtpolice/nixpkgs 
Add mps 1.113.0, fix usage of Sleepycat license
 2014-03-28 23:03:20 -04:00
Shea Levy 35165063a7 Merge branch 'clang-fix-fsanitize' of git://github.com/redbaron/nixpkgs 
Fix -fsanitize=... options for clang
 2014-03-28 21:58:56 -04:00
Shea Levy b574394d70 Merge branch 'dwb-update' of git://github.com/pSub/nixpkgs 
Updated dwb to latest revision
 2014-03-28 21:42:51 -04:00
Shea Levy 23fee1cd78 Merge branch 'shellinabox-fix' of git://github.com/grwlf/nixpkgs 
shellinabox: unhardcode /bin/login, apply vt100 '-' fixup
 2014-03-28 21:38:30 -04:00
Shea Levy 1927e59308 Merge branch 'texlive-bump' of git://github.com/jacobhinkle/nixpkgs 
Bump texlive download versions *0215->*0314
 2014-03-28 21:36:25 -04:00
Shea Levy e1a72c00ce Merge branch 'mysql-5.5.37' of git://github.com/proger/nixpkgs 
mysql upgrade to 5.5.37
 2014-03-28 21:13:38 -04:00
Austin Seipp 960690e931 bsdiff: adopt and clean up 
Bonus: simpler build, and should fix the build of bsdiff for Darwin
(patch taken from homebrew).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-28 18:52:37 -05:00
Jacob Hinkle 65727f92e4 Bump texlive download versions *0215->*0314 2014-03-28 15:56:56 -06:00
Eelco Dolstra 98c3caed93 nvidia-x11: Update to 331.49 2014-03-28 16:43:56 +01:00
Sander van der Burg 7c2d4be437 deepmerge: Add nodejs package 2014-03-28 15:17:17 +01:00
Sergey Mironov 0f2d7fa6f6 shellinabox: unhardcode /bin/login, apply vt100 '-' fixup 2014-03-28 14:58:10 +04:00
Zhang Yichao 10511b4712 add julia 0.2.1 release 2014-03-28 18:39:26 +08:00
Pascal Wittmann df2e5fc47a Updated dwb to latest revision 2014-03-28 10:30:36 +01:00
Vladimir Kirillov 1aabffdea2 mysql upgrade to 5.5.37 2014-03-28 11:12:20 +08:00
Peter Simons 812ece044a haskell-DAV: jailbreak to fix build with recent versions of xml-conduit 2014-03-27 23:23:22 +01:00
Peter Simons feed777cf2 haskell-language-javascript: remove pre-generated lexer and parsers to fix the build with GHC 7.8.1 
https://github.com/alanz/language-javascript/issues/26
 2014-03-27 23:23:22 +01:00
Peter Simons 4c8ea71d64 haskell-zlib-bindings: update to version 0.1.1.5 2014-03-27 23:23:22 +01:00
Peter Simons 3c7eb54a80 haskell-yesod: update to version 1.2.5.1 2014-03-27 23:23:22 +01:00
Peter Simons 17d4b3da50 haskell-yesod-static: update to version 1.2.2.3 2014-03-27 23:23:22 +01:00
Peter Simons cbca108acd haskell-yesod-core: update to version 1.2.9.1 2014-03-27 23:23:22 +01:00
Peter Simons a69ae620dc haskell-yesod-auth: update to version 1.3.0.1 2014-03-27 23:23:21 +01:00
Peter Simons 3de1945481 haskell-xml-hamlet: update to version 0.4.0.7 2014-03-27 23:23:21 +01:00
Peter Simons cb55852ff2 haskell-xml-conduit: update to version 1.2.0 2014-03-27 23:23:21 +01:00
Peter Simons 487a6f0971 haskell-wai-app-static: update to version 2.0.1 2014-03-27 23:23:21 +01:00
Peter Simons 0af0e1f5d6 haskell-unbounded-delays: update to version 0.1.0.7 2014-03-27 23:23:21 +01:00
Peter Simons c5d967f781 haskell-text-stream-decode: update to version 0.1.0.5 2014-03-27 23:23:21 +01:00
Peter Simons a7c80c11e5 haskell-smtps-gmail: update to version 1.1.0 2014-03-27 23:23:21 +01:00
Peter Simons 94fe963dd3 haskell-recaptcha: update to version 0.1.0.2 2014-03-27 23:23:21 +01:00
Peter Simons 8470a695ed haskell-project-template: update to version 0.1.4 2014-03-27 23:23:21 +01:00
Peter Simons 14bb8fae6d haskell-profunctors: update to version 4.0.3 2014-03-27 23:23:21 +01:00
Peter Simons 3d00b619ca haskell-linear: update to version 1.10 2014-03-27 23:23:21 +01:00
Peter Simons f0e51dd0d6 haskell-language-c-quote: update to version 0.7.7 2014-03-27 23:23:21 +01:00
Peter Simons bc1bfe32e3 haskell-http-reverse-proxy: update to version 0.3.1.2 2014-03-27 23:23:21 +01:00