3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

41919 commits

Author SHA1 Message Date
Vladimír Čunát 297bcd2088 pango on darwin: attempt to fix build
Supply older flex (new doesn't build), and disable introspection.
2014-04-10 20:37:52 +02:00
Carles Pagès 8aa84644f9 libtxc_dxtn_s2tc: add v1.0 (close #2194)
S2TC is a patent-free S3TC compatible implementation and provides texture
compression to mesa.
2014-04-10 20:19:49 +02:00
Eelco Dolstra d2155649af Merge branch 'containers'
Fixes #2105.
2014-04-10 15:55:51 +02:00
Eelco Dolstra 6a7a8a144f Document NixOS containers 2014-04-10 15:07:29 +02:00
Eelco Dolstra a34bfbab4c Add option networking.nat.internalInterfaces
This allows applying NAT to an interface, rather than an IP range.
2014-04-10 15:07:29 +02:00
Eelco Dolstra ac8c924c09 nixos-container: Add ‘run’ and ‘root-login’ commands
And remove ‘root-shell’.
2014-04-10 15:07:29 +02:00
Eelco Dolstra da4f180252 Bring back ‘nixos-container update’ 2014-04-10 15:07:29 +02:00
Eelco Dolstra 3dca6b98cb Fix permissions on /var/lib/startup-done 2014-04-10 15:07:28 +02:00
Rickard Nilsson fe7599b2b2 openldap: Update from 2.4.38 to 2.4.39 2014-04-10 14:10:33 +02:00
Rob Vermaas c3c045c59d Add logstash-forwarder. 2014-04-10 13:31:23 +02:00
Peter Simons 8392c8ba9f Merge pull request #2195 from linquize/git-1.9.2
git: Update to 1.9.2
2014-04-10 12:42:53 +02:00
Peter Simons 26d8f54587 Merge pull request #2198 from offlinehacker/nixos/shadow/login_containers_fix
nixos: fix shell on conatiners
2014-04-10 12:39:19 +02:00
Peter Simons 3c7f5870e3 Merge pull request #2197 from offlinehacker/pkgs/lxc/rootfs_fix
lxc: set rootfs path somewhere outside /nix/store
2014-04-10 12:34:08 +02:00
Peter Simons 0e147530ef Merge pull request #2199 from offlinehacker/nixos/ntp/containers_fix
nixos: disable ntp on containers by default
2014-04-10 12:33:35 +02:00
Jaka Hudoklin 0b170187e3 nixos: disable ntp on containers by default 2014-04-10 12:30:03 +02:00
Jaka Hudoklin c69577b7d6 nixos: fix shell on conatiners 2014-04-10 12:28:09 +02:00
Mathijs Kwik 3ada08785f avidemux: make faacSupport optional 2014-04-10 11:57:20 +02:00
Mathijs Kwik bf929ef73b faac is redistributable, hydra is allowed to build it. 2014-04-10 11:57:20 +02:00
Mathijs Kwik 4219eb430d intel-microcode: upgrade to 20140122 2014-04-10 11:57:20 +02:00
Jaka Hudoklin c7e94de91f lxc: set rootfs path somewhere outside /nix/store
This commit fixes lxc to eventually work
2014-04-10 11:46:06 +02:00
aszlig 5dd14a1059
nixos/phpfpm: Add option to set PHP package.
This allows to easily override the used PHP package, especially for
example if you want to use PHP 5.5 or if you want to override the
derivation.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-10 07:52:26 +02:00
Shea Levy 9dcffe951d Merge branch 'cjdns' of git://github.com/ehmry/nixpkgs
cjdns: update to 20130303
2014-04-09 20:34:32 -04:00
Linquize ab12d10f87 git: Update to 1.9.2 2014-04-10 02:02:59 +02:00
Domen Kožar d912cdf264 gstreamer-1.0: use different function name for env hook than gstreamer-0.10 2014-04-09 23:04:57 +00:00
Ricardo M. Correia 5dfc6584a5 grsecurity: Update stable patch from 3.0-3.2.56-201404062126 -> 3.0-3.2.57-201404091758 2014-04-10 00:37:33 +02:00
Ricardo M. Correia c50abd0e13 linux: Update to 3.2.57 2014-04-10 00:37:33 +02:00
Ricardo M. Correia 76551abef2 icedtea7_web: Fix configure phase not finding bash 2014-04-10 00:15:53 +02:00
Ricardo M. Correia f6799983bd icedtea7_web: Update from 1.4.2 -> 1.5
Fixes CVE-2012-4540.
2014-04-10 00:15:53 +02:00
Ricardo M. Correia 442e1bbaab icedtea7: Fix building v2.4.6 by backporting fix
See http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1726
2014-04-10 00:15:47 +02:00
Ricardo M. Correia a644b7ba60 icedtea7: Update from 2.4.5 -> 2.4.6 2014-04-10 00:14:44 +02:00
Ricardo M. Correia 8fdf8984d2 chromium: Update stable channel from 33.0.1750.152 -> 34.0.1847.116 2014-04-10 00:14:44 +02:00
Bjørn Forsman e856584e1a nixos/jenkins-service: fix 'group' option documentation
Both for master and slave.
2014-04-09 21:52:46 +02:00
Rob Vermaas 1e9dee1854 Merge pull request #2193 from aristidb/master
add back old version of flex for grub2
2014-04-09 20:53:55 +02:00
Aristid Breitkreuz 5d12cbf1c2 add back old version of flex for grub2 2014-04-09 20:42:08 +02:00
Domen Kožar d54a805281 gnome3: downgrade 3.12 packages to 3.10 2014-04-09 18:56:54 +02:00
Emery Hemingway 316e809ff8 cjdns: update to 20130303
build system is now nodejs based
new nixos module to start cjdns
2014-04-09 10:30:57 -04:00
Domen Kožar e5e27cfd64 Merge pull request #2153 from lethalman/gnome3
accounts-daemon service, fix gnome-shell, add libgnomekbd, musicbrainz5, sushi, gnome-contacts
2014-04-09 15:01:17 +02:00
Peter Simons 1bf2bd612c haskell-HTF: update to version 0.11.3.0 2014-04-09 13:33:30 +02:00
Peter Simons 011f22e49b haskell-yesod-core: update to version 1.2.11.1 2014-04-09 13:33:30 +02:00
Peter Simons a138d54df2 haskell-websockets: update to version 0.8.2.1 2014-04-09 13:33:30 +02:00
Peter Simons cde2e2839a haskell-warp: update to version 2.1.4 2014-04-09 13:33:30 +02:00
Peter Simons b67feb0990 haskell-warp-tls: update to version 2.0.3.3 2014-04-09 13:33:30 +02:00
Peter Simons 0a74f6d3e7 haskell-wai: update to version 2.1.0.2 2014-04-09 13:33:30 +02:00
Peter Simons 2986e7cb24 haskell-streaming-commons: update to version 0.1.1 2014-04-09 13:33:30 +02:00
Peter Simons f063e5e592 haskell-network-simple: update to version 0.3.1 2014-04-09 13:33:30 +02:00
Peter Simons 7fdd6b1880 haskell-monad-logger: update to version 0.3.5.1 2014-04-09 13:33:30 +02:00
Peter Simons b34cc2cd2e haskell-mime-types: update to version 0.1.0.4 2014-04-09 13:33:30 +02:00
Peter Simons 346f6037c0 haskell-hashed-storage: update to version 0.5.11 2014-04-09 13:33:29 +02:00
Peter Simons 51c6724fa3 haskell-esqueleto: update to version 1.3.10 2014-04-09 13:33:29 +02:00
Peter Simons 7ff62b5ddc haskell-direct-sqlite: update to version 2.3.12 2014-04-09 13:33:29 +02:00