diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-13 19:47:36 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-13 19:47:36 +0000 |
commit | f7886ac78be476514a390e3c1fd4cd95f0bcb522 (patch) | |
tree | 7cb4f7ab8e89a0917f89cfc941edf4fd76906594 /pkgs/development | |
parent | fc21cca549d6051b9956d93be2e10e247b05fb02 (diff) | |
parent | 19dde94ddcd74eb683057ca8898e5550d7054f3b (diff) | |
download | nixpkgs-f7886ac78be476514a390e3c1fd4cd95f0bcb522.tar nixpkgs-f7886ac78be476514a390e3c1fd4cd95f0bcb522.tar.gz nixpkgs-f7886ac78be476514a390e3c1fd4cd95f0bcb522.tar.bz2 nixpkgs-f7886ac78be476514a390e3c1fd4cd95f0bcb522.tar.lz nixpkgs-f7886ac78be476514a390e3c1fd4cd95f0bcb522.tar.xz nixpkgs-f7886ac78be476514a390e3c1fd4cd95f0bcb522.tar.zst nixpkgs-f7886ac78be476514a390e3c1fd4cd95f0bcb522.zip |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32265
Diffstat (limited to 'pkgs/development')
20 files changed, 79 insertions, 34 deletions
diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index c2700b01ffa..69596ed66f4 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/" [ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/" [ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/" - for mandir in man1 man3 manCg manCgFX + for mandir in man1 man3 \ + ${if stdenv.system == "x86_64-linux" then "manCg" else ""} manCgFX do mkdir -p "$out/share/man/$mandir/" cp -v share/man/$mandir/* "$out/share/man/$mandir/" diff --git a/pkgs/development/libraries/consolekit/commands.patch b/pkgs/development/libraries/consolekit/commands.patch new file mode 100644 index 00000000000..48b0d5d8cf6 --- /dev/null +++ b/pkgs/development/libraries/consolekit/commands.patch @@ -0,0 +1,33 @@ +This patch adds shutdown commands specific to NixOS, as NixOS does not have +a /sbin or /usr/sbin directory. In order not to have a dependency on the +package that provides "shutdown" when in an environment other than NixOS, +we'll make it depend on /var/run/current-system. + +Note: this patch does not compromise system security. Other systems than +NixOS should have already shutdown in the earlier directories being searched, +and otherwise /var/run is writable only be root. + +--- ConsoleKit-0.4.1/tools/linux/ck-system-restart.org 2012-02-13 11:29:57.352902568 +0100 ++++ ConsoleKit-0.4.1/tools/linux/ck-system-restart 2012-02-13 11:43:27.593317712 +0100 +@@ -7,6 +7,9 @@ + elif [ -x "/usr/sbin/shutdown" ] ; then + /usr/sbin/shutdown -r now + exit $? ++elif [ -x "/var/run/current-system/sw/sbin/shutdown" ] ; then ++ /var/run/current-system/sw/sbin/shutdown -r now ++ exit $? + else + exit 1 + fi +--- ConsoleKit-0.4.1/tools/linux/ck-system-stop.org 2012-02-13 11:30:06.228950934 +0100 ++++ ConsoleKit-0.4.1/tools/linux/ck-system-stop 2012-02-13 11:44:12.664563304 +0100 +@@ -7,6 +7,9 @@ + elif [ -x "/usr/sbin/shutdown" ] ; then + /usr/sbin/shutdown -h now + exit $? ++elif [ -x "/var/run/current-system/sw/sbin/shutdown" ] ; then ++ /var/run/current-system/sw/sbin/shutdown -h now ++ exit $? + else + exit 1 + fi diff --git a/pkgs/development/libraries/consolekit/default.nix b/pkgs/development/libraries/consolekit/default.nix index 5cebc5874bd..e9cedf18857 100644 --- a/pkgs/development/libraries/consolekit/default.nix +++ b/pkgs/development/libraries/consolekit/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 polkit expat ]; patches = [ ./0001-Don-t-daemonize-when-activated.patch - ./0002-Don-t-take-bus-name-until-ready.patch ]; + ./0002-Don-t-take-bus-name-until-ready.patch + ./commands.patch # adds shutdown commands for NixOS to the list of shutdown commands + ]; # For console-kit to get the rpath to libgcc_s, needed for pthread_cancel to work NIX_LDFLAGS = "-lgcc_s"; diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC.nix b/pkgs/development/libraries/haskell/HDBC/HDBC.nix index 30791deea1c..4044c179810 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "HDBC"; - version = "2.3.1.0"; - sha256 = "1y3qcc0ids9k3af4qkhabwg82q03a21wl4vdqhj1h0zmf08b3m6k"; + version = "2.3.1.1"; + sha256 = "1gqihvsf5w7j8xbn1xy93mdrsh77qwxbhfmyjivbm6i95w1i0kb7"; isLibrary = true; isExecutable = true; buildDepends = [ convertible mtl text time utf8String ]; meta = { - homepage = "https://github.com/jgoerzen/hdbc/wiki"; + homepage = "https://github.com/hdbc/hdbc"; description = "Haskell Database Connectivity"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/default.nix index c0b9a0eab82..fb755000477 100644 --- a/pkgs/development/libraries/haskell/attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "attoparsec"; - version = "0.10.1.0"; - sha256 = "1wlil4zxnyrygvkgmap8kcqf4f6rc08ais20alyy4ggzmx73sl9q"; + version = "0.10.1.1"; + sha256 = "07zl85nkimpswlb4rxycisaphhyrlq4la2limxxi7sk21gyh88b0"; buildDepends = [ deepseq text ]; meta = { homepage = "https://github.com/bos/attoparsec"; diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index 7024b08a672..7984bbbc99d 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.9.2"; - sha256 = "1c0xy4g9b5jqy51qhgq7djafqz27z6q7ya31pgy186pfgl7604kr"; + version = "0.9.3"; + sha256 = "1mm16249nprclmgplw5bmmzsnmfm8dlkc5janrwvmlssbxw5hgnk"; isLibrary = true; isExecutable = true; buildDepends = [ transformers ]; diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 59130a5b864..d1a26389c7a 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "0.2.0"; - sha256 = "0ljbxm6rxcxfw51kcjkmb041kz7k6frgc9l6gvfh2s9zrip8zq5v"; + version = "0.2.1"; + sha256 = "1350n6nylvn62pdnm1cpm75yli9x3adf9m9jjz04z0gmzd3mvhd9"; buildDepends = [ liftedBase monadControl text transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index 5882fe3c5bf..736d5f666d0 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -10,5 +10,9 @@ cabal.mkDerivation (self: { description = "Conduit interface for cryptographic operations (from crypto-api)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index 795488adfd0..a6eae113100 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.0.2"; - sha256 = "012hr5ci9j4fwnrc1ypx6ca562vzqlfk5phjs4xl3llxv8afdhgl"; + version = "0.5.0.4"; + sha256 = "1kn73gcjhndb5wbdy9hbjgar1bdcmy8cy831ib4ik1fn62zmvxrf"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml mtl parsec regexPcreBuiltin ]; diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 5b58909231d..6621f13df8e 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,19 +1,19 @@ { cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring , blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate , conduit, cookie, cprngAes, dataDefault, failure, httpTypes -, liftedBase, monadControl, network, regexCompat, socks, text, time -, tls, tlsExtra, transformers, transformersBase, utf8String +, liftedBase, monadControl, mtl, network, regexCompat, socks, text +, time, tls, tlsExtra, transformers, transformersBase, utf8String , zlibConduit }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.2.5"; - sha256 = "0mb85akb7mgdhjkmp041lhqir2gys9bjixn2v1i848mijw1zx8zr"; + version = "1.2.6"; + sha256 = "0gspqkydw5v4wb9s0ipy5s708nmqp3phkh3j95mzn6nlbk2r9kvn"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie - cprngAes dataDefault failure httpTypes liftedBase monadControl + cprngAes dataDefault failure httpTypes liftedBase monadControl mtl network regexCompat socks text time tls tlsExtra transformers transformersBase utf8String zlibConduit ]; diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix index ef3ffbddf1a..94ec52e0ac7 100644 --- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix +++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "numeric-prelude"; - version = "0.3"; - sha256 = "0zxqfsgyg7gf051qjzv57bb1cvrbzlvvyyl2d3gmikyy6h3pis1f"; + version = "0.3.0.1"; + sha256 = "14hi0l4pga4srrfypx4alsyq34y5wsanis6216cds3zjw6db3frg"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 8de94769cb8..7561253d4c0 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.9.1"; - sha256 = "00xwy1afy4cn7z2drsc4dnqd4g45i45v9f3jm9j6i32pz27y8s2a"; + version = "1.9.1.1"; + sha256 = "1npyc99f90fhbfddr6x5dlnwdc3i1pnhg4xiv12fmf1cl8xlcpyl"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 00dc40fc2f2..7ea678266f4 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "0.8.1"; - sha256 = "0av1rzqz80lzirk9l45jiwj4zar6ncy0q9x7dqhsrklyxk4jzv6v"; + version = "0.8.1.1"; + sha256 = "1wl669h8az9wviaq04pwg7w3g5cc90hafn2f1p3jybbif0hpqhks"; buildDepends = [ aeson monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index cd514f7ce23..56031ed3157 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "system-fileio"; - version = "0.3.4"; - sha256 = "184f5bb3qhag6cwmk0zc2ldkwnkzbv82pv7hy541j8jqqi5wprih"; + version = "0.3.5"; + sha256 = "0d1baliykfpg15bzknx98slr0qa5yjr3va3w8hs02wgx6sp3wsy2"; buildDepends = [ systemFilepath text time ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index a1487ddb903..7bd8217b434 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.6.0.2"; - sha256 = "04b642xbbgivbnpc8srqirdf71n5b6h5ir6rw0z2xpiv0znk6vh2"; + version = "0.6.0.3"; + sha256 = "0vj1kh62qs7badv00lcda9m3j53kc069kmrv5lmz62a96y4kx5yi"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index d99bd1a0442..02de60a4944 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai-logger"; - version = "0.1.2"; - sha256 = "0pzbdjy0xkjqkzc5w1v0hh18jgbxlkllsjwxabswkh8gl73mp7d9"; + version = "0.1.3"; + sha256 = "0h9m2vnm81q1zdj0gv3d9vzd2mlm1343div591695fq52ks26cfc"; buildDepends = [ blazeBuilder byteorder caseInsensitive fastLogger httpTypes network time wai diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index be251edffc6..4cb1bb336ee 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "0.8.1"; - sha256 = "10jhvkyxf8j55yzc05p0fmmjsd8fb1sns86vlsl0108947b2pp8v"; + version = "0.8.1.1"; + sha256 = "0wmvywyil6cnpxq777a0w4qknw4lr4i53nni4bcigrvmpg7gzgac"; buildDepends = [ aeson authenticate blazeHtml hamlet httpConduit liftedBase mimeMail persistent persistentTemplate pureMD5 pwstoreFast random SHA diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index 9a130902c47..c93b5e1db8c 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -10,5 +10,9 @@ cabal.mkDerivation (self: { description = "Efficient routing for Yesod"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 90604ed1058..e7744f43e12 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -5,6 +5,7 @@ x@{builderDefsPackage , xproto, libX11, libXmu, libSM, pkgconfig , libXxf86vm, xf86vidmodeproto, libICE , renderproto, libXrender + , nvidia_cg_toolkit , ...}: builderDefsPackage (a : diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix index a7c2e74fa7e..23739451816 100644 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ b/pkgs/development/tools/haskell/HaRe/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HaRe"; - version = "0.6.0.1"; - sha256 = "cd3fa312c7fa6a5f761bbc3ebdbc6300e83ba9e285047acded6269d2164d67f8"; + version = "0.6.0.2"; + sha256 = "13mi6z37fszrl97mll4injhq8dyhqzm344x7y2vw8krr5xjj3kw2"; isLibrary = false; isExecutable = true; buildDepends = [ hint mtl network syb ]; |