diff options
author | Peter Simons <simons@cryp.to> | 2013-04-05 11:23:38 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2013-04-05 11:23:38 +0200 |
commit | 9f4d510b6b0288a85de1a29d081f4b1a374324ff (patch) | |
tree | 252326207267d45dc703e76034aa1038b1b78018 /pkgs | |
parent | e12e62001bef98b4983579c505d772e8362a590b (diff) | |
parent | 47e93cd27e5fc6225a85b156ec9340f190e6242c (diff) | |
download | nixpkgs-9f4d510b6b0288a85de1a29d081f4b1a374324ff.tar nixpkgs-9f4d510b6b0288a85de1a29d081f4b1a374324ff.tar.gz nixpkgs-9f4d510b6b0288a85de1a29d081f4b1a374324ff.tar.bz2 nixpkgs-9f4d510b6b0288a85de1a29d081f4b1a374324ff.tar.lz nixpkgs-9f4d510b6b0288a85de1a29d081f4b1a374324ff.tar.xz nixpkgs-9f4d510b6b0288a85de1a29d081f4b1a374324ff.tar.zst nixpkgs-9f4d510b6b0288a85de1a29d081f4b1a374324ff.zip |
Merge branch 'master' into stdenv-updates.
Diffstat (limited to 'pkgs')
37 files changed, 330 insertions, 70 deletions
diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix new file mode 100644 index 00000000000..cc80a96306f --- /dev/null +++ b/pkgs/applications/audio/gmpc/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, libtool, intltool, pkgconfig, glib +, gtk, curl, mpd_clientlib, libsoup, gob2, vala +}: + +stdenv.mkDerivation rec { + name = "gmpc-${version}"; + version = "11.8.16"; + + libmpd = stdenv.mkDerivation { + name = "libmpd-11.8.17"; + src = fetchurl { + url = http://download.sarine.nl/Programs/gmpc/11.8/libmpd-11.8.17.tar.gz; + sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y"; + }; + buildInputs = [ pkgconfig glib ]; + }; + + libunique = stdenv.mkDerivation { + name = "libunique-1.1.6"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/sources/libunique/1.1/libunique-1.1.6.tar.gz; + sha256 = "2cb918dde3554228a211925ba6165a661fd782394bd74dfe15e3853dc9c573ea"; + }; + buildInputs = [ pkgconfig glib gtk ]; + + patches = [ + (fetchurl { + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/remove_G_CONST_RETURN.patch?h=packages/libunique"; + sha256 = "0da2qi7cyyax4rr1p25drlhk360h8d3lapgypi5w95wj9k6bykhr"; + }) + ]; + }; + + src = fetchurl { + url = "http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz"; + sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556"; + }; + + buildInputs = [ + libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup + libunique libmpd gob2 vala + ]; + + meta = with stdenv.lib; { + homepage = http://gmpclient.org; + description = "A GTK2 frontend for Music Player Daemon"; + license = licenses.gpl2; + maintainers = [ maintainers.rickynils ]; + }; +} diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/applications/audio/mid2key/default.nix new file mode 100644 index 00000000000..1e163391a39 --- /dev/null +++ b/pkgs/applications/audio/mid2key/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, alsaLib, libX11, libXi, libXtst, xextproto }: + +stdenv.mkDerivation rec { + name = "mid2key-r1"; + + src = fetchurl { + url = "http://mid2key.googlecode.com/files/${name}.tar.gz"; + sha256 = "0j2vsjvdgx51nd1qmaa18mcy0yw9pwrhbv2mdwnf913bwsk4y904"; + }; + + unpackPhase = "tar xvzf $src"; + + buildInputs = [ alsaLib libX11 libXi libXtst xextproto ]; + + buildPhase = "make"; + + installPhase = "mkdir -p $out/bin && mv mid2key $out/bin"; + + meta = with stdenv.lib; { + homepage = http://code.google.com/p/mid2key/; + description = "A simple tool which maps midi notes to simulated keystrokes"; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix new file mode 100644 index 00000000000..e422eee363c --- /dev/null +++ b/pkgs/applications/audio/normalize/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "normalize-${version}"; + version = "0.7.7"; + + src = fetchurl { + url = "http://savannah.nongnu.org/download/normalize/normalize-0.7.7.tar.gz"; + sha256 = "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0"; + }; + + meta = with stdenv.lib; { + homepage = http://normalize.nongnu.org/; + description = "Audio file normalizer"; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix index 056ad81feb5..8f36fd485dd 100644 --- a/pkgs/applications/taxes/aangifte-2012/default.nix +++ b/pkgs/applications/taxes/aangifte-2012/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation { '' mkdir -p $out cp -prvd * $out/ - wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin + wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin \ + --prefix LD_PRELOAD : $(cat $NIX_GCC/nix-support/orig-gcc)/lib/libgcc_s.so.1 ''; meta = { diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 65625ff2769..afc7bca2d1a 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "rcs-5.8.1"; + name = "rcs-5.8.2"; src = fetchurl { url = "mirror://gnu/rcs/${name}.tar.gz"; - sha256 = "1b1y6s4gy3miv2bvx0z01kvnv58h35sw766lccdkxkalk43cml04"; + sha256 = "1p4kqqrvc7plc3n6ls4xwp6d3mw1jcx9p36pilwd65q31mgbs07a"; }; doCheck = true; diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix index 79c25d65c05..2f35d02eb90 100644 --- a/pkgs/applications/video/mplayer2/default.nix +++ b/pkgs/applications/video/mplayer2/default.nix @@ -74,6 +74,8 @@ stdenv.mkDerivation rec { prePatch = '' sed -i /^_install_strip/d configure + + sed -i '/stdlib/a#include <ctype.h>/' sub/sub*.c ''; buildInputs = with stdenv.lib; diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index db469268350..82eb9e56935 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -1,7 +1,10 @@ {stdenv, fetchurl, libX11, libXinerama, patches ? []}: -stdenv.mkDerivation rec { +let name = "dwm-6.0"; +in +stdenv.mkDerivation { + inherit name; src = fetchurl { url = "http://dl.suckless.org/dwm/${name}.tar.gz"; @@ -13,7 +16,7 @@ stdenv.mkDerivation rec { prePatch = ''sed -i "s@/usr/local@$out@" config.mk''; # Allow users set their own list of patches - inherit patches; + patches = [ ./confnotify-6.0.patch ] ++ patches; buildPhase = " make "; diff --git a/pkgs/desktops/e17/default.nix b/pkgs/desktops/e17/default.nix index f241f3ff0a6..648a3577863 100644 --- a/pkgs/desktops/e17/default.nix +++ b/pkgs/desktops/e17/default.nix @@ -36,6 +36,7 @@ rec { #### APPLICATIONS + terminology = callPackage ./terminology { }; diff --git a/pkgs/desktops/e17/e_dbus/default.nix b/pkgs/desktops/e17/e_dbus/default.nix index 44eaf2328ec..cfc0203b3e0 100644 --- a/pkgs/desktops/e17/e_dbus/default.nix +++ b/pkgs/desktops/e17/e_dbus/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig zlib libjpeg expat ecore eina evas ]; propagatedBuildInputs = [ dbus_libs ]; + setupHook = ./setup-hook.sh; configureFlags = '' --disable-edbus-test --disable-edbus-test-client diff --git a/pkgs/desktops/e17/e_dbus/setup-hook.sh b/pkgs/desktops/e17/e_dbus/setup-hook.sh new file mode 100644 index 00000000000..d98f24b4c04 --- /dev/null +++ b/pkgs/desktops/e17/e_dbus/setup-hook.sh @@ -0,0 +1,8 @@ +addDbusIncludePath () { + if test -d "$1/include/dbus-1.0" + then + export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/include/dbus-1.0 -I $1/lib/dbus-1.0/include" + fi +} + +envHooks=(${envHooks[@]} addDbusIncludePath) diff --git a/pkgs/desktops/e17/emotion/default.nix b/pkgs/desktops/e17/emotion/default.nix index 42790162171..9ec3631b1e7 100644 --- a/pkgs/desktops/e17/emotion/default.nix +++ b/pkgs/desktops/e17/emotion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ecore, evas, eet, eina, edje }: +{ stdenv, fetchurl, pkgconfig, ecore, evas, eet, eina, edje, vlc }: stdenv.mkDerivation rec { name = "emotion-${version}"; version = "1.7.5"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; sha256 = "1sfw8kpj2fcqymzd6q7p51xxib1n2arvjl1hnwhqkvwhlsq2b4sw"; }; - buildInputs = [ pkgconfig ecore evas eet eina edje ]; + buildInputs = [ pkgconfig ecore evas eet eina edje vlc ]; meta = { description = "A library to easily integrate media playback into EFL applications"; longDescription = '' diff --git a/pkgs/desktops/e17/ethumb/default.nix b/pkgs/desktops/e17/ethumb/default.nix index 3d1114e0171..344abe1e3f1 100644 --- a/pkgs/desktops/e17/ethumb/default.nix +++ b/pkgs/desktops/e17/ethumb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, eina, evas, ecore, edje, eet }: +{ stdenv, fetchurl, pkgconfig, eina, evas, ecore, edje, eet, e_dbus, emotion, libexif }: stdenv.mkDerivation rec { name = "ethumb-${version}"; version = "1.7.5"; @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; sha256 = "0prka3knz8p2n46dfrzgwn55khhhrhjny4vvnzkjcwmhvz7kgc9l"; }; - buildInputs = [ pkgconfig eina evas ecore edje eet ]; + buildInputs = [ pkgconfig eina evas ecore edje eet emotion libexif ]; + propagatedBuildInputs = [ e_dbus libexif ]; meta = { description = "A thumbnail generation library"; longDescription = '' @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { * create thumbnails with a predefined frame (possibly an edje frame); * have an option to create fdo-like thumbnails; * have a client/server utility; - * TODO: make thumbnails from edje backgrounds, icons and themes; + * TODO: make thumbnails from edje backgrounds, icons and themes; ''; homepage = http://enlightenment.org/; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/desktops/e17/terminology/default.nix b/pkgs/desktops/e17/terminology/default.nix new file mode 100644 index 00000000000..f060d81bd00 --- /dev/null +++ b/pkgs/desktops/e17/terminology/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, pkgconfig, elementary, eina, eet, evas, edje, emotion, ecore, ethumb, efreet }: + +stdenv.mkDerivation rec { + name = "terminology-${version}"; + version = "0.3.0"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.gz"; + sha256 = "1dn5bjswqgnqza7bngc6afqza47yh27xfwf5qg2kzfgs008hp1bp"; + }; + buildInputs = [ pkgconfig elementary eina eet evas ecore edje emotion ecore ethumb efreet ]; + + meta = { + description = "Terminology, the E17 terminal emulator"; + homepage = http://www.enlightenment.org/p.php?p=about/terminology; + license = stdenv.lib.licenses.bsd2; # not sure + }; +} diff --git a/pkgs/development/libraries/ffmpeg/1.1.nix b/pkgs/development/libraries/ffmpeg/1.x.nix index 9266250527e..119e785ea4f 100644 --- a/pkgs/development/libraries/ffmpeg/1.1.nix +++ b/pkgs/development/libraries/ffmpeg/1.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib +{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl , mp3Support ? true, lame ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null @@ -29,11 +29,11 @@ assert x11grabSupport -> libXext != null && libXfixes != null; assert playSupport -> SDL != null; stdenv.mkDerivation rec { - name = "ffmpeg-1.1.3"; + name = "ffmpeg-1.2"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j"; + sha256 = "1bssxbn4p813xlgb8whg4b60j90yzfy92x70b4q8j35fgp0gnfcs"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional x11grabSupport "--enable-x11grab" ++ stdenv.lib.optional playSupport "--enable-ffplay"; - buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ] + buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ] ++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional speexSupport speex ++ stdenv.lib.optional theoraSupport libtheora diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix index e32929fb4ee..53aa634aa72 100644 --- a/pkgs/development/libraries/haskell/cipher-aes/default.nix +++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cipher-aes"; - version = "0.1.7"; - sha256 = "1iai9c4rvxframylvc0xwx2nk6s0rsj4dc42wi334xyinilvfyng"; + version = "0.1.8"; + sha256 = "171mj9abm0x9bg6mf225mhb25i7xh4v5la5866llb1qrrpvsk1xf"; testDepends = [ QuickCheck testFramework testFrameworkQuickcheck2 ]; diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix index 9a73f6d74ec..31e3f742310 100644 --- a/pkgs/development/libraries/haskell/data-default/default.nix +++ b/pkgs/development/libraries/haskell/data-default/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "data-default"; - version = "0.5.2"; - sha256 = "1w9wqv3k579zp5w11v06fak0lr9zzads49b1c9rb1vkz1d8bvf82"; + version = "0.5.3"; + sha256 = "0d1hm0l9kim3kszshr4msmgzizrzha48gz2kb7b61p7n3gs70m7c"; buildDepends = [ dataDefaultClass dataDefaultInstancesBase dataDefaultInstancesContainers dataDefaultInstancesDlist diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix new file mode 100644 index 00000000000..483271fe959 --- /dev/null +++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix @@ -0,0 +1,21 @@ +{ cabal, aeson, certificate, conduit, cryptoApi, cryptoRandomApi +, network, networkConduit, pem, systemFileio, systemFilepath, tls +, tlsExtra, transformers +}: + +cabal.mkDerivation (self: { + pname = "network-conduit-tls"; + version = "1.0.0.2"; + sha256 = "1vzhalz6hxal73rxm6f2l9m7j34mldamz16wrb6ay67wg6giq55z"; + buildDepends = [ + aeson certificate conduit cryptoApi cryptoRandomApi network + networkConduit pem systemFileio systemFilepath tls tlsExtra + transformers + ]; + meta = { + homepage = "https://github.com/snoyberg/conduit"; + description = "Create TLS-aware network code with conduits"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix new file mode 100644 index 00000000000..7de31bcf656 --- /dev/null +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -0,0 +1,20 @@ +{ cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault +, httpTypes, mtl, regexCompat, resourcet, text, wai, waiExtra, warp +}: + +cabal.mkDerivation (self: { + pname = "scotty"; + version = "0.4.6"; + sha256 = "0g83kgqr1p03z7dks6x00id2gz95kkw00wmwp5vyz4zvx1mmmvk8"; + buildDepends = [ + aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes + mtl regexCompat resourcet text wai waiExtra warp + ]; + meta = { + homepage = "https://github.com/ku-fpg/scotty"; + description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.simons ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix new file mode 100644 index 00000000000..6ee4304ac17 --- /dev/null +++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix @@ -0,0 +1,15 @@ +{ cabal, conduit, hspec, transformers }: + +cabal.mkDerivation (self: { + pname = "unix-process-conduit"; + version = "0.2.0.2"; + sha256 = "1n9ja7dlxhsxyglfzk397xdgvdny766y1isrb5d065srxprsj2g6"; + buildDepends = [ conduit transformers ]; + testDepends = [ conduit hspec transformers ]; + meta = { + homepage = "https://github.com/snoyberg/conduit"; + description = "Run processes on Unix systems, with a conduit interface"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix index e119b2ab737..b8c72a4251e 100644 --- a/pkgs/development/libraries/haskell/uuid/default.nix +++ b/pkgs/development/libraries/haskell/uuid/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "uuid"; - version = "1.2.9"; - sha256 = "088wbhf21w91774icddbm3a8p8jikwjqgg8zdad0pdv8zbi7flsi"; + version = "1.2.10"; + sha256 = "17njmmh190pg9bpb8iaw2kniyn7z7j70mzdmxr9h29kydl1xmky6"; buildDepends = [ binary cryptohash maccatcher random time ]; testDepends = [ criterion deepseq HUnit mersenneRandomPure64 QuickCheck random diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 59851eda25a..b9b08433a62 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchurl, cmake, alsaLib }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { #The current release is still in a testing phase, though it should be stable # (neither the ABI or API will break). Please try it out and let me know how it # works. :-) - name = "openal-soft-1.1.93"; + version = "1.15.1"; + name = "openal-soft-${version}"; src = fetchurl { - url = http://kcat.strangesoft.net/openal-releases/openal-soft-1.1.93.tar.bz2; - sha256 = "162nyv4jy6qzi7s5q3wpdawfph6npyn1n4wjf21haxdxq0mmp6l7"; + url = "http://kcat.strangesoft.net/openal-releases/${name}.tar.bz2"; + sha256 = "0mmhdqiyb3c9dzvxspm8h2v8jibhi8pfjxnf6m0wn744y1ia2a8f"; }; buildInputs = [ cmake alsaLib ]; diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 22dde229a2b..31cbb94c729 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.47"; - sha256 = "1ba0ny610ibynwvzqnk5h2461sdkmza5jqrizqxvhp9wknn50fc6"; + version = "1.48"; + sha256 = "0175bprjisjzs0y1xga1xqcy5jx6xlbrvsw6095j12xvyrvzrggr"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix new file mode 100644 index 00000000000..f9d09abcc3f --- /dev/null +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -0,0 +1,28 @@ +{ cabal, attoparsec, blazeBuilder, caseInsensitive, conduit +, dataDefault, filepath, hinotify, httpConduit, httpReverseProxy +, httpTypes, mtl, network, networkConduit, networkConduitTls +, random, regexTdfa, systemFileio, systemFilepath, tar, text, time +, transformers, unixCompat, unixProcessConduit, wai, waiAppStatic +, yaml, zlib +}: + +cabal.mkDerivation (self: { + pname = "keter"; + version = "0.3.6.1"; + sha256 = "0jww64q74kx5h69mnv9wgc4kx0nlb06r7lf651gjkai8mf9dkqf2"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + attoparsec blazeBuilder caseInsensitive conduit dataDefault + filepath hinotify httpConduit httpReverseProxy httpTypes mtl + network networkConduit networkConduitTls random regexTdfa + systemFileio systemFilepath tar text time transformers unixCompat + unixProcessConduit wai waiAppStatic yaml zlib + ]; + meta = { + homepage = "http://www.yesodweb.com/"; + description = "Web application deployment manager, focusing on Haskell web frameworks"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix index dfb20e0ac76..0cf3904f6d4 100644 --- a/pkgs/development/tools/haskell/uuagc/default.nix +++ b/pkgs/development/tools/haskell/uuagc/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc"; - version = "0.9.42.2"; - sha256 = "1l7w3gimcx079giw5ri4qfr1xfi1wfj93v29r8hvs8q8a6ffjifn"; + version = "0.9.42.3"; + sha256 = "0rn0wqccg2v4akh3wj16s5y60fscdfjpvrpsmvbc2vfq2v33y53n"; isLibrary = true; isExecutable = true; buildDepends = [ filepath haskellSrcExts mtl uuagcCabal uulib ]; diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix new file mode 100644 index 00000000000..6036d7fabd5 --- /dev/null +++ b/pkgs/games/dhewm3/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, unzip, cmake, SDL, mesa, zlib, libjpeg, libogg, libvorbis +, openalSoft, curl }: + +stdenv.mkDerivation rec { + hash = "92a41322f4aa8bd45395d8088721c9a2bf43c79b"; + name = "dhewm3-20130113-${hash}"; + src = fetchurl { + url = "https://github.com/dhewm/dhewm3/zipball/${hash}"; + sha256 = "0c17k60xhimpqi1xi9s1l7jbc97pqjnk4lgwyjb0agc3dkr73zwd"; + }; + + # Add mesa linking + patchPhase = '' + sed -i 's/\<idlib\()\?\)$/idlib GL\1/' CMakeLists.txt + ''; + + unpackPhase = '' + unzip ${src} + cd */neo + ''; + + buildInputs = [ unzip cmake SDL mesa zlib libjpeg libogg libvorbis openalSoft + curl ]; + + enableParallelBuilding = true; + + meta = { + homepage = https://github.com/dhewm/dhewm3; + description = "Doom 3 port to SDL"; + license = "GPLv3"; + }; + +} diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 4495e8177f4..4f68048be67 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -231,7 +231,7 @@ in import ./generic.nix ( rec { - version = "3.0.70"; + version = "3.0.71"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -239,7 +239,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0hxb457mixpcq43dg0lnbkfdjnzqw4ajfcfkyyfgdzn5496li6va"; + sha256 = "1qavk6kp84h02bs0clhpri148lfj7zdzj7jjy07vw0h48lmj1405"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index aef013bf50a..2223f14b043 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -245,7 +245,7 @@ in import ./generic.nix ( rec { - version = "3.4.37"; + version = "3.4.38"; testing = false; preConfigure = '' @@ -254,7 +254,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0f7gbspi28a29vvvv0x2818pwhyjry4wzdm5d1nknf3a0cdi8an7"; + sha256 = "1j3389frp98f7l4l4mp1lyw5g1g9yll6fayiyz7dsnx8fkxsga4h"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix index 54550885fa6..d0926f267ea 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix @@ -261,7 +261,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1f1b6e09cb6ba656b28a41eb9e16e11576879f14574c0cb861b24734f3c5899f"; + sha256 = "17w9qprk8ixjc6w0qk2p2jgqfxhmw4b9xss1iar5d9kbrc4nw6qz"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix index 6340e71bf8a..b6da87f4578 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix @@ -252,8 +252,8 @@ in import ./generic.nix ( rec { - version = "3.9-rc3"; - modDirVersion = "3.9.0-rc3"; + version = "3.9-rc4"; + modDirVersion = "3.9.0-rc4"; testing = true; preConfigure = '' @@ -262,7 +262,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1fbg952zzn6nkch2fpd1fzkwc6xsf66fnmkxrmc77yz8d29qddi5"; + sha256 = "15mjsxa8xl233k004a2myg24l1x5rp22icdpy5r165rhbknbb1as"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 08d55fc6ec6..660676865b0 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; -let versionNumber = "310.32"; in +let versionNumber = "313.30"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.version}"}"; @@ -21,12 +21,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "13dc2s312h4k4bp7qb2ymdafr739jxbh0f3h1ilrkyjkd945cgnl"; + sha256 = "1ba9mphvynni44dv3mwx9a9819drmrc4n82f4i58xjhvkfbi03qa"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "1wk0lcm712glffdmwpk4drrwb0fjva7qhpxylnqs7fl7d3acnsvq"; + sha256 = "1ggd3raxax99xnbphf945f0ggj5kq30jnknhyqy2fha9is1jbnjp"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index 37713d87fd5..c8597def61e 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.4.16"; in +let version = "8.4.17"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0bv10jh9pg523rzgbqjq4lzq4ai3275pqhkg0qkr40ap756xj0wd"; + sha256 = "0dh4rn4q2amqjwmjjiya99bz1ph3lx45j5brnpwdjd9mxhs4r26w"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index c0766ba2813..ea25cf0d476 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.0.12"; in +let version = "9.0.13"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "090m5cxw7jv9q2jgwbs3qm57z6ldf0mcavc0wsmqk1ywrdrniw40"; + sha256 = "0xwrmwrx0pm21w3ifrqcmb8k2sa46w491ff3gqqfxynyk78a9bji"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 18716707fd9..b9436cb4b08 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.1.8"; in +let version = "9.1.9"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0vacnhqs9mrjrx9vh4r66a9smwl1d4qrmjlsq3ydnqj0lbfzk20x"; + sha256 = "1n1dc1kqc487dylc22iq1j8sn93jxbqm2g4b5rr0i4q0h7hk7998"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 45173ad6511..89de740b303 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.2.3"; in +let version = "9.2.4"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0zszqgp64pn7z9ab36bi989apj6hi20yxvcrk26jvhy0j0radxf4"; + sha256 = "14xfzw3hb2fn60c438v3j7wa65jjm2pnmx4qb4i4ji4am0cdjzfr"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3af959ac48..75b823eba3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -556,7 +556,7 @@ let cfdg = builderDefsPackage ../tools/graphics/cfdg { inherit libpng bison flex; - ffmpeg = ffmpeg_1_1; + ffmpeg = ffmpeg_1; }; checkinstall = callPackage ../tools/package-management/checkinstall { }; @@ -3663,7 +3663,7 @@ let vpxSupport = !stdenv.isMips; }; - ffmpeg_1_1 = callPackage ../development/libraries/ffmpeg/1.1.nix { + ffmpeg_1 = callPackage ../development/libraries/ffmpeg/1.x.nix { vpxSupport = !stdenv.isMips; }; @@ -4628,7 +4628,7 @@ let mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; mlt = callPackage ../development/libraries/mlt { - ffmpeg = ffmpeg_1_1; + ffmpeg = ffmpeg_1; }; libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; @@ -5547,7 +5547,7 @@ let OVMF = callPackage ../applications/virtualization/OVMF { }; - postgresql = postgresql83; + postgresql = postgresql92; postgresql83 = callPackage ../servers/sql/postgresql/8.3.x.nix { }; @@ -7193,6 +7193,8 @@ let gqview = callPackage ../applications/graphics/gqview { }; + gmpc = callPackage ../applications/audio/gmpc { }; + gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk { inherit (gnome) GConf; }; @@ -7435,6 +7437,8 @@ let mhwaveedit = callPackage ../applications/audio/mhwaveedit {}; + mid2key = callPackage ../applications/audio/mid2key { }; + midori = builderDefsPackage (import ../applications/networking/browsers/midori) { inherit imagemagick intltool python pkgconfig webkit libxml2 which gettext makeWrapper file libidn sqlite docutils libnotify @@ -7505,12 +7509,14 @@ let ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; + normalize = callPackage ../applications/audio/normalize { }; + mplayer = callPackage ../applications/video/mplayer { pulseSupport = config.pulseaudio or false; }; mplayer2 = callPackage ../applications/video/mplayer2 { - ffmpeg = ffmpeg_1_1; + ffmpeg = ffmpeg_1; }; MPlayerPlugin = browser: @@ -7980,7 +7986,7 @@ let }; vlc = callPackage ../applications/video/vlc { - ffmpeg = ffmpeg_1_1; + ffmpeg = ffmpeg_1; }; vnstat = callPackage ../applications/networking/vnstat { }; @@ -8220,6 +8226,8 @@ let crrcsim = callPackage ../games/crrcsim {}; + dhewm3 = callPackage ../games/dhewm3 {}; + drumkv1 = callPackage ../applications/audio/drumkv1 { }; dwarf_fortress = callPackage_i686 ../games/dwarf-fortress { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 712b5a62f9c..bdd875f0df5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1359,6 +1359,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network = self.network_2_4_1_2; networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; + networkConduitTls = callPackage ../development/libraries/haskell/network-conduit-tls {}; networkInfo = callPackage ../development/libraries/haskell/network-info {}; @@ -1603,6 +1604,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); SafeSemaphore = callPackage ../development/libraries/haskell/SafeSemaphore {}; + scotty = callPackage ../development/libraries/haskell/scotty {}; + sendfile = callPackage ../development/libraries/haskell/sendfile {}; semigroups = callPackage ../development/libraries/haskell/semigroups {}; @@ -1837,6 +1840,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); unixCompat = callPackage ../development/libraries/haskell/unix-compat {}; + unixProcessConduit = callPackage ../development/libraries/haskell/unix-process-conduit {}; + unixTime = callPackage ../development/libraries/haskell/unix-time {}; unlambda = callPackage ../development/libraries/haskell/unlambda {}; @@ -2148,6 +2153,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {}; + keter = callPackage ../development/tools/haskell/keter {}; + lhs2tex = callPackage ../tools/typesetting/lhs2tex {}; myhasktags = callPackage ../tools/misc/myhasktags {}; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 8ec797de672..1081a289611 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -16,8 +16,8 @@ mapTestOn { ACVector = supportedSystems; aeson = supportedSystems; AgdaExecutable = supportedSystems; - alex = supportedSystems; alexMeta = supportedSystems; + alex = supportedSystems; alternativeIo = supportedSystems; ansiTerminal = supportedSystems; ansiWlPprint = supportedSystems; @@ -41,8 +41,8 @@ mapTestOn { blazeTextual = supportedSystems; bloomfilter = supportedSystems; bmp = supportedSystems; - BNFC = supportedSystems; BNFCMeta = supportedSystems; + BNFC = supportedSystems; Boolean = supportedSystems; bytestringMmap = supportedSystems; bytestringNums = supportedSystems; @@ -125,9 +125,9 @@ mapTestOn { gamma = supportedSystems; gdiff = supportedSystems; ghcEvents = supportedSystems; - ghc = supportedSystems; ghcMtl = supportedSystems; ghcPaths = supportedSystems; + ghc = supportedSystems; ghcSybUtils = supportedSystems; githubBackup = supportedSystems; github = supportedSystems; @@ -139,8 +139,8 @@ mapTestOn { GLUT = supportedSystems; gnutls = supportedSystems; graphviz = supportedSystems; - gtk = supportedSystems; gtksourceview2 = supportedSystems; + gtk = supportedSystems; hackageDb = supportedSystems; haddock = supportedSystems; hakyll = supportedSystems; @@ -155,13 +155,13 @@ mapTestOn { haskellLexer = supportedSystems; haskellPlatform = supportedSystems; haskellSrcExts = supportedSystems; - haskellSrc = supportedSystems; haskellSrcMeta = supportedSystems; + haskellSrc = supportedSystems; HaXml = supportedSystems; haxr = supportedSystems; - HDBC = supportedSystems; HDBCPostgresql = supportedSystems; HDBCSqlite3 = supportedSystems; + HDBC = supportedSystems; HFuse = supportedSystems; highlightingKate = supportedSystems; hinotify = supportedSystems; @@ -204,6 +204,7 @@ mapTestOn { jailbreakCabal = supportedSystems; json = supportedSystems; jsonTypes = supportedSystems; + keter = supportedSystems; lambdabot = supportedSystems; languageCQuote = supportedSystems; languageJavascript = supportedSystems; @@ -231,20 +232,20 @@ mapTestOn { MonadPrompt = supportedSystems; MonadRandom = supportedSystems; mpppc = supportedSystems; - mtl = supportedSystems; mtlparse = supportedSystems; + mtl = supportedSystems; multiplate = supportedSystems; multirec = supportedSystems; multiset = supportedSystems; murmurHash = supportedSystems; mwcRandom = supportedSystems; - nat = supportedSystems; nats = supportedSystems; + nat = supportedSystems; naturals = supportedSystems; networkInfo = supportedSystems; - network = supportedSystems; networkMulticast = supportedSystems; networkProtocolXmpp = supportedSystems; + network = supportedSystems; nonNegative = supportedSystems; numericPrelude = supportedSystems; numtype = supportedSystems; @@ -266,9 +267,9 @@ mapTestOn { pathtype = supportedSystems; pcreLight = supportedSystems; permutation = supportedSystems; - persistent = supportedSystems; persistentPostgresql = supportedSystems; persistentSqlite = supportedSystems; + persistent = supportedSystems; persistentTemplate = supportedSystems; polyparse = supportedSystems; ppm = supportedSystems; @@ -280,9 +281,9 @@ mapTestOn { QuickCheck2 = supportedSystems; QuickCheck = supportedSystems; randomFu = supportedSystems; - random = supportedSystems; randomShuffle = supportedSystems; randomSource = supportedSystems; + random = supportedSystems; RangedSets = supportedSystems; ranges = supportedSystems; readline = supportedSystems; @@ -296,11 +297,11 @@ mapTestOn { regular = supportedSystems; RSA = supportedSystems; rvar = supportedSystems; - safe = supportedSystems; SafeSemaphore = supportedSystems; + safe = supportedSystems; SDLImage = supportedSystems; - SDL = supportedSystems; SDLMixer = supportedSystems; + SDL = supportedSystems; SDLTtf = supportedSystems; semigroups = supportedSystems; sendfile = supportedSystems; @@ -312,9 +313,9 @@ mapTestOn { smallcheck = supportedSystems; SMTPClient = supportedSystems; snapCore = supportedSystems; - snap = supportedSystems; snapLoaderStatic = supportedSystems; snapServer = supportedSystems; + snap = supportedSystems; split = supportedSystems; splot = supportedSystems; srcloc = supportedSystems; @@ -368,13 +369,13 @@ mapTestOn { vcsRevision = supportedSystems; Vec = supportedSystems; vectorAlgorithms = supportedSystems; - vector = supportedSystems; vectorSpace = supportedSystems; + vector = supportedSystems; vty = supportedSystems; waiAppStatic = supportedSystems; waiExtra = supportedSystems; - wai = supportedSystems; waiLogger = supportedSystems; + wai = supportedSystems; warp = supportedSystems; wlPprintExtras = supportedSystems; wlPprint = supportedSystems; @@ -398,9 +399,9 @@ mapTestOn { yesodDefault = supportedSystems; yesodForm = supportedSystems; yesodJson = supportedSystems; - yesod = supportedSystems; yesodPersistent = supportedSystems; yesodStatic = supportedSystems; + yesod = supportedSystems; zeromq3Haskell = supportedSystems; zeromqHaskell = supportedSystems; zipArchive = supportedSystems; |